diff options
author | salo <salo> | 2003-04-11 03:56:05 +0000 |
---|---|---|
committer | salo <salo> | 2003-04-11 03:56:05 +0000 |
commit | 2e18dd94473886cf8a1095e6647c75f5db68a3f0 (patch) | |
tree | 022bf1d67286bdfef05a95edeb7b2743f93497e2 | |
parent | 3bcbd03790760bae09bde7328b1b924e0eae8f93 (diff) | |
download | pkgsrc-2e18dd94473886cf8a1095e6647c75f5db68a3f0.tar.gz |
Bump PKGREVISION: Fix binding in --daemon mode.
Addresses PR pkg/18134.
Patch by itojun.
-rw-r--r-- | net/rsync/Makefile | 7 | ||||
-rw-r--r-- | net/rsync/distinfo | 3 | ||||
-rw-r--r-- | net/rsync/patches/patch-af | 227 |
3 files changed, 233 insertions, 4 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index fc71a451c7f..17cc505e323 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2003/03/06 20:44:13 salo Exp $ +# $NetBSD: Makefile,v 1.46 2003/04/11 03:56:05 salo Exp $ # DISTNAME= rsync-2.5.6 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ ftp://rsync.samba.org/pub/rsync/ \ @@ -15,8 +16,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://rsync.samba.org/ COMMENT= Network file distribution/synchronisation utility -USE_PKGINSTALL= yes -GNU_CONFIGURE= yes +USE_PKGINSTALL= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-included-popt PKG_SYSCONFSUBDIR= rsync diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 30426a2cdaf..99349f4de0e 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2003/03/06 20:44:13 salo Exp $ +$NetBSD: distinfo,v 1.11 2003/04/11 03:56:05 salo Exp $ SHA1 (rsync-2.5.6.tar.gz) = ae64d0f6a22ac6f45ccd1258e80d17a35b28d798 Size (rsync-2.5.6.tar.gz) = 584678 bytes @@ -7,3 +7,4 @@ SHA1 (patch-ab) = 3d0a64dd17c8f161c373b8b144991fcb26758c07 SHA1 (patch-ac) = 6c0db05f23ed7794911f25d8fde6ef5a7b90bbea SHA1 (patch-ad) = a6b10af0fe443b97ab93bfe8006cdb5969609841 SHA1 (patch-ae) = 48799b1737e5f9979ea57dedf284b8e1c4701029 +SHA1 (patch-af) = 07254e0f655779520ea71ee51f1f8d6749379c0f diff --git a/net/rsync/patches/patch-af b/net/rsync/patches/patch-af new file mode 100644 index 00000000000..892ff0ea477 --- /dev/null +++ b/net/rsync/patches/patch-af @@ -0,0 +1,227 @@ +$NetBSD: patch-af,v 1.3 2003/04/11 03:56:06 salo Exp $ + +--- socket.c.orig 2003-01-27 04:35:09.000000000 +0100 ++++ socket.c 2003-04-11 05:07:48.000000000 +0200 +@@ -292,59 +292,30 @@ + * @param bind_address Local address to bind, or NULL to allow it to + * default. + **/ +-static int open_socket_in(int type, int port, const char *bind_address, +- int af_hint) ++static int open_socket_in(struct addrinfo *resp) + { + int one=1; + int s; +- struct addrinfo hints, *all_ai, *resp; +- char portbuf[10]; +- int error; +- +- memset(&hints, 0, sizeof(hints)); +- hints.ai_family = af_hint; +- hints.ai_socktype = type; +- hints.ai_flags = AI_PASSIVE; +- snprintf(portbuf, sizeof(portbuf), "%d", port); +- error = getaddrinfo(bind_address, portbuf, &hints, &all_ai); +- if (error) { +- rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n", +- bind_address, gai_strerror(error)); +- return -1; +- } + + /* We may not be able to create the socket, if for example the + * machine knows about IPv6 in the C library, but not in the + * kernel. */ +- for (resp = all_ai; resp; resp = resp->ai_next) { +- s = socket(resp->ai_family, resp->ai_socktype, +- resp->ai_protocol); ++ s = socket(resp->ai_family, resp->ai_socktype, ++ resp->ai_protocol); + +- if (s == -1) +- /* See if there's another address that will work... */ +- continue; +- +- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, +- (char *)&one, sizeof one); +- +- /* now we've got a socket - we need to bind it */ +- if (bind(s, all_ai->ai_addr, all_ai->ai_addrlen) < 0) { +- /* Nope, try another */ +- close(s); +- continue; +- } +- +- freeaddrinfo(all_ai); +- return s; ++ if (s == -1) ++ return -1; ++ ++ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, ++ (char *)&one, sizeof one); ++ ++ /* now we've got a socket - we need to bind it */ ++ if (bind(s, resp->ai_addr, resp->ai_addrlen) < 0) { ++ close(s); ++ return -1; + } + +- rprintf(FERROR, RSYNC_NAME ": open inbound socket on port %d failed: " +- "%s\n", +- port, +- strerror(errno)); +- +- freeaddrinfo(all_ai); +- return -1; ++ return s; + } + + +@@ -373,24 +344,52 @@ + return(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&v, &l) == 0); + } + ++#define MAXSOCK 20 + + void start_accept_loop(int port, int (*fn)(int, int)) + { +- int s; ++ int s[MAXSOCK]; ++ int nsock = 0; ++ int maxsock = -1; + extern char *bind_address; + extern int default_af_hint; ++ struct addrinfo hints, *res, *res0; ++ char portstr[NI_MAXSERV]; ++ int i; + +- /* open an incoming socket */ +- s = open_socket_in(SOCK_STREAM, port, bind_address, default_af_hint); +- if (s == -1) ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = default_af_hint; ++ hints.ai_socktype = SOCK_STREAM; ++ hints.ai_flags = AI_PASSIVE; ++ snprintf(portstr, sizeof(portstr), "%d", port); ++ if (getaddrinfo(bind_address, portstr, &hints, &res0) != 0) + exit_cleanup(RERR_SOCKETIO); + +- /* ready to listen */ +- if (listen(s, 5) == -1) { +- close(s); +- exit_cleanup(RERR_SOCKETIO); ++ /* open an incoming socket */ ++ for (res = res0; res; res = res->ai_next) { ++ if (nsock >= sizeof(s) / sizeof(s[0])) ++ break; ++ s[nsock] = open_socket_in(res); ++ if (s[nsock] == -1) ++ continue; ++ if (s[nsock] >= FD_SETSIZE) { ++ close(s[nsock]); ++ continue; ++ } ++ ++ /* ready to listen */ ++ if (listen(s[nsock], 5) == -1) { ++ close(s[nsock]); ++ continue; ++ } ++ ++ if (s[nsock] > maxsock) ++ maxsock = s[nsock]; ++ nsock++; + } + ++ if (nsock == 0) ++ exit_cleanup(RERR_SOCKETIO); + + /* now accept incoming connections - forking a new process + for each incoming connection */ +@@ -407,49 +406,54 @@ + log_close(); + + FD_ZERO(&fds); +- FD_SET(s, &fds); ++ for (i = 0; i < nsock; i++) ++ FD_SET(s[i], &fds); + +- if (select(s+1, &fds, NULL, NULL, NULL) != 1) { ++ if (select(maxsock + 1, &fds, NULL, NULL, NULL) < 0) + continue; +- } + +- if(!FD_ISSET(s, &fds)) continue; ++ for (i = 0; i < nsock; i++) { ++ if (!FD_ISSET(s[i], &fds)) ++ continue; + +- fd = accept(s,(struct sockaddr *)&addr,&addrlen); ++ fd = accept(s[i], (struct sockaddr *)&addr, &addrlen); + +- if (fd == -1) continue; ++ if (fd == -1) ++ continue; + +- signal(SIGCHLD, SIG_IGN); ++ signal(SIGCHLD, SIG_IGN); + +- /* we shouldn't have any children left hanging around +- but I have had reports that on Digital Unix zombies +- are produced, so this ensures that they are reaped */ ++ /* we shouldn't have any children left hanging around ++ but I have had reports that on Digital Unix zombies ++ are produced, so this ensures that they are reaped */ + #ifdef WNOHANG +- while (waitpid(-1, NULL, WNOHANG) > 0); ++ while (waitpid(-1, NULL, WNOHANG) > 0); + #endif + +- if ((pid = fork()) == 0) { +- int ret; +- close(s); +- /* open log file in child before possibly giving +- up privileges */ +- log_open(); +- ret = fn(fd, fd); +- close_all(); +- _exit(ret); +- } else if (pid < 0) { +- rprintf(FERROR, +- RSYNC_NAME +- ": could not create child server process: %s\n", +- strerror(errno)); +- close(fd); +- /* This might have happened because we're +- * overloaded. Sleep briefly before trying to +- * accept again. */ +- sleep(2); +- } else { +- /* Parent doesn't need this fd anymore. */ +- close(fd); ++ if ((pid = fork()) == 0) { ++ int ret; ++ for (i = 0; i < nsock; i++) ++ close(s[i]); ++ /* open log file in child before possibly giving ++ up privileges */ ++ log_open(); ++ ret = fn(fd, fd); ++ close_all(); ++ _exit(ret); ++ } else if (pid < 0) { ++ rprintf(FERROR, ++ RSYNC_NAME ++ ": could not create child server process: %s\n", ++ strerror(errno)); ++ close(fd); ++ /* This might have happened because we're ++ * overloaded. Sleep briefly before trying to ++ * accept again. */ ++ sleep(2); ++ } else { ++ /* Parent doesn't need this fd anymore. */ ++ close(fd); ++ } + } + } + } |