diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2006-01-08 17:37:25 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2006-01-08 17:37:25 +0000 |
| commit | 69cd18a8484fec50b82374c12a31bffb201ef7cc (patch) | |
| tree | 51070a4373cc6c6c93d7313ebca29e979e27a8ff /net/nbd-server | |
| parent | 2cf87ecf060345e00f77843f5c9c488b8499e782 (diff) | |
| download | ports-69cd18a8484fec50b82374c12a31bffb201ef7cc.tar.gz ports-69cd18a8484fec50b82374c12a31bffb201ef7cc.zip | |
Notes
Diffstat (limited to 'net/nbd-server')
| -rw-r--r-- | net/nbd-server/Makefile | 3 | ||||
| -rw-r--r-- | net/nbd-server/distinfo | 6 | ||||
| -rw-r--r-- | net/nbd-server/files/patch-nbd-server.c | 24 |
3 files changed, 12 insertions, 21 deletions
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile index 7ae01e820816..d32aef8704f3 100644 --- a/net/nbd-server/Makefile +++ b/net/nbd-server/Makefile @@ -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 --git a/net/nbd-server/distinfo b/net/nbd-server/distinfo index c9b0befb9655..b2a67376e006 100644 --- a/net/nbd-server/distinfo +++ b/net/nbd-server/distinfo @@ -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 --git a/net/nbd-server/files/patch-nbd-server.c b/net/nbd-server/files/patch-nbd-server.c index 383f8961562c..10f840e6b9fc 100644 --- a/net/nbd-server/files/patch-nbd-server.c +++ b/net/nbd-server/files/patch-nbd-server.c @@ -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 @@ diff -urN nbd-2.8.2.orig/nbd-server.c nbd-2.8.2/nbd-server.c + 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); |