Import of pkgsrc-2013Q2

www/ffproxy/DESCR

@@ -0,0 +1,8 @@
+ffproxy is a filtering HTTP/HTTPS proxy server. It is able to filter by
+host, URL, and header. Custom header entries can be filtered and added.
+It can even drop its privileges and optionally chroot() to some
+directory. Logging to syslog() is supported, as is using another
+auxiliary proxy server. An HTTP accelerator feature (acting as a
+front-end to an HTTP server) is included. Contacting IPv6 servers as
+well as binding to IPv6 is supported and allows transparent IPv6 over
+IPv4 browsing (and vice versa).

www/ffproxy/Makefile

@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.5 2012/10/28 06:30:15 asau 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
+COMMENT=	Filtering HTTP/HTTPS proxy server
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=	yes
+
+CONF_FILES=	${PREFIX}/share/ffproxy/sample.config ${PKG_SYSCONFDIR}/ffproxy.conf
+.include "../../mk/bsd.pkg.mk"

www/ffproxy/PLIST

@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:21 joerg Exp $
+bin/ffproxy
+man/man5/ffproxy.conf.5
+man/man7/ffproxy.quick.7
+man/man8/ffproxy.8
+share/ffproxy/db/access.dyndns
+share/ffproxy/db/access.host
+share/ffproxy/db/access.ip
+share/ffproxy/db/filter.header.add
+share/ffproxy/db/filter.header.drop
+share/ffproxy/db/filter.header.entry
+share/ffproxy/db/filter.header.match
+share/ffproxy/db/filter.host.match
+share/ffproxy/db/filter.rheader.drop
+share/ffproxy/db/filter.rheader.entry
+share/ffproxy/db/filter.rheader.match
+share/ffproxy/db/filter.url.match
+share/ffproxy/html/connect
+share/ffproxy/html/filtered
+share/ffproxy/html/invalid
+share/ffproxy/html/post
+share/ffproxy/html/resolve
+share/ffproxy/sample.config

www/ffproxy/distinfo

@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.3 2011/09/12 16:46:45 taca 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) = 63d861ee3c9307f5eb0ad7e7946a120ef35a78a0
+SHA1 (patch-ab) = ae6002a9d65f646877cce59da9b69d6074ac0705
+SHA1 (patch-ac) = 87b7ebc8f76078e2cbe75894b34aa65fb62a6415

www/ffproxy/patches/patch-aa

@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+Stop installing configuration which handled by pkgsrc's pkginstall framework.
+
+--- Makefile.in.orig	2006-01-05 11:50:45.000000000 -0700
++++ Makefile.in	2006-01-05 11:51:59.000000000 -0700
+@@ -62,7 +62,7 @@
+ 		$(DESTDIR)$(mandir)/man7 \
+ 		$(DESTDIR)$(mandir)/man8
+ 
+-install: installdirs install_bin install_man install_config install_sample install_data
++install: installdirs install_bin install_man install_sample install_data
+ 
+ install_bin: ffproxy
+ 	$(INSTALL_PROGRAM) ffproxy $(DESTDIR)$(bindir)

www/ffproxy/patches/patch-ab

@@ -0,0 +1,71 @@
+$NetBSD: patch-ab,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+* Avoid using function name "getline" which conflict with system
+  defined one.
+* Fix parameter to setsockopt(2).
+
+--- request.c.orig	2004-12-31 17:59:54.000000000 +0900
++++ request.c	2010-01-29 16:46:16.000000000 +0900
+@@ -49,7 +49,7 @@
+ 
+ static int      read_header(int, struct req *);
+ static char     sgetc(int);
+-static size_t   getline(int, char[], int);
++static size_t   get_line(int, char[], int);
+ static int      do_request(int, struct req *);
+ 
+ void
+@@ -63,7 +63,7 @@
+ 	(void) memset(&r, 0, sizeof(r));
+ 	r.cl = clinfo;
+ 
+-	if (getline(cl, buf, sizeof(buf)) < 1)
++	if (get_line(cl, buf, sizeof(buf)) < 1)
+ 		*buf = '\0';
+ 
+ 	if ((http_url(&r, buf)) == 0) {
+@@ -189,7 +189,7 @@
+ 	char           *b, *p;
+ 
+ 	i = 0;
+-	while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++	while ((len = get_line(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 		b = buf;
+ 		while (isspace((int) *b) && *(b++) != '\0');
+ 		if (*b == '\0')
+@@ -228,7 +228,7 @@
+ }
+ 
+ static          size_t
+-getline(int s, char buf[], int len)
++get_line(int s, char buf[], int len)
+ {
+ 	int             c;
+ 	size_t          i;
+@@ -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) {
+@@ -493,7 +493,7 @@
+ 	}
+ 	if (r->type != CONNECT) {
+ 		i = 0;
+-		while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++		while ((len = get_line(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 			DEBUG(("do_request() => got remote header line: (%s)", buf));
+ 			r->header[i] = (char *) my_alloc(len + 1);
+ 			(void) strcpy(r->header[i++], buf);

www/ffproxy/patches/patch-ac

@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+* Fix parameter to setsockopt(2).
+
+--- 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");
+ 		}