checked in

• Files Changed
• Browse Source

- Update to nbd-2.9.12:
  * use atoll instead of atol ... so that multi-terabyte exports work, too
  * Change meaning of -swap option: rather than trying to use a kernel patch
    which has been effectively dead since sometime around 2.1.something, do an
    mlockall() so that the kernel won't throw us out. The MCL_CURRENT | MCL_FUTURE
    bit might prove to be problematic, but if so, we'll deal with it when
    we get there
  * Use right printf() format string

--This line, and those below, will be ignored--

D    nbd-2.9.11.tar.bz2
A    nbd-2.9.12-doc.diff
A    nbd-2.9.12-warn.diff
A    nbd-2.9.12.tar.bz2
D    nbd-2.9.5-doc.diff
D    nbd-2.9.5-warn.diff
M    nbd.changes
M    nbd.spec

Diff for working copy: .
Index: nbd.changes
===================================================================

--- nbd.changes     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd.changes     (working copy) 
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon May  4 10:40:15 CEST 2009 - ms@suse.de
+
+- Update to nbd-2.9.12:
+  * use atoll instead of atol ... so that multi-terabyte exports work, too
+  * Change meaning of -swap option: rather than trying to use a kernel patch
+    which has been effectively dead since sometime around 2.1.something, do an
+    mlockall() so that the kernel won't throw us out. The MCL_CURRENT | MCL_FUTURE
+    bit might prove to be problematic, but if so, we'll deal with it when
+    we get there
+  * Use right printf() format string
+
 -------------------------------------------------------------------
 Wed Aug 20 08:13:31 CEST 2008 - garloff@suse.de
 

Index: nbd.spec
===================================================================

--- nbd.spec     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd.spec     (working copy) 
@@ -21,15 +21,15 @@
 Name:           nbd
 BuildRequires:  doxygen glib2-devel
 PreReq:         %insserv_prereq coreutils
-Version:        2.9.11
+Version:        2.9.12
 Release:        1
 License:        GPL v2 or later
 Group:          Productivity/Networking/Other
 AutoReqProv:    on
 Source:         %{name}-%{version}.tar.bz2
 Source2:        init.nbd-server
-Patch2:         nbd-2.9.5-warn.diff
-Patch3:         nbd-2.9.5-doc.diff
+Patch2:         nbd-2.9.12-warn.diff
+Patch3:         nbd-2.9.12-doc.diff
 Summary:        Network Block Device Server and Client Utilities
 Url:            http://nbd.sourceforge.net/
 Prefix:         /usr
@@ -166,98 +166,3 @@
 
 %preun
 %{stop_on_removal nbd-server}
-
-%changelog
-* Wed Aug 20 2008 garloff@suse.de
-- Update to nbd-2.9.11:
-  * nbd-client: new option -c to check for connection, -d to
-  drop connection, -persist to infinitely retry connections
-  dropped by server. timeout= setting
-  * nbd-server: drop autoreadonly option
-* Thu Nov 15 2007 garloff@suse.de
-- Update to nbd-2.9.9:
-  * Document -C option of nbd-server.
-  * Fix name of /var/run/ file.
-* Thu Nov 08 2007 garloff@suse.de
-- Split nbd into nbd and nbd-doc packages.
-- Update to nbd-2.9.8:
-  * nbd-server can now setuid to specified user and group.
-  * prerun and postrun scripts can be specified.
-  * IP address to bind to (listenaddress) can be configured.
-  * Socket Direct Protocol (sdp) -- not enabled.
-  * server exits now after connection has gone (oops!).
-  * nbd-client: timeout parameter.
-* Mon Jul 30 2007 garloff@suse.de
-- Convert options from old nbd-server.conf to new nbd-server/config
-  on update and drop support for old config file syntax.
-- Fix daemonize(0) segfault and pid filename.
-- Fix compiler warnings.
-- Fix /dev filename docu.
-- Use startproc, killproc, checkproc in init script
-- nbd-server does not support SIGHUP, fix init script accordingly.
-* Tue Jul 17 2007 garloff@suse.de
-- Update to nbd-2.9.5:
-  * Support for more platforms, pkgconfig, debug build.
-  * -o option to convert cmdline options to config file.
-  * Fix duplication in handling nonblocking server socket.
-* Tue Mar 13 2007 garloff@suse.de
-- Update to 2.9.2:
-  * make child socket nonblocking
-  * Reintegrate fix for 64bit on looking for file size.
-  * Fix cross-compiling
-  * Search for libraries to allow linking on Solaris
-- Update to 2.9.1:
-  * A fix for a piece of code following a null pointer, and one
-  for a memory leak (if only minor).
-- Update to 2.9.0:
-  * * Configuration file support
-  * The ability to server multiple nbd-server exports from one server
-  * Better multiple-file support (files can now be of any random size)
-  * Better support for virtualizing servers (in addition to replacing
-  %%s with the client's IP address, it is now also possible to use
-  other options which allow for hashed directories)
-  * Support for changing uid and gid after startup
-  * The ability to do the copy-on-write stuff with a sparse file rather
-  than a mapped file (specified by a config file option), which may be
-  slightly faster.
-* Sat Nov 18 2006 garloff@suse.de
-- Add nbd-server init script (parses /etc/nbd-server.conf).
-* Thu Oct 19 2006 garloff@suse.de
-- Update to nbd-2.8.7:
-  * A fix for build against nbd.h for kernel 2.6.18 (and above,
-  presumably)
-* Fri Oct 13 2006 ro@suse.de
-- include linux/types.h before linux/nbd.h
-* Mon Aug 07 2006 garloff@suse.de
-- Update to nbd-2.8.6:
-  * performance/reliability improvements: Use select() rather than
-  accept() and waitpid() with WNOHANG rather than wait().
-- Update to nbd-2.8.5:
-  * -persist option.
-  * Add export verification.
-  * Make sure queue is empty for write requests to read-only export.
-- Update to nbd-2.8.4:
-  * Includes the previous fix (closing server socket)
-* Mon Mar 06 2006 garloff@suse.de
-- Make sure children quit when they finish serving, rather than
-  trying to do stuff with a server socket that they've closed
-  already in a loop. Whoops. (Fix from nbd-2.8.4.)
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Mon Jan 23 2006 garloff@suse.de
-- Enable -fstack-protector.
-* Mon Jan 09 2006 garloff@suse.de
-- Update to nbd-2.8.3:
-  * CVE-2005-3534.
-  * A fix for 64bit systems regarding the BLKGETSIZE ioctl().
-  * Better handling of SIGCHLD.
-* Tue Dec 20 2005 garloff@suse.de
-- Update to nbd-2.8.2:
-  * Enable LFS by default.
-* Thu Nov 03 2005 dmueller@suse.de
-- don't build as root
-* Fri Oct 28 2005 garloff@suse.de
-- Update to version 2.8.1.
-- Documentation added.
-* Mon Jul 04 2005 garloff@suse.de
-- Initial creation of package.

Index: nbd-2.9.12-doc.diff
===================================================================

--- nbd-2.9.12-doc.diff     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd-2.9.12-doc.diff     (working copy) 
@@ -1,0 +1,39 @@
+Index: nbd-2.9.8/README
+===================================================================
+--- nbd-2.9.8.orig/README
++++ nbd-2.9.8/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

Index: nbd-2.9.12-warn.diff
===================================================================

--- nbd-2.9.12-warn.diff     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd-2.9.12-warn.diff     (working copy) 
@@ -1,0 +1,15 @@
+Index: nbd-2.9.8/nbd-server.c
+===================================================================
+--- nbd-2.9.8.orig/nbd-server.c
++++ nbd-2.9.8/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;

Index: nbd-2.9.12.tar.bz2
===================================================================

Binary file nbd-2.9.12.tar.bz2 has changed

Index: nbd-2.9.11.tar.bz2
===================================================================

Binary file nbd-2.9.11.tar.bz2 has changed

Index: nbd-2.9.5-doc.diff
===================================================================

--- nbd-2.9.5-doc.diff     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd-2.9.5-doc.diff     (working copy) 
@@ -1,39 +1,0 @@
-Index: nbd-2.9.8/README
-===================================================================
---- nbd-2.9.8.orig/README
-+++ nbd-2.9.8/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

Index: nbd-2.9.5-warn.diff
===================================================================

--- nbd-2.9.5-warn.diff     (revision 400070b2b5335c40d4ba92b07485cd50) 
+++ nbd-2.9.5-warn.diff     (working copy) 
@@ -1,15 +1,0 @@
-Index: nbd-2.9.8/nbd-server.c
-===================================================================
---- nbd-2.9.8.orig/nbd-server.c
-+++ nbd-2.9.8/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;

• Files Changed
• Browse Source

• Browse Source