diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-06-16 16:35:10 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-06-16 16:35:10 +0000 |
| commit | c64997ab75e843aa33997b44abb01ca77f617c72 (patch) | |
| tree | 25737e6da76854fefd19405b51418657aa454f62 /mail/popd | |
| parent | 75ef0e17b98724e584716177487a4cecd95c96c4 (diff) | |
| download | ports-c64997ab75e843aa33997b44abb01ca77f617c72.tar.gz ports-c64997ab75e843aa33997b44abb01ca77f617c72.zip | |
Notes
Diffstat (limited to 'mail/popd')
| -rw-r--r-- | mail/popd/Makefile | 2 | ||||
| -rw-r--r-- | mail/popd/files/patch-popd.c | 40 | ||||
| -rw-r--r-- | mail/popd/files/patch-src::popd.c | 15 |
3 files changed, 16 insertions, 41 deletions
diff --git a/mail/popd/Makefile b/mail/popd/Makefile index 2d514831d78d..21f090c6d759 100644 --- a/mail/popd/Makefile +++ b/mail/popd/Makefile @@ -7,7 +7,7 @@ PORTNAME= popd PORTVERSION= 2.2.2a -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ftp://ftp3.za.freebsd.org/pub/popd/ diff --git a/mail/popd/files/patch-popd.c b/mail/popd/files/patch-popd.c deleted file mode 100644 index 83d2fd805e40..000000000000 --- a/mail/popd/files/patch-popd.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/popd.c.orig Wed Jun 15 15:28:13 2005 -+++ src/popd.c Wed Jun 15 15:49:05 2005 -@@ -46,6 +46,7 @@ - #include <unistd.h> - - #include <poputil.h> -+#include <osreldate.h> - #include "config.h" - #include "popd.h" - #include "paths.h" -@@ -280,9 +281,15 @@ - } - #endif - if (bind(serverfd, r->ai_addr, r->ai_addrlen) < 0) { -+#if __FreeBSD_version >= 502000 -+ getnameinfo(r->ai_addr, r->ai_addrlen, -+ ip, sizeof(ip), NULL, 0, -+ NI_NUMERICHOST); -+#else - getnameinfo(r->ai_addr, r->ai_addrlen, - ip, sizeof(ip), NULL, 0, - NI_NUMERICHOST | NI_WITHSCOPEID); -+#endif - syslog(facility, "Can't bind port %s on %s", - config.port, ip); - close(serverfd); -@@ -434,8 +441,13 @@ - facility = LOG_INFO; - if (config.daemonise || config.debug) - #ifdef USE_IPV6 -+#if __FreeBSD_version >= 502000 -+ getnameinfo((struct sockaddr *)&addr, addr.ss_len, -+ ip, sizeof(ip), NULL, 0, NI_NUMERICHOST); -+#else - getnameinfo((struct sockaddr *)&addr, addr.ss_len, - ip, sizeof(ip), NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID); -+#endif - if (config.daemonise || config.debug) - syslog(facility, "Connection from %s", ip); - #else diff --git a/mail/popd/files/patch-src::popd.c b/mail/popd/files/patch-src::popd.c new file mode 100644 index 000000000000..2216463c13a5 --- /dev/null +++ b/mail/popd/files/patch-src::popd.c @@ -0,0 +1,15 @@ +Index: src/popd.c +diff -u -p src/popd.c.orig src/popd.c +--- src/popd.c.orig Fri Jan 24 21:01:25 2003 ++++ src/popd.c Wed Jun 1 09:00:55 2005 +@@ -54,6 +54,10 @@ + #include "signals.h" + #include "proxy.h" + ++#ifndef NI_WITHSCOPEID ++#define NI_WITHSCOPEID 0 ++#endif ++ + /* global variables */ + extern FILE *yyin; + extern int yyparse(void); |