svn commit: r374672 - head/www/privoxy

[Pawel Pekala]

Author: pawel
Date: Sat Dec 13 18:48:45 2014
New Revision: 374672
URL: https://svnweb.freebsd.org/changeset/ports/374672
QAT: https://qat.redports.org/buildarchive/r374672/

Log:
  - Update to version 3.0.22
  - Clean pkg-plist
  
  The changes are listed here:
  http://www.privoxy.org/3.0.22/user-manual/whatsnew.html
  
  This update fixes two security issues.
  
  PR:		195468
  Submitted by:	maintainer

Modified:
  head/www/privoxy/Makefile
  head/www/privoxy/distinfo
  head/www/privoxy/pkg-plist

Modified: head/www/privoxy/Makefile
==============================================================================
--- head/www/privoxy/Makefile	Sat Dec 13 18:37:33 2014	(r374671)
+++ head/www/privoxy/Makefile	Sat Dec 13 18:48:45 2014	(r374672)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	privoxy
-PORTVERSION=	3.0.21
-PORTREVISION=	2
+PORTVERSION=	3.0.22
 CATEGORIES=	www ipv6
 MASTER_SITES=	SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
 DISTNAME=	privoxy-${PORTVERSION}-stable-src
@@ -80,6 +79,13 @@ post-patch:
 		${WRKSRC}/config
 	${REINPLACE_CMD} \
 		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
+	# Mimic upstream commit v1.209 to fix compilation with --disable-force.
+	${REINPLACE_CMD} \
+		-E 's@#(ifdef|endif).*FEATURE_FORCE_LOAD.*@@' ${WRKSRC}/project.h
+	# Mimic upstream commit v1.57 to get the tests working with the default config.
+	${REINPLACE_CMD} \
+		-e 's@\(keep-alive-timeout\\s\+\).*@\1(2[1-9]+|[3-9]\\d+|1\\d{2,})@' \
+		${WRKSRC}/regression-tests.action
 
 pre-configure:
 	@(cd ${WRKSRC}; ${AUTOHEADER})

Modified: head/www/privoxy/distinfo
==============================================================================
--- head/www/privoxy/distinfo	Sat Dec 13 18:37:33 2014	(r374671)
+++ head/www/privoxy/distinfo	Sat Dec 13 18:48:45 2014	(r374672)
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.21-stable-src.tar.gz) = 5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8
-SIZE (privoxy-3.0.21-stable-src.tar.gz) = 1733120
+SHA256 (privoxy-3.0.22-stable-src.tar.gz) = 1a214fec1f3616ea7ff42f1ecdb67ce82690199ec403de9d34b99d0896efcc41
+SIZE (privoxy-3.0.22-stable-src.tar.gz) = 1737251

Modified: head/www/privoxy/pkg-plist
==============================================================================
--- head/www/privoxy/pkg-plist	Sat Dec 13 18:37:33 2014	(r374671)
+++ head/www/privoxy/pkg-plist	Sat Dec 13 18:48:45 2014	(r374672)
@@ -66,8 +66,3 @@ etc/privoxy/templates/url-info-osd.xml
 %%EXAMPLESDIR%%/match-all.action
 %%EXAMPLESDIR%%/trust
 %%EXAMPLESDIR%%/user.action
- at dirrmtry %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/user-manual
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrmtry etc/privoxy/templates
- at dirrmtry etc/privoxy