 @@ -1,19 +1,18 @@
-# $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
+PKGNAME=	privoxy-3.0.16
 PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.privoxy.org/
 COMMENT=	Web proxy with advanced filtering capabilities
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 PRIVOXY_USER?=		privoxy
 PRIVOXY_GROUP?=		privoxy
 @@ -23,27 +22,28 @@ PKG_USERS_VARS+=	PRIVOXY_USER
 PKG_SYSCONFSUBDIR?=	privoxy
 RCD_SCRIPTS=		privoxy
 PKG_GROUPS=		${PRIVOXY_GROUP}
 PKG_USERS=		${PRIVOXY_USER}:${PRIVOXY_GROUP}
 EGDIR=			${PREFIX}/share/examples/privoxy
 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
 PTHREAD_AUTO_VARS=	yes
 PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${EGDIR:Q}
 CONFIGURE_ARGS+=	--with-user=${PRIVOXY_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${PRIVOXY_GROUP:Q}

 @@ -1,29 +1,28 @@
-@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
 share/doc/privoxy/ChangeLog
 share/doc/privoxy/LICENSE
 share/doc/privoxy/README
 share/doc/privoxy/developer-manual/coding.html
 share/doc/privoxy/developer-manual/contact.html
 share/doc/privoxy/developer-manual/copyright.html
 share/doc/privoxy/developer-manual/cvs.html
 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
 share/doc/privoxy/faq/configuration.html
 share/doc/privoxy/faq/contact.html
 share/doc/privoxy/faq/copyright.html
 share/doc/privoxy/faq/general.html
 share/doc/privoxy/faq/index.html
 share/doc/privoxy/faq/installation.html
 share/doc/privoxy/faq/misc.html
 share/doc/privoxy/faq/trouble.html
 share/doc/privoxy/index.html
 share/doc/privoxy/man-page/privoxy-man-page.html
 @@ -36,33 +35,34 @@ share/doc/privoxy/user-manual/contact.ht
 share/doc/privoxy/user-manual/copyright.html
 share/doc/privoxy/user-manual/files-in-use.jpg
 share/doc/privoxy/user-manual/filter-file.html
 share/doc/privoxy/user-manual/index.html
 share/doc/privoxy/user-manual/installation.html
 share/doc/privoxy/user-manual/introduction.html
 share/doc/privoxy/user-manual/p_doc.css
 share/doc/privoxy/user-manual/proxy2.jpg
 share/doc/privoxy/user-manual/proxy_setup.jpg
 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
 share/examples/privoxy/templates/cgi-error-disabled
 share/examples/privoxy/templates/cgi-error-file
 share/examples/privoxy/templates/cgi-error-file-read-only
 share/examples/privoxy/templates/cgi-error-modified
 share/examples/privoxy/templates/cgi-error-parse
 share/examples/privoxy/templates/cgi-style.css
 share/examples/privoxy/templates/connect-failed
 share/examples/privoxy/templates/default
 share/examples/privoxy/templates/edit-actions-add-url-form
 share/examples/privoxy/templates/edit-actions-for-url

 @@ -1,44 +1,44 @@
-$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.orig	2009-12-16 09:15:42.000000000 +0100
-+++ GNUmakefile.in
++++ GNUmakefile.in	2010-02-24 20:15:48.000000000 +0100
-@@ -87,7 +87,7 @@ INSTALL    = @INSTALL@
+@@ -85,7 +85,7 @@
  # Binaries
  BIN_MODE	 = 0755
  # Support files, docs, etc.
 -RA_MODE   = 0664
 +RA_MODE   = 0644
  # 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
 -	@# Quick test for valid USER.
 -	@if [ -n "$(USER)" ]; then \
 -		$(ID) $(USER) >/dev/null || exit 1;\
 -	fi
 -	@# Test for valid group. FIXME. USER does not have to belong to GROUP
 -	@# for file ownership purposes.
 -# 	if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! $(GROUPS) $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \
 -# 		$(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\
 -# 	fi
+-
  	@$(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
 -	@# FIXME: group/user validation is overly convoluted.
 -	@# If superuser install ... we require a minimum of group ownership
 -	@# of those files the daemon writes to, to be non-root owned.
 -	@if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\
 -		if [ x$(USER) = x ] || [ $(USER) = root ]; then \
 -			if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \
 -				if [ "`$(ID) privoxy`" ] && \
 -					$(GROUPS) privoxy | $(SED) 's/^.*://' |$(GREP) "\<privoxy\>" >/dev/null; then \
 -					$(ECHO) "Warning: Setting group owner to privoxy";\
 -					GROUP_T=privoxy ;\
 @@ -60,59 +60,50 @@ $NetBSD: patch-ab,v 1.5 2010/02/09 20:18
 -			INSTALL_CONF="$(INSTALL_R) -o $(USER) -g $(GROUP_T)" ;\
 -			GROUP_T=$(GROUP_T) ;\
 -		fi ;\
 -	else \
 -		if [ ! "`id $(USER)`" = "`id`" ] ;then \
 -			$(ECHO) "** WARNING ** current install user different from configured user!!" ;\
 -			$(ECHO) "Edit may fail." ;\
 -		fi ;\
 -		INSTALL_CONF="$(INSTALL_R)" ;\
 -	fi ;\
  	$(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 ;\
 -	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
 -		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
 -		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
 -	if [ x$$USER != x ]; then \
 -		$(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
 -		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
 -	fi ;\
 -	if [ x$$GROUP_T != x ]; then \
 -		$(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
 -		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
 -	fi ;\
 -	$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
 -	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
 -		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
 -               $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
 -               $(SED) 's+%SBIN_DEST%+$(SBIN_DEST)+' | \
 -               $(SED) 's+%CONF_DEST%+$(CONF_DEST)+' | \
 -               $(SED) 's+%USER%+$(USER)+' | \
 -               $(SED) 's+%GROUP%+$(GROUP_T)+' >slackware/rc.privoxy ;\
 -			$(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." ;\
 -			$(INSTALL) $(INSTALL_P) privoxy-generic.init $(DESTDIR)/etc/init.d/privoxy ;\
 -		fi ;\
 -	else \
 -		$(ECHO) "No init script installed, install it manually if needed" ;\
 -	fi
  	$(RM) config.base config.tmp
  	@# mmmmm, good.
  	@$(ECHO) "$(PROGRAM_V) installation succeeded!"

 @@ -1,33 +1,33 @@
-$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.orig	2009-10-04 18:38:26.000000000 +0200
-+++ jbsockets.c	2009-04-07 15:54:10.000000000 +0200
++++ jbsockets.c	2009-10-19 23:16:53.000000000 +0200
-@@ -945,6 +945,14 @@
+@@ -1097,6 +1097,14 @@
     struct sockaddr_in inaddr;
     struct hostent *hostp;
     unsigned int dns_retries = 0;
 +#if defined(__NetBSD__)
 +   struct hostent result;
 +	struct sockaddr_in raddr;
 +	struct sockaddr_in *rlist[2];
++
 +	memset(&result, '\0', sizeof(struct hostent));
 +#endif
++
  #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;
+       }
 +#elif defined(__NetBSD__)
 +	/* mjl */
 +	{
 +	struct addrinfo *resp = NULL;
 +	struct addrinfo hints;
++
 +	hostp = NULL;
 +	memset(&hints, '\0', sizeof(struct addrinfo));
 +	hints.ai_family = AF_INET;
++
 @@ -44,16 +44,16 @@ $NetBSD: patch-ag,v 1.2 2009/04/07 14:02
 +		result.h_addrtype = resp->ai_family;
 +		memcpy(&raddr, &((struct sockaddr_in *) resp->ai_addr)
 +								->sin_addr, sizeof(struct sockaddr_in));
 +		/* set up fake hostent */
 +		rlist[0] = &raddr;
 +		rlist[1] = NULL;
 +		result.h_addr_list = (char **)rlist;
 +		hostp = &result;
++
 +		freeaddrinfo(resp);
 +		}
 +	}
++
- #elif FEATURE_PTHREAD
+ #elif defined(MUTEX_LOCKS_AVAILABLE)
        privoxy_mutex_lock(&resolver_mutex);
        while (NULL == (hostp = gethostbyname(host))

 @@ -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
+SHA1 (privoxy-3.0.16-stable-src.tar.gz) = 2c9c44034ff0509c124fac98cb741a2c2572edcd
-RMD160 (privoxy-3.0.12-stable-src.tar.gz) = 32509b897e073f1cc100b8a4a157d19a219b51cd
+RMD160 (privoxy-3.0.16-stable-src.tar.gz) = 36723f0269f9a03394c959eb6587b57fdb7eb713
-Size (privoxy-3.0.12-stable-src.tar.gz) = 1811124 bytes
+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