From 4060974c6b46368438f98c47a5283ad758ecc982 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 31 Dec 2018 19:40:56 +0100
Subject: [PATCH] www/privoxy: sync with upstream

Taken from: HardenedBSD
---
 www/privoxy/Makefile  | 10 ++++------
 www/privoxy/distinfo  |  6 +++---
 www/privoxy/pkg-plist |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index ccc893adfe13..7a65371fa978 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	privoxy
-PORTVERSION=	3.0.26
+PORTVERSION=	3.0.28
 CATEGORIES=	www ipv6
 MASTER_SITES=	https://www.privoxy.org/sf-download-mirror/Sources/${PORTVERSION}%20(stable)/ \
 		SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
@@ -13,11 +13,12 @@ COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
+USES=		autoreconf cpe gmake shebangfix
+
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
 USE_HARDENING=	safestack
 
-USES=		autoreconf cpe gmake shebangfix
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	tools/privoxy-log-parser.pl tools/privoxy-regression-test.pl tools/uagen.pl
 
@@ -36,7 +37,7 @@ GROUPS=		privoxy
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	ACCEPT_FILTER BROKEN_STRPTIME BUMP_FD_SETSIZE COMPRESSION \
+OPTIONS_DEFINE=	ACCEPT_FILTER BROKEN_STRPTIME COMPRESSION \
 		DEBUG DOCS EDITOR FORCE PRIVOXY_TOOLS TOGGLE
 
 ACCEPT_FILTER_DESC=	Support for accf_http(9)
@@ -44,7 +45,6 @@ BROKEN_STRPTIME_DESC=	Enable workaround for standards/173421
 COMPRESSION_DESC=	Support compression of buffered content
 DOCS_DESC=		Let Privoxy serve the user manual
 EDITOR_DESC=		Support use of the web-based action editor
-BUMP_FD_SETSIZE_DESC=	Support more client connections at the same time
 FORCE_DESC=		Support bypassing of blocks
 PRIVOXY_TOOLS_DESC=	Install Privoxy-Log-Parser, uagen, etc.
 TOGGLE_DESC=		Support for remote toggling
@@ -57,8 +57,6 @@ ACCEPT_FILTER_CONFIGURE_ON=	--enable-accept-filter
 
 BROKEN_STRPTIME_CONFIGURE_ON=	--enable-strptime-sanity-checks
 
-BUMP_FD_SETSIZE_CONFIGURE_ON=	--with-fdsetsize=8192
-
 COMPRESSION_CONFIGURE_ON=	--enable-compression
 
 DEBUG_CONFIGURE_ON=	--with-debug
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 7801b659f9f6..72062ac45df8 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472287144
-SHA256 (privoxy-3.0.26-stable-src.tar.gz) = 57e415b43ee5dfdca74685cc034053eaae962952fdabd086171551a86abf9cd8
-SIZE (privoxy-3.0.26-stable-src.tar.gz) = 1741772
+TIMESTAMP = 1546260542
+SHA256 (privoxy-3.0.28-stable-src.tar.gz) = b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
+SIZE (privoxy-3.0.28-stable-src.tar.gz) = 1753809
diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist
index bd502f75737a..d65ce475448f 100644
--- a/www/privoxy/pkg-plist
+++ b/www/privoxy/pkg-plist
@@ -39,7 +39,6 @@ etc/privoxy/templates/show-request
 etc/privoxy/templates/show-status
 etc/privoxy/templates/show-status-file
 etc/privoxy/templates/show-url-info
-etc/privoxy/templates/show-version
 etc/privoxy/templates/toggle
 etc/privoxy/templates/toggle-mini
 etc/privoxy/templates/untrusted