Thu Oct 16 20:28:06 2008 UTC ()
Fix parameters to setsockop() calls. Bump PKGREVISION.
(bouyer)
diff -r1.2 -r1.3 pkgsrc/www/ffproxy/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/ffproxy/distinfo
diff -r0 -r1.1 pkgsrc/www/ffproxy/patches/patch-ab
diff -r0 -r1.1 pkgsrc/www/ffproxy/patches/patch-ac
--- pkgsrc/www/ffproxy/Makefile 2008/06/12 02:14:55 1.2
+++ pkgsrc/www/ffproxy/Makefile 2008/10/16 20:28:06 1.3
| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.2 2008/06/12 02:14:55 joerg Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2008/10/16 20:28:06 bouyer Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= ffproxy-1.6 | | 3 | DISTNAME= ffproxy-1.6 |
| 4 | CATEGORIES= www | | 4 | CATEGORIES= www |
| 5 | MASTER_SITES= http://faith.eu.org/ffproxy/ | | 5 | MASTER_SITES= http://faith.eu.org/ffproxy/ |
| | | 6 | PKGREVISION= 1 |
| 6 | | | 7 | |
| 7 | MAINTAINER= niklas@noxa.de | | 8 | MAINTAINER= niklas@noxa.de |
| 8 | HOMEPAGE= http://faith.eu.org/programs.html\#ffproxy | | 9 | HOMEPAGE= http://faith.eu.org/programs.html\#ffproxy |
| 9 | COMMENT= Filtering HTTP/HTTPS proxy server | | 10 | COMMENT= Filtering HTTP/HTTPS proxy server |
| 10 | | | 11 | |
| 11 | PKG_DESTDIR_SUPPORT= user-destdir | | 12 | PKG_DESTDIR_SUPPORT= user-destdir |
| 12 | | | 13 | |
| 13 | GNU_CONFIGURE= yes | | 14 | GNU_CONFIGURE= yes |
| 14 | | | 15 | |
| 15 | CONF_FILES= ${PREFIX}/share/ffproxy/sample.config ${PKG_SYSCONFDIR}/ffproxy.conf | | 16 | CONF_FILES= ${PREFIX}/share/ffproxy/sample.config ${PKG_SYSCONFDIR}/ffproxy.conf |
| 16 | .include "../../mk/bsd.pkg.mk" | | 17 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/www/ffproxy/distinfo 2006/01/05 19:12:35 1.1.1.1
+++ pkgsrc/www/ffproxy/distinfo 2008/10/16 20:28:06 1.2
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.1.1.1 2006/01/05 19:12:35 garbled Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2008/10/16 20:28:06 bouyer Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (ffproxy-1.6.tar.gz) = 89c78f47f38caf8f88e9cfd0c4d71c81284f0f24 | | 3 | SHA1 (ffproxy-1.6.tar.gz) = 89c78f47f38caf8f88e9cfd0c4d71c81284f0f24 |
| 4 | RMD160 (ffproxy-1.6.tar.gz) = ee04548d22a5d9dd12d6ffc6a36a638b59dc46a5 | | 4 | RMD160 (ffproxy-1.6.tar.gz) = ee04548d22a5d9dd12d6ffc6a36a638b59dc46a5 |
| 5 | Size (ffproxy-1.6.tar.gz) = 77535 bytes | | 5 | Size (ffproxy-1.6.tar.gz) = 77535 bytes |
| 6 | SHA1 (patch-aa) = e5e0cc7c822470c78e95f3703b3a579f8ec39585 | | 6 | SHA1 (patch-aa) = e5e0cc7c822470c78e95f3703b3a579f8ec39585 |
| | | 7 | SHA1 (patch-ab) = 2b669ed830c9e9e1e069a4f99e32b442b60f3b0d |
| | | 8 | SHA1 (patch-ac) = f2b6d62ad5e55258c757037269cf854dfe727bdb |
--- request.c.orig 2008-10-16 22:22:52.000000000 +0200
+++ request.c 2008-10-16 22:23:27.000000000 +0200
@@ -288,7 +288,7 @@
extern struct cfg config;
unsigned long ip;
int s;
- void *foo;
+ int val = 1;
size_t len, i;
char buf[4096];
@@ -371,7 +371,7 @@
if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
DEBUG(("do_request() => socket() failed for %s port %d", r->host, r->port));
return E_CON;
- } else if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &foo, sizeof(foo)) != 0) {
+ } else if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) != 0) {
DEBUG(("do_request() => setsockopt() failed for %s port %d", r->host, r->port));
return E_CON;
} else if (connect(s, (struct sockaddr *) & addr, sizeof(addr)) == -1) {
--- socket.c.orig 2008-10-16 22:22:57.000000000 +0200
+++ socket.c 2008-10-16 22:23:42.000000000 +0200
@@ -64,7 +64,7 @@
struct pollfd s[2];
socklen_t claddr_len;
pid_t pid;
- void *foo;
+ int val = 1;
char strport[6];
char *ip_add;
int st, cl, i;
@@ -108,7 +108,7 @@
else
fatal("socket() failed for IPv4");
}
- if (setsockopt(s[i].fd, SOL_SOCKET, SO_REUSEADDR, &foo, sizeof(foo)) != 0) {
+ if (setsockopt(s[i].fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) != 0) {
(void) close(s[i].fd);
fatal("setsockopt() failed for (%s) %s", ip_add, (i == 0 && config.bind_ipv4) ? "IPv4" : "IPv6");
}