Hello community,
here is the log from the commit of package nbd for openSUSE:Factory checked in at 2012-01-09 16:01:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nbd (Old)
and /work/SRC/openSUSE:Factory/.nbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nbd", Maintainer is "ms@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2011-09-23 02:14:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nbd.new/nbd.changes 2012-01-09 16:01:21.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Jan 5 20:31:57 UTC 2012 - tabraham@novell.com
+
+- Update to nbd-2.9.25
+ * TRIM now uses FALLOC_FL_PUNCH_HOLE
+ * minor bug fixes
+
+- removed obsolete nbd-2.9.20-bigendian.diff
+- refreshed nbd-2.9.20-close.diff
+
+-------------------------------------------------------------------
Old:
----
nbd-2.9.20-bigendian.diff
nbd-2.9.20-close.diff
nbd-2.9.20.tar.bz2
New:
----
nbd-2.9.25-close.diff
nbd-2.9.25-doxyfile.diff
nbd-2.9.25-have_falloc_ph.diff
nbd-2.9.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nbd.spec ++++++
--- /var/tmp/diff_new_pack.xYF4kU/_old 2012-01-09 16:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.xYF4kU/_new 2012-01-09 16:01:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nbd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,18 @@
Name: nbd
-BuildRequires: doxygen glib2-devel
+BuildRequires: doxygen glib2-devel >= 2.26.0
PreReq: %insserv_prereq coreutils
-Version: 2.9.20
-Release: 2
+Version: 2.9.25
+Release: 1
License: GPL-2.0+
Group: Productivity/Networking/Other
AutoReqProv: on
Source: %{name}-%{version}.tar.bz2
Source2: init.nbd-server
-Patch2: nbd-2.9.20-close.diff
-Patch3: nbd-2.9.20-bigendian.diff
+Patch2: nbd-2.9.25-close.diff
+Patch3: nbd-2.9.25-doxyfile.diff
+Patch4: nbd-2.9.25-have_falloc_ph.diff
Summary: Network Block Device Server and Client Utilities
Url: http://nbd.sourceforge.net/
Prefix: /usr
@@ -97,6 +98,7 @@
%setup
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
@@ -104,10 +106,10 @@
--infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \
--program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux
make
-doxygen
+doxygen doc/Doxyfile.in
%install
-make install DESTDIR=$RPM_BUILD_ROOT man_MANS='nbd-client.8 nbd-server.1 nbd-server.5'
+make install DESTDIR=$RPM_BUILD_ROOT man_MANS='nbd-client.8 nbd-server.1 nbd-server.5 nbd-trdump.1'
mkdir -p $RPM_BUILD_ROOT/etc/init.d
install %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/nbd-server
mkdir -p $RPM_BUILD_ROOT/usr/bin
@@ -122,13 +124,15 @@
%defattr(-,root,root)
%attr(0755,root,root) /usr/sbin/nbd-client
%attr(0755,root,root) /usr/bin/nbd-server
+%attr(0755,root,root) /usr/bin/nbd-trdump
%attr(0755,root,root) /etc/init.d/nbd-server
%attr(0755,root,root) /usr/bin/rcnbd-server
%{_mandir}/man1/nbd-server.1.gz
+%{_mandir}/man1/nbd-trdump.1.gz
%{_mandir}/man5/nbd-server.5.gz
%{_mandir}/man8/nbd-client.8.gz
%doc README
-#%config(noreplace) /etc/nbd-server.conf
+#%%config(noreplace) /etc/nbd-server.conf
%dir /etc/nbd-server
%ghost %config(noreplace) /etc/nbd-server/config
%ghost %config(noreplace) /etc/nbd-server/allow
@@ -161,6 +165,7 @@
%postun
%{insserv_cleanup}
+%restart_on_update /etc/init.d/nbd-server
%preun
%{stop_on_removal nbd-server}
++++++ nbd-2.9.20-close.diff -> nbd-2.9.25-close.diff ++++++
--- /work/SRC/openSUSE:Factory/nbd/nbd-2.9.20-close.diff 2011-09-23 02:14:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.nbd.new/nbd-2.9.25-close.diff 2012-01-09 16:01:21.000000000 +0100
@@ -1,10 +1,10 @@
---- nbd-2.9.20/nbd-client.c 2009-08-05 11:52:04.000000000 +0200
-+++ nbd-2.9.20/nbd-client.c 2009-08-05 11:54:20.000000000 +0200
-@@ -62,6 +62,7 @@
+--- nbd-2.9.25/nbd-client.c.orig 2012-01-05 15:40:31.962826124 -0500
++++ nbd-2.9.25/nbd-client.c 2012-01-05 15:40:53.627555277 -0500
+@@ -70,6 +70,7 @@
len=read(fd, buf, 256);
buf[len-1]='\0';
if(do_print) printf("%s\n", buf);
-+ close (fd);
++ close(fd);
return 0;
}
++++++ nbd-2.9.25-doxyfile.diff ++++++
--- nbd-2.9.25/doc/Doxyfile.in 2011-10-01 06:28:58.000000000 -0400
+++ nbd-2.9.20/Doxyfile.in 2009-01-03 07:59:46.000000000 -0500
@@ -30,7 +30,7 @@
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = doxygen-output
+OUTPUT_DIRECTORY = doc
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -459,7 +459,7 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ..
+INPUT =
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
++++++ nbd-2.9.25-have_falloc_ph.diff ++++++
--- nbd-2.9.25/nbd-server.c.orig 2012-01-06 17:15:20.229280050 -0500
+++ nbd-2.9.25/nbd-server.c 2012-01-06 17:47:08.447424041 -0500
@@ -83,7 +83,7 @@
#include