sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.8.3

Browse source 
PR:		91515
Submitted by:	Christian Laursen <xi@borderworlds.dk> (maintainer)
This commit is contained in:
Erwin Lansing 2006-01-08 17:37:25 +00:00
parent 2cf87ecf06
commit 69cd18a848
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=153080
3 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/nbd-server/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= nbd-server PORTNAME= nbd-server
PORTVERSION= 2.8.2 PORTVERSION= 2.8.3
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nbd MASTER_SITE_SUBDIR= nbd

6
net/nbd-server/distinfo
View file

@ -1,3 +1,3 @@
MD5 (nbd-2.8.2.tar.bz2) = 2a911e6499d9281b34ff904a446b1049 MD5 (nbd-2.8.3.tar.bz2) = 09f97e8f321a3b1a65a6b5aa31409ed1
SHA256 (nbd-2.8.2.tar.bz2) = ce45c1c7f587a407061d9e70b6d9b07a52950c0a580d7f7a8bdb4a383ccbabf9 SHA256 (nbd-2.8.3.tar.bz2) = e13bc874b987b2ae06c087d8d10349ddf858829a12711cd158c778b0d415c76c
SIZE (nbd-2.8.2.tar.bz2) = 137601 SIZE (nbd-2.8.3.tar.bz2) = 163461

24
net/nbd-server/files/patch-nbd-server.c
View file

@ -1,7 +1,7 @@
diff -urN nbd-2.8.2.orig/nbd-server.c nbd-2.8.2/nbd-server.c diff -urN nbd-2.8.3.orig/nbd-server.c nbd-2.8.3/nbd-server.c
--- nbd-2.8.2.orig/nbd-server.c Wed Nov 9 22:38:44 2005 --- nbd-2.8.3.orig/nbd-server.c Thu Dec 22 21:37:20 2005
+++ nbd-server.c Thu Dec 22 16:04:47 2005 +++ nbd-server.c Sun Jan 8 16:45:30 2006
@@ -363,11 +363,11 @@ @@ -363,12 +363,12 @@
* is severely wrong) * is severely wrong)
**/ **/
void sigchld_handler(int s) { 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 status;
int* i; int* i;
pid_t pid; pid_t pid;
int done=0;
- while((pid=wait(status)) > 0) { - while(!done && (pid=wait(status)) > 0) {
+ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + while(!done && (pid=wait(&status)) > 0) {
if(WIFEXITED(status)) { if(WIFEXITED(status)) {
msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status)); msg3(LOG_INFO, "Child exited with %d", WEXITSTATUS(status));
} msg3(LOG_INFO, "pid is %d", pid);
@@ -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" :