gentoo resync : 31.01.2021

4 files changed, 175 insertions, 3 deletions

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index d4938d415860..5f83c7864147 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -3,11 +3,14 @@ AUX privoxy-3.0.28-chdir.patch 426 BLAKE2B c5a12e6c6edadf2836bf1d1965b83d0e3bb3b
 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-3.0.29-pthread.patch 513 BLAKE2B d3a85a3668821d615c6d008266b589a6e204a1b288ad35742d1bda8eddc2133622b42da51a554bb153df842b9ca341c5797dda6310918b0b51076ba13bc83cda SHA512 5a0cc7a165a5f231ff418729b3c4b397fa4285713f1abf7eab9338d30fc6c54f66022fc3325d127777626b38a59d59c78388f76294ef2af683dd7f6ec021a482
 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.28-stable-src.tar.gz 1753809 BLAKE2B 1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4 SHA512 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
 DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3 SHA512 2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
+DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
 EBUILD privoxy-3.0.28-r1.ebuild 3608 BLAKE2B dd2e6613f5b54c0dbf61b677415b56281de8eff1af08f85d92188ce0267c2d8e59095c109a38db4a1a7cbb33ca87f27c542d73637f81e272b26c243a199abd9f SHA512 91b810ee816d5ca3928fd6df7ae8124867970c5c3f7d8d7039f0e6f21b53bf00a3416d201a7ccee9b30afe3aa848640680b6d6af9dee7e19605fa90052bac2be
-EBUILD privoxy-3.0.29.ebuild 4049 BLAKE2B 93ad84845d3feaa3f390a3559808ae237d2f5d3e5b52fe24f3c9fcb31d00aba23cb7a51e678d749f4b14e96d15ec73717af01f52d61168bab98f70cba8de59e4 SHA512 d3b871ea9010eced2ac92b346f08be7b8fc009d209e3d2c24d0a251ac73438e4beb50fbf754c3c78b8ae32ff9bd007f1c080bc7b3032fd31d7c55877fa69f6c1
+EBUILD privoxy-3.0.29.ebuild 4092 BLAKE2B 3543ee150e312429fd436b27ba09a7352db65c6b0b492ab13759f56ab19e1c6d892496aace3105bbb29e1dd42e37ad1cc9f270b8d2cfc59c7f30b8a7d18960b7 SHA512 f4844fa4d43e442558463e7f3d2449e993cdd14dc011eddc34023c84c1230208b1d99f09ff9f8277f2cef62ea0c3fba574b50d1644b85424fd989e9564926686
+EBUILD privoxy-3.0.31.ebuild 3980 BLAKE2B 9bc509d224fe12bccacf8cae57c4fb21d0dd6a00b67cc357eef6d0e9c57b2fdc051ffe2229ea25e58c9bece3d8f75cfbd517f070c8a7b3e572d888d1d87b1c78 SHA512 5fa959682a9d386dfe5361563e432e7e31b5c394a8c94fddc15bea29a64d21f58bcd68646ebbd1dc2f07921423d96e0149759074a42f288b98603b9279f7608c
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
new file mode 100644
index 000000000000..2890b824d7e2
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
@@ -0,0 +1,21 @@
+diff --git a/project.h b/project.h
+index ec3c1559..6c744415 100644
+--- a/project.h
++++ b/project.h
+@@ -54,16 +54,6 @@
+ #define HASH_OF_HOST_BUF_SIZE      16
+ #endif /* FEATURE_HTTPS_INSPECTION */
+ 
+-#ifdef FEATURE_PTHREAD
+-#  include <pthread.h>
+-   typedef pthread_mutex_t privoxy_mutex_t;
+-#else
+-#  ifdef _WIN32
+-#     include <windows.h>
+-#  endif
+-   typedef CRITICAL_SECTION privoxy_mutex_t;
+-#endif
+-
+ #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
+ #include "mbedtls/net_sockets.h"
+ #include "mbedtls/entropy.h"
diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 966001da72e1..ded50272b29d 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="
 	compression? ( zlib )
 	brotli? ( zlib )
 	fuzz? ( zlib )
-	ssl? ( ^^ ( mbedtls openssl ) )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -57,13 +57,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.28-chdir.patch
 	"${FILESDIR}"/${PN}-3.0.28-null-termination.patch
 	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+	"${FILESDIR}"/${P}-pthread.patch
 )
 
 pkg_pretend() {
 	if ! use threads; then
 		ewarn
 		ewarn "Privoxy may be very slow without threads support, consider to enable them."
-		ewarn "See also http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
 		ewarn
 	fi
 }
diff --git a/net-proxy/privoxy/privoxy-3.0.31.ebuild b/net-proxy/privoxy/privoxy-3.0.31.ebuild
new file mode 100644
index 000000000000..bffdf7a41b75
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.31.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd toolchain-funcs
+
+[ "${PV##*_}" = "beta" ] &&
+	PRIVOXY_STATUS="beta" ||
+	PRIVOXY_STATUS="stable"
+
+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 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 ~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}
+	extended-host-patterns? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-privoxy )
+	tools? (
+		net-misc/curl
+		dev-lang/perl
+	)
+"
+REQUIRED_USE="
+	client-tags? ( threads )
+	toggle? ( editor )
+	compression? ( zlib )
+	brotli? ( zlib )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.29-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+)
+
+pkg_pretend() {
+	if ! use threads; then
+		ewarn
+		ewarn "Privoxy may be very slow without threads support, consider to enable them."
+		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
+
+	# autoreconf needs to be called even if we don't modify any autotools source files
+	# See main makefile
+	eautoreconf
+}
+
+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
+	econf \
+		--sysconfdir=/etc/privoxy \
+		--enable-dynamic-pcre \
+		--with-user=privoxy \
+		--with-group=privoxy \
+		$(use_enable acl acl-support) \
+		$(use_enable compression) \
+		$(use_enable client-tags) \
+		$(use_enable editor) \
+		$(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 image-blocking) \
+		$(use_enable ipv6 ipv6-support) \
+		$(use_enable kernel_FreeBSD accept-filter) \
+		$(use_enable lfs large-file-support) \
+		$(use_enable png-images no-gifs) \
+		$(use_enable stats) \
+		$(use_enable threads pthread) \
+		$(use_enable toggle) \
+		$(use_enable whitelists trust-files) \
+		$(use_enable zlib) \
+		$(use_with brotli) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+	diropts -m 0750 -g privoxy -o privoxy
+	keepdir /var/log/privoxy
+
+	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
+	if use tools; then
+		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() {
+	if use extended-host-patterns; then
+		ewarn
+		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
+		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
+		ewarn "privoxy-url-pattern-translator.pl is available."
+		ewarn
+	fi
+}