ports/136810: [PATCH] news/inn: update to 2.4.6

[Radim Kolar SF.NET]

>Number:         136810
>Category:       ports
>Synopsis:       [PATCH] news/inn: update to 2.4.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 16 01:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar SF.NET
>Release:        FreeBSD 6.4-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD sanatana.dharma 6.4-RELEASE-p4 FreeBSD 6.4-RELEASE-p4 #1: Tue Jun  9 11:43:11 CEST
>Description:
This PR is based on ports/134618
i updated it to correctly support OPTIONS and changed mininal BDB version
to recommended in INN manual.

this version is tested and works good, 2.4.5 version segfaults on bsd.
- Update to 2.4.6

Removed file(s):
- files/patch-ipv6

Port maintainer (shaun at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- inn-2.4.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/news/inn/Makefile /home/hsn/hacked/inn/Makefile
--- /usr/ports/news/inn/Makefile	2008-11-17 17:44:11.000000000 +0100
+++ /home/hsn/hacked/inn/Makefile	2009-07-15 14:25:03.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	inn
-PORTVERSION?=	2.4.5
+PORTVERSION?=	2.4.6
 PORTREVISION?=	0
 CATEGORIES=	news ipv6
 MASTER_SITES?=	${MASTER_SITE_ISC}
@@ -56,10 +56,10 @@
 			--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 @@
 	fi)
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/news/inn/distinfo /home/hsn/hacked/inn/distinfo
--- /usr/ports/news/inn/distinfo	2008-11-14 17:11:08.000000000 +0100
+++ /home/hsn/hacked/inn/distinfo	2009-07-15 13:23:23.000000000 +0200
@@ -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 -ruN --exclude=CVS /usr/ports/news/inn/files/patch-ipv6 /home/hsn/hacked/inn/files/patch-ipv6
--- /usr/ports/news/inn/files/patch-ipv6	2008-11-14 17:11:09.000000000 +0100
+++ /home/hsn/hacked/inn/files/patch-ipv6	1970-01-01 01:00:00.000000000 +0100
@@ -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);
--- inn-2.4.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: