Attachment 48298 Details for Bug 73923 – pound-1.8.patch

[patch] pound-1.8.patch

pound-1.8.patch (text/plain), 4.56 KB, created by ports@c0decafe.net on 2004-11-14 06:30:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ports@c0decafe.net

Created: 2004-11-14 06:30:19 UTC

Size: 4.56 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/pound.orig/Makefile /usr/ports/www/pound/Makefile
>--- www/pound.orig/Makefile	Sat May  1 00:29:04 2004
>+++ www/pound/Makefile	Sun Nov 14 01:24:24 2004
>@@ -6,10 +6,9 @@
> #
> 
> PORTNAME=	pound
>-PORTVERSION=	1.7
>+PORTVERSION=	1.8
> CATEGORIES=	www net
>-MASTER_SITES=	http://www.apsis.ch/pound/ \
>-		ftp://ftp.nuug.no/pub/anders/distfiles/
>+MASTER_SITES=	http://www.apsis.ch/pound/
> DISTNAME=	Pound-${PORTVERSION}
> EXTRACT_SUFX=	.tgz
> 
>diff -ruN --exclude=CVS /usr/ports/www/pound.orig/distinfo /usr/ports/www/pound/distinfo
>--- www/pound.orig/distinfo	Sat May  1 00:29:04 2004
>+++ www/pound/distinfo	Sun Nov 14 01:29:13 2004
>@@ -1,2 +1,2 @@
>-MD5 (Pound-1.7.tgz) = ebd15a0ff4a1920a857239630c33e8f5
>-SIZE (Pound-1.7.tgz) = 132879
>+MD5 (Pound-1.8.tgz) = f8a15e9019ce778afae952a83c172145
>+SIZE (Pound-1.8.tgz) = 139707
>diff -ruN --exclude=CVS /usr/ports/www/pound.orig/files/patch-Makefile.in /usr/ports/www/pound/files/patch-Makefile.in
>--- www/pound.orig/files/patch-Makefile.in	Sat May  1 00:29:04 2004
>+++ www/pound/files/patch-Makefile.in	Thu Jan  1 02:00:00 1970
>@@ -1,13 +0,0 @@
>---- 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.orig/files/patch-configure /usr/ports/www/pound/files/patch-configure
>--- www/pound.orig/files/patch-configure	Sat May  1 00:29:04 2004
>+++ www/pound/files/patch-configure	Thu Jan  1 02:00:00 1970
>@@ -1,13 +0,0 @@
>---- configure.orig	Fri Apr 30 22:18:25 2004
>-+++ configure	Fri Apr 30 22:19:13 2004
>-@@ -2348,8 +2348,8 @@
>- 
>- case $target_os in
>- *BSD*|*bsd*)
>--    CPPFLAGS="${CPPFLAGS} -pthread -DNEED_STACK -D_REENTRANT -D_THREAD_SAFE"
>--    LDFLAGS="${LDFLAGS} -pthread"
>-+    CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK -D_REENTRANT -D_THREAD_SAFE"
>-+    LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
>-     ;;
>- *)
>-     CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
>diff -ruN --exclude=CVS /usr/ports/www/pound.orig/files/patch-pound.c /usr/ports/www/pound/files/patch-pound.c
>--- www/pound.orig/files/patch-pound.c	Sat May  1 00:29:04 2004
>+++ www/pound/files/patch-pound.c	Thu Jan  1 02:00:00 1970
>@@ -1,30 +0,0 @@
>---- 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));

Actions: View | Diff

Attachments on bug 73923: 48298