[pkgsrc/trunk]: pkgsrc/www/ffproxy Fix parameters to setsockop() calls. Bump ...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e9a0eafbe83
branches:  trunk
changeset: 548520:4e9a0eafbe83
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Thu Oct 16 20:28:06 2008 +0000

description:
Fix parameters to setsockop() calls. Bump PKGREVISION.

diffstat:

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

diffs (75 lines):

diff -r 3fd94836b57f -r 4e9a0eafbe83 www/ffproxy/Makefile
--- a/www/ffproxy/Makefile      Thu Oct 16 20:07:33 2008 +0000
+++ b/www/ffproxy/Makefile      Thu Oct 16 20:28:06 2008 +0000
@@ -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@localhost
 HOMEPAGE=      http://faith.eu.org/programs.html\#ffproxy
diff -r 3fd94836b57f -r 4e9a0eafbe83 www/ffproxy/distinfo
--- a/www/ffproxy/distinfo      Thu Oct 16 20:07:33 2008 +0000
+++ b/www/ffproxy/distinfo      Thu Oct 16 20:28:06 2008 +0000
@@ -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 -r 3fd94836b57f -r 4e9a0eafbe83 www/ffproxy/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ffproxy/patches/patch-ab      Thu Oct 16 20:28:06 2008 +0000
@@ -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 -r 3fd94836b57f -r 4e9a0eafbe83 www/ffproxy/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ffproxy/patches/patch-ac      Thu Oct 16 20:28:06 2008 +0000
@@ -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");
+               }