Attachment #41661 for bug #65132

View | Details | Raw Unified | Return to bug 65132
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/www/pound-1.7/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pound	8	PORTNAME= pound
9	PORTVERSION= 1.5	9	PORTVERSION= 1.7
10	CATEGORIES= www net	10	CATEGORIES= www net
11	MASTER_SITES= http://www.apsis.ch/pound/ \	11	MASTER_SITES= http://www.apsis.ch/pound/ \
12	ftp://ftp.nuug.no/pub/anders/distfiles/	12	ftp://ftp.nuug.no/pub/anders/distfiles/

Lines 1-2 Link Here

(-)/usr/ports/www/pound-1.7/distinfo (-2 / +2 lines)
1	MD5 (Pound-1.5.tgz) = e838381f7fb49136c531895a0e93c31d	1	MD5 (Pound-1.7.tgz) = ebd15a0ff4a1920a857239630c33e8f5
2	SIZE (Pound-1.5.tgz) = 120219	2	SIZE (Pound-1.7.tgz) = 132879




--- 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)




--- 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




--- 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));

Return to bug 65132

Line 0 Link Here

(-)/usr/ports/www/pound-1.7/files/patch-Makefile.in (+13 lines)
	1	--- Makefile.in Wed Mar 24 11:03:14 2004
	2	+++ Makefile.in Sun Mar 28 15:01:40 2004
	3	@@ -48,8 +48,8 @@
	4	$(OBJS): pound.h
	5
	6	install: all
	7	- @INSTALL@ -o bin -g bin -m 555 -s -D pound @sbindir@/pound
	8	- @INSTALL@ -o bin -g bin -m 644 -D pound.8 @mandir@/man8/pound.8
	9	+ @INSTALL@ -o bin -g bin -m 555 -s pound @sbindir@/pound
	10	+ @INSTALL@ -o bin -g bin -m 644 pound.8 @mandir@/man8/pound.8
	11
	12	clean:
	13	rm -f pound $(OBJS)

Lines 1-12 Link Here

(-)/usr/ports/www/pound-1.7/files/patch-configure (-12 lines)
1	--- configure.orig Thu Apr 24 15:45:26 2003
2	+++ configure Tue Apr 29 02:58:39 2003
3	@@ -1850,7 +1850,8 @@
4	if test $ac_cv_lib_pthread_pthread_create = yes; then
5	LIBS="-lpthread ${LIBS}"
6	else
7	- CPPFLAGS="${CPPFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"
8	+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"
9	+ LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
10	fi
11
12	echo "$as_me:1856: checking for socket in -lsocket" >&5

Line 0 Link Here

(-)/usr/ports/www/pound-1.7/files/patch-pound.c (+30 lines)
	1	--- pound.c Wed Mar 24 16:03:14 2004
	2	+++ pound.c Tue Mar 30 19:13:51 2004
	3	@@ -742,10 +742,11 @@
	4	logmsg(LOG_WARNING, "HTTP arg: malloc");
	5	close(clnt);
	6	} else {
	7	+ socklen_t namelen;
	8	arg->sock = clnt;
	9	arg->from_host = clnt_addr.sin_addr;
	10	- memset(&arg->to_host, 0, n = sizeof(arg->to_host));
	11	- getsockname(http_sock[i], (struct sockaddr *)&arg->to_host, &n);
	12	+ memset(&arg->to_host, 0, namelen = sizeof(arg->to_host));
	13	+ getsockname(http_sock[i], (struct sockaddr *)&arg->to_host, &namelen);
	14	arg->ctx = NULL;
	15	if(pthread_create(&thr, &attr, thr_http, (void *)arg)) {
	16	logmsg(LOG_WARNING, "HTTP pthread_create: %s", strerror(errno));
	17	@@ -776,10 +777,11 @@
	18	logmsg(LOG_WARNING, "HTTPS arg: malloc");
	19	close(clnt);
	20	} else {
	21	+ socklen_t namelen;
	22	arg->sock = clnt;
	23	arg->from_host = clnt_addr.sin_addr;
	24	- memset(&arg->to_host, 0, n = sizeof(arg->to_host));
	25	- getsockname(https_sock[i], (struct sockaddr *)&arg->to_host, &n);
	26	+ memset(&arg->to_host, 0, namelen = sizeof(arg->to_host));
	27	+ getsockname(https_sock[i], (struct sockaddr *)&arg->to_host, &namelen);
	28	arg->ctx = ctx[i];
	29	if(pthread_create(&thr, &attr, thr_http, (void *)arg)) {
	30	logmsg(LOG_WARNING, "HTTPS pthread_create: %s", strerror(errno));