Skip site navigation (1)Skip section navigation (2) 
Date:      Sun,  8 Jan 2006 17:10:47 +0100 (CET)
From:      Christian Laursen <xi@borderworlds.dk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/91515: [MAINTAINER] Update port: net/nbd-server to 2.8.3 
Message-ID:  <20060108161047.6760A1147E@borg.borderworlds.dk>
Resent-Message-ID: <200601081620.k08GK3Rr081065@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         91515
>Category:       ports
>Synopsis:       [MAINTAINER] Update port: net/nbd-server to 2.8.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 08 16:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Christian Laursen
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
The Border Worlds 
>Environment:
System: FreeBSD borg.borderworlds.dk 6.0-RELEASE FreeBSD 6.0-RELEASE #1: Thu Nov 3 16:20:22 CET 2005 root@borg.borderworlds.dk:/usr/obj/usr/src/sys/BORG i386


	
>Description:
The attached patch updates net/nbd-server to version 2.8.3.
	
>How-To-Repeat:
	
>Fix:

	

--- nbd-server.diff begins here ---
diff -urN /usr/ports/net/nbd-server/Makefile nbd-server/Makefile
--- /usr/ports/net/nbd-server/Makefile	Thu Dec 22 22:02:12 2005
+++ nbd-server/Makefile	Sun Jan  8 17:04:36 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nbd-server
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.8.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nbd
diff -urN /usr/ports/net/nbd-server/distinfo nbd-server/distinfo
--- /usr/ports/net/nbd-server/distinfo	Thu Nov 17 15:45:47 2005
+++ nbd-server/distinfo	Sun Jan  8 17:04:36 2006
@@ -1,3 +1,3 @@
-MD5 (nbd-2.8.2.tar.bz2) = 2a911e6499d9281b34ff904a446b1049
-SHA256 (nbd-2.8.2.tar.bz2) = ce45c1c7f587a407061d9e70b6d9b07a52950c0a580d7f7a8bdb4a383ccbabf9
-SIZE (nbd-2.8.2.tar.bz2) = 137601
+MD5 (nbd-2.8.3.tar.bz2) = 09f97e8f321a3b1a65a6b5aa31409ed1
+SHA256 (nbd-2.8.3.tar.bz2) = e13bc874b987b2ae06c087d8d10349ddf858829a12711cd158c778b0d415c76c
+SIZE (nbd-2.8.3.tar.bz2) = 163461
diff -urN /usr/ports/net/nbd-server/files/patch-nbd-server.c nbd-server/files/patch-nbd-server.c
--- /usr/ports/net/nbd-server/files/patch-nbd-server.c	Thu Dec 22 22:02:12 2005
+++ nbd-server/files/patch-nbd-server.c	Sun Jan  8 17:04:36 2006
@@ -1,7 +1,7 @@
-diff -urN nbd-2.8.2.orig/nbd-server.c nbd-2.8.2/nbd-server.c
---- nbd-2.8.2.orig/nbd-server.c	Wed Nov  9 22:38:44 2005
-+++ nbd-server.c	Thu Dec 22 16:04:47 2005
-@@ -363,11 +363,11 @@
+diff -urN nbd-2.8.3.orig/nbd-server.c nbd-2.8.3/nbd-server.c
+--- nbd-2.8.3.orig/nbd-server.c	Thu Dec 22 21:37:20 2005
++++ nbd-server.c	Sun Jan  8 16:45:30 2006
+@@ -363,12 +363,12 @@
   * is severely wrong)
   **/
  void sigchld_handler(int s) {
@@ -9,18 +9,10 @@
 +        int status;
  	int* i;
  	pid_t pid;
+ 	int done=0;
  
--	while((pid=wait(status)) > 0) {
-+	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+-	while(!done && (pid=wait(status)) > 0) {
++	while(!done && (pid=wait(&status)) > 0) {
  		if(WIFEXITED(status)) {
  			msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status));
- 		}
-@@ -684,7 +684,7 @@
- 
- 		if (request.magic != htonl(NBD_REQUEST_MAGIC))
- 			err("Not enough magic.");
--		if (len > BUFSIZE)
-+		if (len > (BUFSIZE-sizeof(struct nbd_reply)))
- 			err("Request too big!");
- #ifdef DODBG
- 		printf("%s from %Lu (%Lu) len %d, ", request.type ? "WRITE" :
+ 			msg3(LOG_INFO, "pid is %d", pid);
--- nbd-server.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060108161047.6760A1147E>