Accepting request 62796 from network:utilities

Accepted submit request 62796 from user sax2

OBS-URL: https://build.opensuse.org/request/show/62796
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nbd?expand=0&rev=15

nbd-2.9.13-doc.diff

@@ -1,37 +0,0 @@
---- nbd-2.9.13/README
-+++ nbd-2.9.13/README
-@@ -11,16 +11,18 @@ deadlock issues if you do that[1].
- 
- To install the package, please see the INSTALL file. You'll need to
- install it on both the client and the server.
- 
--Using NBD is quite easy. First, on the client, you need to create the
--device nodes:
-+Using NBD is quite easy. First, on the client, you need to load the nbd
-+kernel module; on modern systems, udev will create the needed device
-+nodes /dev/nbdX.
-+Otherwise, you can create them manually:
- 
- # cd /dev
--# ./MAKEDEV nb0
-+# ./MAKEDEV nbd0
- 
--(if you need more than one NBD device, repeat the above command for nb1,
--nb2, ...)
-+(if you need more than one NBD device, repeat the above command for nbd1,
-+nbd2, ...)
- 
- Since there's a problem with nbd and the (default) cfq I/O scheduler,
- you may want to set it to deadline:
- 
-@@ -46,9 +48,9 @@ Finally, you'll be able to start the cli
- nbd-client <hostname> <port> <nbd device>
- 
- e.g.,
- 
--nbd-client 10.0.0.1 1234 /dev/nb0
-+nbd-client 10.0.0.1 1234 /dev/nbd0
- 
- nbd-client must be ran as root; the same is not true for nbd-server (but
- do make sure that /var/run is writeable by the server that nbd-server
- runs as; otherwise, you won't get a PID file, though the server will

nbd-2.9.13-warn.diff

@@ -1,13 +0,0 @@
---- nbd-2.9.13/nbd-server.c
-+++ nbd-2.9.13/nbd-server.c
-@@ -1334,9 +1334,9 @@ void serveconnection(CLIENT *client) {
-  **/
- void set_peername(int net, CLIENT *client) {
- 	struct sockaddr_in addrin;
- 	struct sockaddr_in netaddr;
--	size_t addrinlen = sizeof( addrin );
-+	socklen_t addrinlen = sizeof( addrin );
- 	char *peername;
- 	char *netname;
- 	char *tmp;
- 	int i;

nbd-2.9.13.tar.bz2

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

nbd-2.9.20-close.diff

@@ -1,5 +1,5 @@
---- nbd-2.9.13/nbd-client.c	2009-08-05 11:52:04.000000000 +0200
-+++ nbd-2.9.13/nbd-client.c	2009-08-05 11:54:20.000000000 +0200
+--- 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';

nbd-2.9.20.tar.bz2

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

nbd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb 25 12:40:16 CET 2011 - ms@suse.de
+
+- Update to nbd-2.9.20:
+  * Documentation update
+  * Fix buffer size checking (bnc #674281)
+  * Extend test suite and fix named exports
+
 -------------------------------------------------------------------
 Wed Aug  5 11:58:52 CEST 2009 - ms@suse.de
 

nbd.spec

@@ -21,16 +21,14 @@
 Name:           nbd
 BuildRequires:  doxygen glib2-devel
 PreReq:         %insserv_prereq coreutils
-Version:        2.9.13
+Version:        2.9.20
 Release:        2
 License:        GPL v2 or later
 Group:          Productivity/Networking/Other
 AutoReqProv:    on
 Source:         %{name}-%{version}.tar.bz2
 Source2:        init.nbd-server
-Patch2:         nbd-2.9.13-warn.diff
-Patch3:         nbd-2.9.13-doc.diff
-Patch4:         nbd-2.9.13-close.diff
+Patch2:         nbd-2.9.20-close.diff
 Summary:        Network Block Device Server and Client Utilities
 Url:            http://nbd.sourceforge.net/
 Prefix:         /usr
@@ -97,14 +95,9 @@ Authors:
 %prep
 %setup
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-touch nbd-client.8
 
 %build
-autoreconf --force --install
 export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
-#export CFLAGS="$RPM_OPT_FLAGS"
 ./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \
 	--infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \
 	--program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux