ports/65132: [PATCH] www/pound: update to 1.7

[ryan]

>Number:         65132
>Category:       ports
>Synopsis:       [PATCH] www/pound: update to 1.7
>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:   Sat Apr 03 08:40:20 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     ryan
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD atlantis.local 4.9-STABLE FreeBSD 4.9-STABLE #4: Thu Mar 18 16:53:56 GST 2004
>Description:
- Update to 1.7
- Include takesako(at)namazu(dot)org's Pound-1.7-fix_poll.patch (now merged into Pound-current)

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

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

--- pound-1.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/pound/Makefile /usr/ports/www/pound-1.7/Makefile
--- /usr/ports/www/pound/Makefile	Tue Oct 28 15:44:27 2003
+++ /usr/ports/www/pound-1.7/Makefile	Tue Mar 30 13:22:59 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pound
-PORTVERSION=	1.5
+PORTVERSION=	1.7
 CATEGORIES=	www net
 MASTER_SITES=	http://www.apsis.ch/pound/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
diff -ruN --exclude=CVS /usr/ports/www/pound/distinfo /usr/ports/www/pound-1.7/distinfo
--- /usr/ports/www/pound/distinfo	Thu Apr  1 15:00:04 2004
+++ /usr/ports/www/pound-1.7/distinfo	Wed Mar 31 07:26:06 2004
@@ -1,2 +1,2 @@
-MD5 (Pound-1.5.tgz) = e838381f7fb49136c531895a0e93c31d
-SIZE (Pound-1.5.tgz) = 120219
+MD5 (Pound-1.7.tgz) = ebd15a0ff4a1920a857239630c33e8f5
+SIZE (Pound-1.7.tgz) = 132879
diff -ruN --exclude=CVS /usr/ports/www/pound/files/patch-Makefile.in /usr/ports/www/pound-1.7/files/patch-Makefile.in
--- /usr/ports/www/pound/files/patch-Makefile.in	Wed Dec 31 16:00:00 1969
+++ /usr/ports/www/pound-1.7/files/patch-Makefile.in	Tue Mar 30 12:11:40 2004
@@ -0,0 +1,13 @@
+--- Makefile.in	Wed Mar 24 11:03:14 2004
++++ Makefile.in	Sun Mar 28 15:01:40 2004
+@@ -48,8 +48,8 @@
+ $(OBJS):	pound.h
+ 
+ install:	all
+-		@INSTALL@ -o bin -g bin -m 555 -s -D pound @sbindir@/pound
+-		@INSTALL@ -o bin -g bin -m 644 -D pound.8 @mandir@/man8/pound.8
++		@INSTALL@ -o bin -g bin -m 555 -s pound @sbindir@/pound
++		@INSTALL@ -o bin -g bin -m 644 pound.8 @mandir@/man8/pound.8
+ 
+ clean:
+ 		rm -f pound $(OBJS)
diff -ruN --exclude=CVS /usr/ports/www/pound/files/patch-configure /usr/ports/www/pound-1.7/files/patch-configure
--- /usr/ports/www/pound/files/patch-configure	Tue Jul 22 15:49:41 2003
+++ /usr/ports/www/pound-1.7/files/patch-configure	Wed Dec 31 16:00:00 1969
@@ -1,12 +0,0 @@
---- configure.orig	Thu Apr 24 15:45:26 2003
-+++ configure	Tue Apr 29 02:58:39 2003
-@@ -1850,7 +1850,8 @@
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-   LIBS="-lpthread ${LIBS}"
- else
--  CPPFLAGS="${CPPFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"
-+   CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"
-+   LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
- fi
- 
- echo "$as_me:1856: checking for socket in -lsocket" >&5
diff -ruN --exclude=CVS /usr/ports/www/pound/files/patch-pound.c /usr/ports/www/pound-1.7/files/patch-pound.c
--- /usr/ports/www/pound/files/patch-pound.c	Wed Dec 31 16:00:00 1969
+++ /usr/ports/www/pound-1.7/files/patch-pound.c	Tue Mar 30 12:12:33 2004
@@ -0,0 +1,30 @@
+--- pound.c	Wed Mar 24 16:03:14 2004
++++ pound.c	Tue Mar 30 19:13:51 2004
+@@ -742,10 +742,11 @@
+                                     logmsg(LOG_WARNING, "HTTP arg: malloc");
+                                     close(clnt);
+                                 } else {
++                                    socklen_t namelen;
+                                     arg->sock = clnt;
+                                     arg->from_host = clnt_addr.sin_addr;
+-                                    memset(&arg->to_host, 0, n = sizeof(arg->to_host));
+-                                    getsockname(http_sock[i], (struct sockaddr *)&arg->to_host, &n);
++                                    memset(&arg->to_host, 0, namelen = sizeof(arg->to_host));
++                                    getsockname(http_sock[i], (struct sockaddr *)&arg->to_host, &namelen);
+                                     arg->ctx = NULL;
+                                     if(pthread_create(&thr, &attr, thr_http, (void *)arg)) {
+                                         logmsg(LOG_WARNING, "HTTP pthread_create: %s", strerror(errno));
+@@ -776,10 +777,11 @@
+                                     logmsg(LOG_WARNING, "HTTPS arg: malloc");
+                                     close(clnt);
+                                 } else {
++                                    socklen_t namelen;
+                                     arg->sock = clnt;
+                                     arg->from_host = clnt_addr.sin_addr;
+-                                    memset(&arg->to_host, 0, n = sizeof(arg->to_host));
+-                                    getsockname(https_sock[i], (struct sockaddr *)&arg->to_host, &n);
++                                    memset(&arg->to_host, 0, namelen = sizeof(arg->to_host));
++                                    getsockname(https_sock[i], (struct sockaddr *)&arg->to_host, &namelen);
+                                     arg->ctx = ctx[i];
+                                     if(pthread_create(&thr, &attr, thr_http, (void *)arg)) {
+                                         logmsg(LOG_WARNING, "HTTPS pthread_create: %s", strerror(errno));
--- pound-1.7.patch ends here ---

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