diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-07-28 18:33:24 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-07-28 18:33:24 +0000 |
| commit | fa09161bd315831b86605b98bd547979b7f7d059 (patch) | |
| tree | e5065037de39cabd7e66e9b2184d7effe55782c3 /news | |
| parent | eb1357b1e63723cab3ac9a8fc5f98a10af03269e (diff) | |
| download | ports-fa09161bd315831b86605b98bd547979b7f7d059.tar.gz ports-fa09161bd315831b86605b98bd547979b7f7d059.zip | |
Notes
Diffstat (limited to 'news')
| -rw-r--r-- | news/inn/Makefile | 10 | ||||
| -rw-r--r-- | news/inn/distinfo | 6 | ||||
| -rw-r--r-- | news/inn/files/patch-ipv6 | 40 |
3 files changed, 8 insertions, 48 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index 6506e2db3b39..380487cd2cb4 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -6,13 +6,13 @@ # PORTNAME?= inn -PORTVERSION?= 2.4.5 +PORTVERSION?= 2.4.6 PORTREVISION?= 0 CATEGORIES= news ipv6 MASTER_SITES?= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR?= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= Fluffy@fluffy.khv.ru COMMENT= InterNetNews -- the Internet meets Netnews USE_RC_SUBR= innd.sh @@ -56,10 +56,10 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --with-ssl=${OPENSSLBASE} \ --enable-ipv6 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(WITH_BERKELEYDB) -USE_BDB= 3+ +USE_BDB= 44+ CONFIGURE_ENV+= DB_VER=db${BDB_VER} CONFIGURE_ENV+= DB_LIB=${BDB_LIB_NAME} CONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE} @@ -250,4 +250,4 @@ post-install: fi) @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/inn/distinfo b/news/inn/distinfo index b7156f7da966..7ef1ab0902b0 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,3 +1,3 @@ -MD5 (inn-2.4.5.tar.gz) = 07bc6530c5e296b0ee81a5d6ac4cd355 -SHA256 (inn-2.4.5.tar.gz) = 7d33c383fccb119ff2d474c35ad09ffb223822cce3575cb457eab8a2c4b1f23e -SIZE (inn-2.4.5.tar.gz) = 1908550 +MD5 (inn-2.4.6.tar.gz) = 50741ff1b9c230af9109aafc7e98b1a2 +SHA256 (inn-2.4.6.tar.gz) = 912b4c56a08697b49be279b15ed4ca007de2204b6485a58d1f9db60e3d4a6690 +SIZE (inn-2.4.6.tar.gz) = 1942874 diff --git a/news/inn/files/patch-ipv6 b/news/inn/files/patch-ipv6 deleted file mode 100644 index d0a34b693c35..000000000000 --- a/news/inn/files/patch-ipv6 +++ /dev/null @@ -1,40 +0,0 @@ ---- nnrpd/nnrpd.c 2008/08/23 13:45:02 7953 -+++ nnrpd/nnrpd.c 2008/10/25 17:06:15 8144 -@@ -804,9 +804,9 @@ - struct timeval tv; - unsigned short ListenPort = NNTP_PORT; - #ifdef HAVE_INET6 -- char ListenAddr[INET6_ADDRSTRLEN]; -+ char ListenAddr[INET6_ADDRSTRLEN] = "::0"; - #else -- char ListenAddr[16]; -+ char ListenAddr[16] = "0.0.0.0"; - #endif - int lfd, fd; - socklen_t clen; -@@ -948,11 +948,14 @@ - SPOOLlen = strlen(innconf->patharticles); - - if (DaemonMode) { -+ bool ipv4binding = true; -+ - #ifdef HAVE_INET6 - memset(&ssa, '\0', sizeof(struct sockaddr_in6)); - ssa6->sin6_family = AF_INET6; - ssa6->sin6_port = htons(ListenPort); - if (inet_pton(AF_INET6, ListenAddr, ssa6->sin6_addr.s6_addr) > 0) { -+ ipv4binding = false; - if ( (lfd = socket(AF_INET6, SOCK_STREAM, 0)) < 0) { - syslog(L_FATAL, "can't open socket (%m)"); - exit(1); -@@ -979,7 +982,9 @@ - exit(1); - } - -- if (bind(lfd, (struct sockaddr *) &ssa, sizeof(ssa)) < 0) { -+ if (bind(lfd, (struct sockaddr *) &ssa, -+ ipv4binding ? sizeof(struct sockaddr_in) -+ : sizeof(struct sockaddr_storage)) < 0) { - fprintf(stderr, "%s: can't bind (%s)\n", argv[0], strerror(errno)); - syslog(L_FATAL, "can't bind local address (%m)"); - exit(1); |