Accepting request 99354 from home:tabraham1:branches:network:utilities

update to 2.9.25

OBS-URL: https://build.opensuse.org/request/show/99354
OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=15

nbd-2.9.20-bigendian.diff

@@ -1,42 +0,0 @@
---- nbd-2.9.20/nbd-server.c	2011-01-28 13:34:16.000000000 +0100
-+++ nbd-2.9.20/nbd-server.c	2011-04-04 17:03:04.000000000 +0200
-@@ -1620,7 +1620,7 @@
- 	struct sockaddr_storage netaddr;
- 	struct sockaddr_in  *netaddr4 = NULL;
- 	struct sockaddr_in6 *netaddr6 = NULL;
--	size_t addrinlen = sizeof( addrin );
-+	socklen_t addrinlen = sizeof( addrin );
- 	struct addrinfo hints;
- 	struct addrinfo *ai = NULL;
- 	char peername[NI_MAXHOST];
-@@ -1630,10 +1630,10 @@
- 	int e;
- 	int shift;
- 
--	if (getpeername(net, (struct sockaddr *) &addrin, (socklen_t *)&addrinlen) < 0)
-+	if (getpeername(net, (struct sockaddr *) &addrin, &addrinlen) < 0)
- 		err("getsockname failed: %m");
- 
--	getnameinfo((struct sockaddr *)&addrin, (socklen_t)addrinlen,
-+	getnameinfo((struct sockaddr *)&addrin, addrinlen,
- 		peername, sizeof (peername), NULL, 0, NI_NUMERICHOST);
- 
- 	memset(&hints, '\0', sizeof (hints));
-@@ -1666,7 +1666,7 @@
- 				(netaddr4->sin_addr).s_addr>>=32-(client->server->cidrlen);
- 				(netaddr4->sin_addr).s_addr<<=32-(client->server->cidrlen);
- 
--				getnameinfo((struct sockaddr *) netaddr4, (socklen_t) addrinlen,
-+				getnameinfo((struct sockaddr *) netaddr4, addrinlen,
- 							netname, sizeof (netname), NULL, 0, NI_NUMERICHOST);
- 				tmp=g_strdup_printf("%s/%s", netname, peername);
- 			}else if(ai->ai_family == AF_INET6) {
-@@ -1682,7 +1682,7 @@
- 				(netaddr6->sin6_addr).s6_addr32[i]>>=shift;
- 				(netaddr6->sin6_addr).s6_addr32[i]<<=shift;
- 
--				getnameinfo((struct sockaddr *)netaddr6, (socklen_t)addrinlen,
-+				getnameinfo((struct sockaddr *)netaddr6, addrinlen,
- 					    netname, sizeof(netname), NULL, 0, NI_NUMERICHOST);
- 				tmp=g_strdup_printf("%s/%s", netname, peername);
- 			}

nbd-2.9.20-close.diff

@@ -1,10 +0,0 @@
---- 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 @@
- 	len=read(fd, buf, 256);
- 	buf[len-1]='\0';
- 	if(do_print) printf("%s\n", buf);
-+	close (fd);
- 	return 0;
- }
- 

nbd-2.9.20.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da9ef6ab10aa5378570ecfea3baef08dc4182af25607d5e20171226e04daad32
-size 152380

nbd-2.9.25-close.diff

@@ -0,0 +1,10 @@
+--- 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);
+ 	return 0;
+ }
+ 

nbd-2.9.25-doxyfile.diff

@@ -0,0 +1,20 @@
+--- 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

@@ -0,0 +1,20 @@
+--- 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 <stdlib.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#ifdef HAVE_FALLOC_PH
++#if HAVE_FALLOC_PH
+ #include <linux/falloc.h>
+ #endif
+ #include <arpa/inet.h>
+@@ -1461,7 +1461,7 @@
+  * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM)
+  */
+ int exptrim(struct nbd_request* req, CLIENT* client) {
+-#ifdef HAVE_FALLOC_PH
++#if HAVE_FALLOC_PH
+ 	FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0);
+ 	FILE_INFO cur = prev;
+ 	int i = 1;

nbd-2.9.25.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4
+size 500483

nbd.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Fri Sep 16 13:46:09 UTC 2011 - rfno@fietze-home.de
 

nbd.spec

@@ -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
+Version:        2.9.25
-Release:        2
+Release:        1
-License:        GPLv2+
+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
+Patch2:         nbd-2.9.25-close.diff
-Patch3:         nbd-2.9.20-bigendian.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
@@ -64,7 +65,7 @@ Authors:
     Paul Clements <Paul.Clements@steeleye.com>
 
 %package doc
-License:        GPLv2+
+License:        GPL-2.0+
 Summary:        Network Block Device Server and Client Utilities
 Group:          Productivity/Networking/Other
 Requires:       nbd = %{version}
@@ -97,6 +98,7 @@ Authors:
 %setup
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
@@ -104,10 +106,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
 	--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 @@ grep -A16 -B1 '^\[generic\]' README > $RPM_BUILD_ROOT/etc/nbd-server/config.exam
 %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 @@ fi
 
 %postun
 %{insserv_cleanup}
+%restart_on_update /etc/init.d/nbd-server
 
 %preun
 %{stop_on_removal nbd-server}