update to 3.0.22

changes: many fixes and small improvements, most notably some memory
 leak and a use-after-free are fixed which might be security issues

6 files changed, 36 insertions, 48 deletions

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index f4f8c24aab4..cba07a13917 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2014/10/14 06:39:30 dholland Exp $
+# $NetBSD: Makefile,v 1.55 2015/01/15 19:39:15 drochner Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
-PKGNAME=	privoxy-3.0.19
-PKGREVISION=	6
+PKGNAME=	privoxy-3.0.22
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
diff --git a/www/privoxy/PLIST b/www/privoxy/PLIST
index 489a35a89a0..f9d9e3c1f2e 100644
--- a/www/privoxy/PLIST
+++ b/www/privoxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/01/15 19:39:15 drochner Exp $
 man/man1/privoxy.1
 sbin/privoxy
 share/doc/privoxy/AUTHORS
@@ -6,14 +6,11 @@ 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/seealso.html
 share/doc/privoxy/developer-manual/testing.html
 share/doc/privoxy/developer-manual/webserver-update.html
 share/doc/privoxy/faq/configuration.html
@@ -46,13 +43,10 @@ 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/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
@@ -63,6 +57,7 @@ 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/connection-timeout
 share/examples/privoxy/templates/default
 share/examples/privoxy/templates/edit-actions-add-url-form
 share/examples/privoxy/templates/edit-actions-for-url
@@ -78,6 +73,7 @@ share/examples/privoxy/templates/mod-local-help
 share/examples/privoxy/templates/mod-support-and-service
 share/examples/privoxy/templates/mod-title
 share/examples/privoxy/templates/mod-unstable-warning
+share/examples/privoxy/templates/no-server-data
 share/examples/privoxy/templates/no-such-domain
 share/examples/privoxy/templates/show-request
 share/examples/privoxy/templates/show-status
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index a3abd9850d8..f6d9c7fa2e2 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2013/08/30 16:56:08 joerg Exp $
+$NetBSD: distinfo,v 1.21 2015/01/15 19:39:15 drochner Exp $
 
-SHA1 (privoxy-3.0.19-stable-src.tar.gz) = a82287cbf48375ef449d021473a366baeca49250
-RMD160 (privoxy-3.0.19-stable-src.tar.gz) = 6a4d6914d2cec8f90b82c9b2ab28dda55b271561
-Size (privoxy-3.0.19-stable-src.tar.gz) = 1722316 bytes
-SHA1 (patch-aa) = c263d2a4b9522a33613f82ab2bc18d5c2b554b21
-SHA1 (patch-ab) = 6ab77caae5e6ac2b67c4c795af38db4da1310c61
-SHA1 (patch-ac) = 6b0f5c2b32108cf4366a9f7feaad8a5be634e2e9
+SHA1 (privoxy-3.0.22-stable-src.tar.gz) = 16cab9bb2055546a5f70815044dab893396c5686
+RMD160 (privoxy-3.0.22-stable-src.tar.gz) = b874d44563af809c353df531b3f9f7765deb5284
+Size (privoxy-3.0.22-stable-src.tar.gz) = 1737251 bytes
+SHA1 (patch-aa) = d5296d7440b92b76c28136453d098c617d4e439b
+SHA1 (patch-ab) = c54a5845ad76d36ea281697cce17237d1d2ee0bd
+SHA1 (patch-ac) = 2d1a1efc53b4cd017d3ce21080adf1bfcc5cc97c
 SHA1 (patch-ag) = 64957682dbb3ff8b78ef47cc936d591facf9eb3a
diff --git a/www/privoxy/patches/patch-aa b/www/privoxy/patches/patch-aa
index a9a08a6782f..b1f8c70d991 100644
--- a/www/privoxy/patches/patch-aa
+++ b/www/privoxy/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2008/03/12 21:35:03 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2015/01/15 19:39:16 drochner Exp $
 
---- config.orig	2008-01-17 19:17:15.000000000 +0100
+--- config.orig	2014-11-14 11:31:53.000000000 +0000
 +++ config
-@@ -260,7 +260,7 @@ trust-info-url  http://www.example.com/w
+@@ -260,7 +260,7 @@
  #
  #      No trailing "/", please.
  #
 -confdir .
 +confdir @PKG_SYSCONFDIR@
  #
- #
  #  2.2. templdir
-@@ -315,7 +315,7 @@ confdir .
+ #  ==============
+@@ -345,7 +345,7 @@ confdir .
  #
  #      No trailing "/", please.
  #
 -logdir .
 +logdir /var/log/privoxy
  #
- #
- #  2.4. actionsfile
+ #  2.5. actionsfile
+ #  =================
diff --git a/www/privoxy/patches/patch-ab b/www/privoxy/patches/patch-ab
index 051e66404e5..c1bf1b2d263 100644
--- a/www/privoxy/patches/patch-ab
+++ b/www/privoxy/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2011/12/07 16:13:51 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2015/01/15 19:39:16 drochner Exp $
 
 Multiple changes.
 
@@ -15,18 +15,9 @@ Multiple changes.
    Not pushed upstream; it's not clear that upstream supports DESTDIR
    at all.
 
---- GNUmakefile.in.orig	2011-09-06 18:45:28.000000000 +0000
+--- GNUmakefile.in.orig	2013-02-05 14:04:11.000000000 +0000
 +++ GNUmakefile.in
-@@ -86,7 +86,7 @@ INSTALL    = @INSTALL@
- # Binaries
- BIN_MODE	 = 0755
- # Support files, docs, etc.
--RA_MODE   = 0664
-+RA_MODE   = 0644
- # Directory
- DIR_MODE   = 0755
- # Files daemon writes to.
-@@ -808,16 +808,6 @@ install-strip:
+@@ -809,16 +809,6 @@ install-strip:
  # 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
@@ -43,7 +34,7 @@ Multiple changes.
  	@$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
  	$(CHMOD) $(DIR_MODE) $(MKDIR)
  	@$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) \
-@@ -885,48 +875,13 @@ install: CONF_DEST LOG_DEST PID_DEST che
+@@ -886,48 +876,13 @@ install: CONF_DEST LOG_DEST PID_DEST che
  		$(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
  	done
  
@@ -93,7 +84,7 @@ Multiple changes.
  			$(ECHO) Installing $$i as $$i.new ;\
  			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
  			NEW=1;\
-@@ -938,36 +893,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
+@@ -939,36 +894,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
  		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
  		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
  	fi ;\
diff --git a/www/privoxy/patches/patch-ac b/www/privoxy/patches/patch-ac
index daeeafc4ec9..0bc4543c315 100644
--- a/www/privoxy/patches/patch-ac
+++ b/www/privoxy/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2011/12/07 16:13:51 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2015/01/15 19:39:16 drochner Exp $
 
---- configure.in.orig	2011-11-13 16:53:45.000000000 +0000
+--- configure.in.orig	2014-11-14 11:30:59.000000000 +0000
 +++ configure.in
-@@ -164,29 +164,12 @@ if test "$EMXOS2" = yes; then
+@@ -165,29 +165,12 @@ if test "$EMXOS2" = yes || test "$host_o
  
  else
  
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.2 2011/12/07 16:13:51 drochner Exp $
          ],
          [
            if test $ID = no ; then
-@@ -203,27 +186,8 @@ else
+@@ -204,29 +187,6 @@ else
    AC_ARG_WITH(group,
          [  --with-group=privoxy         Set group for privoxy],
          [
@@ -40,15 +40,17 @@ $NetBSD: patch-ac,v 1.2 2011/12/07 16:13:51 drochner Exp $
 -                  if test $BGROUPS = no ; then
 -                    AC_MSG_ERROR(There is no 'groups' program on this system)
 -                  else
-                     AC_MSG_RESULT($with_group)
+-                    AC_MSG_RESULT($with_group)
 -                    $BGROUPS $USER >/dev/null
 -                    if test $? -eq 0 ; then
--                    # FIXME: this fails if valid group, but not first group
--                    # listed.
--                      if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
+-                      for i in `$BGROUPS $USER | sed 's/.*: //' 2>/dev/null`; do
+-                        if test "x$i" = "x$with_group" ; then
+-                          GROUP=$with_group
+-                          break
+-                        fi
+-                      done
+-                      if test "x$GROUP" != "x$with_group" ; then
 -                        AC_MSG_ERROR(The given value '$withval' does not match group entry)
--                      else
-                         GROUP=$with_group;
 -                      fi
 -                    else
 -                      AC_MSG_ERROR(There is no group entry for user '$USER')