From 212e553ce248742d28fb47b944f1fa2bcec47242 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer>
Date: Thu, 16 Oct 2008 20:28:06 +0000
Subject: Fix parameters to setsockop() calls. Bump PKGREVISION.

---
 www/ffproxy/Makefile         |  3 ++-
 www/ffproxy/distinfo         |  4 +++-
 www/ffproxy/patches/patch-ab | 20 ++++++++++++++++++++
 www/ffproxy/patches/patch-ac | 20 ++++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 www/ffproxy/patches/patch-ab
 create mode 100644 www/ffproxy/patches/patch-ac

(limited to 'www/ffproxy')

diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index 89b3e6c9274..1f90d75a212 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/16 20:28:06 bouyer Exp $
 
 DISTNAME=	ffproxy-1.6
 CATEGORIES=	www
 MASTER_SITES=	http://faith.eu.org/ffproxy/
+PKGREVISION=	1
 
 MAINTAINER=	niklas@noxa.de
 HOMEPAGE=	http://faith.eu.org/programs.html\#ffproxy
diff --git a/www/ffproxy/distinfo b/www/ffproxy/distinfo
index ac36df36b03..76daa05879c 100644
--- a/www/ffproxy/distinfo
+++ b/www/ffproxy/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/05 19:12:35 garbled Exp $
+$NetBSD: distinfo,v 1.2 2008/10/16 20:28:06 bouyer Exp $
 
 SHA1 (ffproxy-1.6.tar.gz) = 89c78f47f38caf8f88e9cfd0c4d71c81284f0f24
 RMD160 (ffproxy-1.6.tar.gz) = ee04548d22a5d9dd12d6ffc6a36a638b59dc46a5
 Size (ffproxy-1.6.tar.gz) = 77535 bytes
 SHA1 (patch-aa) = e5e0cc7c822470c78e95f3703b3a579f8ec39585
+SHA1 (patch-ab) = 2b669ed830c9e9e1e069a4f99e32b442b60f3b0d
+SHA1 (patch-ac) = f2b6d62ad5e55258c757037269cf854dfe727bdb
diff --git a/www/ffproxy/patches/patch-ab b/www/ffproxy/patches/patch-ab
new file mode 100644
index 00000000000..e4074f33c7d
--- /dev/null
+++ b/www/ffproxy/patches/patch-ab
@@ -0,0 +1,20 @@
+--- 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) {
diff --git a/www/ffproxy/patches/patch-ac b/www/ffproxy/patches/patch-ac
new file mode 100644
index 00000000000..fd5e63d8dbb
--- /dev/null
+++ b/www/ffproxy/patches/patch-ac
@@ -0,0 +1,20 @@
+--- 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");
+ 		}
-- 
cgit v1.2.3