Attachment 61019 Details for Bug 91515 – nbd-server.diff

[patch] nbd-server.diff

nbd-server.diff (text/plain), 2.26 KB, created by xi on 2006-01-08 16:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: xi

Created: 2006-01-08 16:20:03 UTC

Size: 2.26 KB

patch

obsolete

>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);

Actions: View | Diff

Attachments on bug 91515: 61019