diff options
| author | bouyer <bouyer> | 2008-10-16 20:28:06 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2008-10-16 20:28:06 +0000 |
| commit | 212e553ce248742d28fb47b944f1fa2bcec47242 (patch) | |
| tree | 67e97bd1eb7db20bcb0199c7a7835986128a7041 /www/ffproxy/patches | |
| parent | a60e5329c58bba3fdbb8f8c35d39c394cd0b61df (diff) | |
| download | pkgsrc-212e553ce248742d28fb47b944f1fa2bcec47242.tar.gz | |
Fix parameters to setsockop() calls. Bump PKGREVISION.
Diffstat (limited to 'www/ffproxy/patches')
| -rw-r--r-- | www/ffproxy/patches/patch-ab | 20 | ||||
| -rw-r--r-- | www/ffproxy/patches/patch-ac | 20 |
2 files changed, 40 insertions, 0 deletions
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"); + } |