gentoo resync : 08.01.2021

4 files changed, 172 insertions, 26 deletions

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 331319538c74..e27757fc0e40 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -2,11 +2,12 @@ AUX privoxy-3.0.19-gentoo.patch 3661 BLAKE2B 4785f7ab39cf8592eb142717a50359a02f8
 AUX privoxy-3.0.28-chdir.patch 426 BLAKE2B c5a12e6c6edadf2836bf1d1965b83d0e3bb3bc177caaed0dd80ad918fbbba1716c23b778b97c456ee06cef9a8f20f9bd97078549d06bd8740f8900c19842fdf7 SHA512 495b93f3356af647dc6a75ac871de675be4f0bf63a60157b8d619efc9ecdc704e7ecc2c6afe04f5bfd854eef4084fbf989daaf08c04e8fb7c3d2265d451069d5
 AUX privoxy-3.0.28-null-termination.patch 774 BLAKE2B f3cfb0b941fcc7d3491d8660bf34dc74f986c48ba21c6fd07ceb9e93467bc434fcfd1389af888501aa33ece59c0f718e309baee727830fafd0b3e0ac7e547990 SHA512 0b94e1f204a5bd56ca66c0d25aa17317e4d074d909aa1dd16ceb8c080921b1bd86ce0cc5427e6f583adb0ff7b85143f33196a2ad8e3e6c7af37b6c308c23cfec
 AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67
+AUX privoxy-3.0.29-gentoo.patch 4437 BLAKE2B 59578cd3df07a4d4e40e4b340a92fa174d0e492ef0352ae4456fc6715a3a171385306e3f3b2c9a441d3b28fda12b655bf6f397ba5b1c4e23878c1fe31dbc42c9 SHA512 779b998ecff335c48aaf7408a43ae4ef86486dae81a196ecc7cec72662eafcafb13d0b919c274387bc4217fce294582cef8bb1a697a67fe3dc64b797a786768b
 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b
 AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
-DIST privoxy-3.0.26-stable-src.tar.gz 1741772 BLAKE2B 19dc72d93535e6eb960a53e3679886655b2aff037ad6002844eb76c970c7da52d016b7a54993e3dcf453c394da354cf8ec8f1f23a02b9216240e5460d6239b34 SHA512 e448305287d0451c761b76b8d8974ea1ec837b621bbb498a7ff16a54cb4d8f1f734efe2eef03235c01163bb40e225785065aad6ee265a31d90970ab98af11044
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
-EBUILD privoxy-3.0.26.ebuild 3432 BLAKE2B a3716db8d65b192f58a0dc30f93240c5a9fd90fc12c55b51182684c05c46a3be77ea490fbfc6d2b7f7623e68989ba55d72ed7d7ffbac315cd7a83a677d393652 SHA512 bde8f38c2cab1242496290248c455fb5262e1e22b5870ca3793f042a83e068603a1baa6a2dbbd64073e441835faea7b2fa35640268cc0fb2158a7f2104d26478
+DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3 SHA512 2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
 EBUILD privoxy-3.0.28-r1.ebuild 3608 BLAKE2B dd2e6613f5b54c0dbf61b677415b56281de8eff1af08f85d92188ce0267c2d8e59095c109a38db4a1a7cbb33ca87f27c542d73637f81e272b26c243a199abd9f SHA512 91b810ee816d5ca3928fd6df7ae8124867970c5c3f7d8d7039f0e6f21b53bf00a3416d201a7ccee9b30afe3aa848640680b6d6af9dee7e19605fa90052bac2be
-MISC metadata.xml 2440 BLAKE2B f19609a881546a03d6bc5c76b182c5798feaa567369342c0a25994bbf12eff83db4c7b4e9af40e703500b6aa8dc58e49b2d4240958ddd6030bca0b567f77c196 SHA512 f620d755d33400faa3f58b49af79bebe1a5b59ed382e93844c761e3095009af9b1201b3a9d2c692dc21e871a19eda57d95b856c26f97e6496912fa80a1315f4f
+EBUILD privoxy-3.0.29.ebuild 4054 BLAKE2B 5f83d5c40cdd130661d7d304dfad6b1bb5736f26927eded9076ad21ebfd4b9a5a842040af5e9262d1fe76d2f77fe53b0a801d0493783250efb96522d6ecf59df SHA512 6f5fa50980e8ec92ce97fb833be3c65cf87ee18caee6d93f385f0aecc03ab24bddc0ee60979743e7b084545ca38b7e7b576ee70f5f48c133190d2c0ab8edfb20
+MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
new file mode 100644
index 000000000000..572d03439b97
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
@@ -0,0 +1,118 @@
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/config privoxy-3.0.29-stable/config
+--- privoxy-3.0.29-stable.orig/config	2020-11-28 13:19:00.000000000 +0300
++++ privoxy-3.0.29-stable/config	2021-01-06 19:44:52.824746891 +0300
+@@ -259,7 +259,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #  2.2. templdir
+ #  ==============
+@@ -344,7 +344,7 @@
+ #
+ #      No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #  2.5. actionsfile
+ #  =================
+@@ -477,7 +477,7 @@
+ #      require additional software to do it. For details, please
+ #      refer to the documentation for your operating system.
+ #
+-logfile logfile
++logfile privoxy.log
+ #
+ #  2.8. trustfile
+ #  ===============
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/default.action.master privoxy-3.0.29-stable/default.action.master
+--- privoxy-3.0.29-stable.orig/default.action.master	2020-11-28 13:19:00.000000000 +0300
++++ privoxy-3.0.29-stable/default.action.master	2021-01-06 19:44:52.825746892 +0300
+@@ -559,7 +559,7 @@
+ +client-header-tagger{image-requests} \
+ +client-header-tagger{range-requests} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -582,7 +582,7 @@
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -622,7 +622,7 @@
+ +hide-referrer{conditional-block} \
+ +limit-connect{,} \
+ +overwrite-last-modified{randomize} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Advanced
+ 
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/GNUmakefile.in privoxy-3.0.29-stable/GNUmakefile.in
+--- privoxy-3.0.29-stable.orig/GNUmakefile.in	2020-11-28 13:19:00.000000000 +0300
++++ privoxy-3.0.29-stable/GNUmakefile.in	2021-01-06 19:45:20.535798829 +0300
+@@ -62,8 +62,8 @@
+ MAN_DEST     = $(MAN_DIR)/man1
+ MAN_PAGE     = privoxy.1
+ SHARE_DEST   = @datadir@
+-DOC_DEST     = $(SHARE_DEST)/doc/privoxy
+-VAR_DEST     = @localstatedir@
++DOC_DEST     = @docdir@
++VAR_DEST     = /var
+ LOGS_DEST    = $(VAR_DEST)/log/privoxy
+ PIDS_DEST    = $(VAR_DEST)/run
+ 
+@@ -890,8 +890,6 @@
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
+ 		$(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+-		$(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+-		$(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+ 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+@@ -962,34 +960,8 @@
+ 	fi ;\
+ 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ 	for i in $(CONFIGS); do \
+-		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
+-			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+-			$(ECHO) Installing fresh $$i;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(CONF_DEST)/$$i" ]; then \
+-			$(ECHO) Installing $$i as $$i.new ;\
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+-			NEW=1;\
+-		else \
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		fi ;\
+ 	done ;\
+-	if [ -n "$$NEW" ]; then \
+-		$(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 | \
diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml
index 6fcf74308802..adfe49818f33 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -14,24 +14,28 @@
 		systems and multi-user networks.
 	</longdescription>
 	<use>
-		<flag name="editor">Enable the web-based actions file editor</flag>
+		<flag name="brotli">Decompress brotli compressed data using <pkg>app-arch/brotli</pkg> before filtering</flag>
 		<flag name="client-tags">Enable support for client-specific tags</flag>
 		<flag name="compression">Allow privoxy to compress buffered content before sending to the client, if it supports it</flag>
-		<flag name="extended-host-patterns">Enable and require PCRE syntax in host patterns. You must convert action files to PCRE, see privoxy-url-pattern-translator.pl Use at your own risk!</flag>
+		<flag name="editor">Enable the web-based actions file editor</flag>
+		<flag name="extended-host-patterns">Enable and require PCRE syntax in host patterns. You must convert action files to PCRE, see privoxy-url-pattern-translator.pl (see tools USE flag). Use at your own risk!</flag>
+		<flag name="extended-statistics">Gather extended statistics</flag>
 		<flag name="external-filters">Allow to filter content with scripts and programs. Experimental</flag>
 		<flag name="fast-redirects">Support fast redirects</flag>
 		<flag name="force">Allow single-page disable (force load)</flag>
 		<flag name="fuzz">Exposes Privoxy internals to input from files or stdout. Intended for fuzzing testing</flag>
 		<flag name="graceful-termination">Allow to shutdown Privoxy through the webinterface</flag>
-		<flag name="ie-images">Enable a quick but not always reliable auto-detect whether requests from MS Internet Explorer are for an image or not</flag>
 		<flag name="image-blocking">Allows the +handle-as-image action, to send "blocked" images instead of HTML</flag>
 		<flag name="lfs">Support large files (&gt;2GB) on 32-bit systems</flag>
+		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> for HTTPS filtering</flag>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for HTTPS filtering</flag>
 		<flag name="png-images">Use PNG format instead of GIF for built-in images</flag>
+		<flag name="ssl">HTTPS inspection support. Enables privoxy to perform SSL MITM filtering, see docs, use with care</flag>
 		<flag name="stats">Keep statistics</flag>
 		<flag name="toggle">Support temporary disable toggle via web interface</flag>
 		<flag name="tools">Install log parser, regression tester and user agent generator tools</flag>
 		<flag name="whitelists">Support trust files (white lists)</flag>
-		<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> to decompress data before filtering</flag>
+		<flag name="zlib">Decompress zlib compressed data using <pkg>sys-libs/zlib</pkg> before filtering</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ijbswa</remote-id>
diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 6f7945dded49..fffcbe231db0 100644
--- a/net-proxy/privoxy/privoxy-3.0.26.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools systemd toolchain-funcs user
+inherit autotools systemd toolchain-funcs
 
 [ "${PV##*_}" = "beta" ] &&
 	PRIVOXY_STATUS="beta" ||
@@ -13,16 +13,24 @@ HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
 DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
 SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
 
-IUSE="+acl client-tags compression editor extended-host-patterns
-external-filters +fast-redirects +force graceful-termination
-ie-images +image-blocking ipv6 lfs png-images selinux +stats
-+threads toggle tools whitelists +zlib"
+IUSE="+acl brotli client-tags compression editor extended-host-patterns
+extended-statistics external-filters +fast-redirects +force fuzz
+graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
+png-images selinux ssl +stats +threads toggle tools whitelists
++zlib"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2+"
 
 DEPEND="
+	acct-group/privoxy
+	acct-user/privoxy
 	dev-libs/libpcre
+	brotli? ( app-arch/brotli )
+	ssl? (
+		mbedtls? ( net-libs/mbedtls )
+		openssl? ( dev-libs/openssl )
+	)
 	zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}
@@ -34,13 +42,22 @@ RDEPEND="${DEPEND}
 	)
 "
 REQUIRED_USE="
-	compression? ( zlib )
+	client-tags? ( threads )
 	toggle? ( editor )
+	compression? ( zlib )
+	brotli? ( zlib )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.0.19-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-chdir.patch
+	"${FILESDIR}"/${PN}-3.0.28-null-termination.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+)
 
 pkg_pretend() {
 	if ! use threads; then
@@ -51,11 +68,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
 src_prepare() {
 	default
 	mv configure.in configure.ac || die
@@ -67,6 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf="--without-mbedtls --without-openssl"
+	if use ssl; then
+		myconf="$(use_with mbedtls) $(use_with openssl)"
+	fi
+
 	# --with-debug only enables debug CFLAGS
 	# --with-docbook and --with-db2html and their deps are useless,
 	#	since docs are already pregenerated in the source tarball
@@ -79,11 +96,12 @@ src_configure() {
 		$(use_enable compression) \
 		$(use_enable client-tags) \
 		$(use_enable editor) \
-		$(use_enable extended-host-patterns) \
+		$(use_enable extended-host-patterns pcre-host-patterns) \
+		$(use_enable extended-statistics) \
 		$(use_enable fast-redirects) \
 		$(use_enable force) \
+		$(use_enable fuzz) \
 		$(use_enable graceful-termination) \
-		$(use_enable ie-images) \
 		$(use_enable image-blocking) \
 		$(use_enable ipv6 ipv6-support) \
 		$(use_enable kernel_FreeBSD accept-filter) \
@@ -93,7 +111,9 @@ src_configure() {
 		$(use_enable threads pthread) \
 		$(use_enable toggle) \
 		$(use_enable whitelists trust-files) \
-		$(use_enable zlib)
+		$(use_enable zlib) \
+		$(use_with brotli) \
+		${myconf}
 }
 
 src_install() {
@@ -113,6 +133,9 @@ src_install() {
 		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
 		newbin tools/uagen.pl privoxy-uagen.pl
 	fi
+
+	rmdir "${ED}/var/run" || die
+	chown privoxy:root "${ED}/etc/privoxy" || die
 }
 
 pkg_postinst() {