Update to privoxy 3.0.16 stable.

This is the first stable release since 3.0.12.
It introduces IPv6 support, improved keep-alive support and a bunch of
minor improvements.

5 files changed, 26 insertions, 35 deletions

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index c3b3cdabdad..a00394adc59 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/02/09 20:18:43 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2010/02/24 23:22:45 mjl Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
-PKGNAME=	privoxy-3.0.12
-PKGREVISION=	1
+PKGNAME=	privoxy-3.0.16
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -33,7 +32,8 @@ CPPFLAGS+=		-Dunix
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}-stable
 
 USE_FEATURES=		snprintf
-USE_TOOLS+=		autoconf213 gmake mktemp
+USE_TOOLS+=		gmake mktemp autoconf autoheader
+BUILD_DEFS+=       VARBASE
 MAKE_FILE=		GNUmakefile
 
 USE_TOOLS+=		perl
diff --git a/www/privoxy/PLIST b/www/privoxy/PLIST
index c5201603a13..60b83e811be 100644
--- a/www/privoxy/PLIST
+++ b/www/privoxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 22:00:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/02/24 23:22:45 mjl Exp $
 man/man1/privoxy.1
 sbin/privoxy
 share/doc/privoxy/AUTHORS
@@ -13,7 +13,6 @@ share/doc/privoxy/developer-manual/documentation.html
 share/doc/privoxy/developer-manual/index.html
 share/doc/privoxy/developer-manual/introduction.html
 share/doc/privoxy/developer-manual/newrelease.html
-share/doc/privoxy/developer-manual/quickstart.html
 share/doc/privoxy/developer-manual/seealso.html
 share/doc/privoxy/developer-manual/testing.html
 share/doc/privoxy/developer-manual/webserver-update.html
@@ -46,13 +45,14 @@ share/doc/privoxy/user-manual/quickstart.html
 share/doc/privoxy/user-manual/seealso.html
 share/doc/privoxy/user-manual/startup.html
 share/doc/privoxy/user-manual/templates.html
-share/doc/privoxy/user-manual/upgradersnote.html
 share/doc/privoxy/user-manual/whatsnew.html
 share/examples/privoxy/templates/url-info-osd.xml
 share/examples/privoxy/config
 share/examples/privoxy/default.action
 share/examples/privoxy/default.filter
 share/examples/privoxy/match-all.action
+share/examples/privoxy/templates/connection-timeout
+share/examples/privoxy/templates/no-server-data
 share/examples/privoxy/templates/blocked
 share/examples/privoxy/templates/cgi-error-404
 share/examples/privoxy/templates/cgi-error-bad-param
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index e2f445b282f..15ae05a3b94 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2010/02/09 20:18:43 joerg Exp $
+$NetBSD: distinfo,v 1.15 2010/02/24 23:22:45 mjl Exp $
 
-SHA1 (privoxy-3.0.12-stable-src.tar.gz) = 1118d6a7b4980f26c9ad0902c0e6af5aaaf1a640
-RMD160 (privoxy-3.0.12-stable-src.tar.gz) = 32509b897e073f1cc100b8a4a157d19a219b51cd
-Size (privoxy-3.0.12-stable-src.tar.gz) = 1811124 bytes
+SHA1 (privoxy-3.0.16-stable-src.tar.gz) = 2c9c44034ff0509c124fac98cb741a2c2572edcd
+RMD160 (privoxy-3.0.16-stable-src.tar.gz) = 36723f0269f9a03394c959eb6587b57fdb7eb713
+Size (privoxy-3.0.16-stable-src.tar.gz) = 1656721 bytes
 SHA1 (patch-aa) = c263d2a4b9522a33613f82ab2bc18d5c2b554b21
-SHA1 (patch-ab) = 2e16792661d12d74231cb2deef2f343ae2dc1d66
+SHA1 (patch-ab) = aa54264ea32954be4cba3fcf5ed4d08919179fb9
 SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
-SHA1 (patch-ag) = fea1c2ef70a99ab6da3feab22c69f3b98c0e75d0
+SHA1 (patch-ag) = 79d1d09122b52617d4abededcbfdc38b1f6caf8f
diff --git a/www/privoxy/patches/patch-ab b/www/privoxy/patches/patch-ab
index eb2a860d3fe..24dff8451c1 100644
--- a/www/privoxy/patches/patch-ab
+++ b/www/privoxy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2010/02/09 20:18:43 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2010/02/24 23:22:45 mjl Exp $
 
---- GNUmakefile.in.orig	2009-02-28 08:28:14.000000000 +0000
-+++ GNUmakefile.in
-@@ -87,7 +87,7 @@ INSTALL    = @INSTALL@
+--- GNUmakefile.in.orig	2009-12-16 09:15:42.000000000 +0100
++++ GNUmakefile.in	2010-02-24 20:15:48.000000000 +0100
+@@ -85,7 +85,7 @@
  # Binaries
  BIN_MODE	 = 0755
  # Support files, docs, etc.
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2010/02/09 20:18:43 joerg Exp $
  # Directory
  DIR_MODE   = 0755
  # Files daemon writes to.
-@@ -1029,16 +1029,6 @@ install-strip:
+@@ -787,16 +787,6 @@
  # Perhaps the whole user/group validation should be done here, and simplified.
  PROGRAM_V = Privoxy $(VERSION) $(CODE_STATUS)
  install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.5 2010/02/09 20:18:43 joerg Exp $
  	@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
  	$(CHMOD) $(DIR_MODE) $(MKDIR)
  	@$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
-@@ -1106,41 +1096,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
+@@ -864,41 +854,6 @@
  		$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
  	done
  
@@ -70,7 +70,7 @@ $NetBSD: patch-ab,v 1.5 2010/02/09 20:18:43 joerg Exp $
  	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
  	for i in $(CONFIGS); do \
  		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
-@@ -1159,45 +1114,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
+@@ -917,36 +872,6 @@
  		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
  		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
  	fi ;\
@@ -96,15 +96,6 @@ $NetBSD: patch-ab,v 1.5 2010/02/09 20:18:43 joerg Exp $
 -			$(INSTALL) $(INSTALL_P) slackware/rc.privoxy $(DESTDIR)/etc/rc.d/ ;\
 -               $(ECHO) "Installing for Slackware." ;\
 -               $(ECHO) "Dont forget to add the rc.privoxy to rc.local if you want it started at every boot" ;\
--		elif [ -f /etc/redhat-release ] && [ -d /etc/rc.d/init.d/ ] && [ -w /etc/rc.d/init.d/ ] ; then \
--               $(ECHO) "Installing init script to /etc/rc.d/init.d/privoxy" ;\
--			$(SED) 's,^PRIVOXY_BIN=.*,PRIVOXY_BIN="/usr/local/sbin/$(PROGRAM)",' privoxy.init |\
--			$(SED) 's,^PRIVOXY_CONF=.*,PRIVOXY_CONF="$(CONF_DEST)/config",' |\
--			$(SED) "s,^PRIVOXY_USER=.*,PRIVOXY_USER=$$USER," > init.tmp ;\
--			$(INSTALL) $(INSTALL_P) init.tmp $(DESTDIR)/etc/rc.d/init.d/privoxy && $(RM) init.tmp;\
--			$(MKDIR) $(DESTDIR)/etc/logrotate.d/ ;\
--			$(ECHO) "Installing logrotate script to $(DESTDIR)/etc/logrotate.d/" ;\
--			$(INSTALL) -m 0644 privoxy.logrotate $(DESTDIR)/etc/logrotate.d/privoxy ;\
 -		elif [ -d $(DESTDIR)/etc/init.d ] && [ -w $(DESTDIR)/etc/init.d ] ; then \
 -			$(ECHO) "Installing generic init script to $(DESTDIR)/etc/init.d/privoxy" ;\
 -			$(ECHO) "Please check that the PATHs are correct, and edit if needed." ;\
diff --git a/www/privoxy/patches/patch-ag b/www/privoxy/patches/patch-ag
index e9e683bfe85..42bd09be7f9 100644
--- a/www/privoxy/patches/patch-ag
+++ b/www/privoxy/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2009/04/07 14:02:06 mjl Exp $
+$NetBSD: patch-ag,v 1.3 2010/02/24 23:22:45 mjl Exp $
 
---- jbsockets.c.orig	2008-12-20 15:53:55.000000000 +0100
-+++ jbsockets.c	2009-04-07 15:54:10.000000000 +0200
-@@ -945,6 +945,14 @@
+--- jbsockets.c.orig	2009-10-04 18:38:26.000000000 +0200
++++ jbsockets.c	2009-10-19 23:16:53.000000000 +0200
+@@ -1097,6 +1097,14 @@
     struct sockaddr_in inaddr;
     struct hostent *hostp;
     unsigned int dns_retries = 0;
@@ -17,7 +17,7 @@ $NetBSD: patch-ag,v 1.2 2009/04/07 14:02:06 mjl Exp $
  #if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS) || defined(HAVE_GETHOSTBYNAME_R_3_ARGS)
     struct hostent result;
  #if defined(HAVE_GETHOSTBYNAME_R_6_ARGS) || defined(HAVE_GETHOSTBYNAME_R_5_ARGS)
-@@ -995,6 +1003,39 @@
+@@ -1147,6 +1155,39 @@
        {
           hostp = NULL;
        }
@@ -54,6 +54,6 @@ $NetBSD: patch-ag,v 1.2 2009/04/07 14:02:06 mjl Exp $
 +		}
 +	}
 +
- #elif FEATURE_PTHREAD
+ #elif defined(MUTEX_LOCKS_AVAILABLE)
        privoxy_mutex_lock(&resolver_mutex);
        while (NULL == (hostp = gethostbyname(host))