gentoo resync : 22.12.2021

4 files changed, 178 insertions, 1 deletions

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 8645e1449ef9..d5fe3a67c695 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,8 +1,11 @@
 AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67
 AUX privoxy-3.0.32-gentoo.patch 4309 BLAKE2B 609960b124bbd66d3246f071f93c43a552a48937b8c3540d2b0267845f64ce84d2daeefb0880895291b698f22660d86b2bb089621ccaf250a343b3b80dab1425 SHA512 fb6a0f4ea2b0d3ee22c605f25339c80a7b5448cd8cdfd3e7a50c825ddf6a887121771e475f1c17be4ba6fc5ac00b4524f3819e5ba6ae25e772fed68b3d879914
+AUX privoxy-3.0.33-configure-msan.patch 525 BLAKE2B 0d48ca986762a37478284653b509f9c2d4b3935b3a438a6cefa5d6cefd0b2e6ac65737ad9e4f2ab5d8951917bd43a19b7e9f9c89fab9098a4b2ada5184a2b833 SHA512 52336a47fac816b1b9ecc43693f6312e45be7e1ef9ad1d7ddf696f2357bb92301074c9151e20ca38fa43ee1ed2da75fba597fa72133e4399b465b3f750e29622
 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.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
+DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75
 EBUILD privoxy-3.0.32-r1.ebuild 4005 BLAKE2B 9530c718ad70a70666ae43e0fa4009ddf58c901a245b870ff8f14e89be26d582e63f24f8d448f92d8df997a3b4d649ae0e8df2da5bd096da9b707e4e2e6e5376 SHA512 026a896d14549d3f904598588dfc5eadbb690b61bc39b9315f2219a3991b41f011b2ddc3aa2e7199fc7bfc9563ddadbd4494acf35203d69f7dc4cfcf658f150c
-MISC metadata.xml 2797 BLAKE2B d69baeb2af7d244847c001467283d528695c5bd4f1a735c4df0e97ac92a372d6ab46826c72dd0166437b4d36d5f8680b6c5f72ae9535b4a2308a380bdfd8f439 SHA512 4d18efb305bf8b9880c7219849ea614d83147cc42ceda6fa794a042af1d4c030e4b81a0c6ae28392999135532de275483fdce68e984f3b43721ca7e1e6e3b6a9
+EBUILD privoxy-3.0.33.ebuild 4435 BLAKE2B b2f43aa126cbd0ab54343ca316f2bb7a3b92a378cd17f37bb316b49af1a251caaa35ab6d979292b3e0666146adc0a4fe9709254319a4bf0aa55d6c87f9874a49 SHA512 a5edaa3de57b50ff523cc591df3b349a93a313c7b508fff6326f901eacbcb21d9021a9548199fe8efd03f97effdd93dc99434f2c198ad237a961a658d2bd7cd5
+MISC metadata.xml 3093 BLAKE2B 58650d47956558fb62caf8e39420983c2c49ac1632a3636813dee4a458ca9e3094bb528f01f166507861a56bc2b44d1cb5c19464e15e5f93ebfe6f5d21bff227 SHA512 684ab8be2109f3bcfc8ad6868e221cd7046b06cf65ee66e82b69cb2e6a4b4d16bd96e978968461f2044c984abc2331e1963b4b61169b65b68e9581b4d25431d7
diff --git a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
new file mode 100644
index 000000000000..c89fed3947f3
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index 84f6a0db7..e7e68be0c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -168,7 +168,7 @@ if test "x$with_asan" = "xyes"; then
+     LDFLAGS="$LDFLAGS -fsanitize=address"
+ fi
+ 
+-AC_ARG_WITH(asan, [  --with-msan       Enable MemorySanitizer. Requires compiler support.])
++AC_ARG_WITH(msan, [  --with-msan       Enable MemorySanitizer. Requires compiler support.])
+ if test "x$with_msan" = "xyes"; then
+     CFLAGS="$CFLAGS -fsanitize=memory"
+     LDFLAGS="$LDFLAGS -fsanitize=memory"
diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml
index 287c64fc2abc..bab34089e102 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -26,12 +26,15 @@
 		<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="image-blocking">Allows the +handle-as-image action, to send "blocked" images instead of HTML</flag>
+		<flag name="jit">Enable PCRE jit (recommended)</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="sanitize">Enable asan, msan and usan sanitizers. Your compiler must support them</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="threads">Enable POSIX threads. Highly recommended, otherwise both build and run-time features may not work properly.</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>
diff --git a/net-proxy/privoxy/privoxy-3.0.33.ebuild b/net-proxy/privoxy/privoxy-3.0.33.ebuild
new file mode 100644
index 000000000000..0d13b91d1507
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.33.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 +jit lfs +mbedtls openssl
+png-images sanitize 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="
+	brotli? ( zlib )
+	client-tags? ( threads )
+	compression? ( zlib )
+	extended-statistics? ( threads )
+	fuzz? ( zlib )
+	ssl? ( ^^ ( mbedtls openssl ) threads )
+	toggle? ( editor )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.32-gentoo.patch
+	"${FILESDIR}"/${PN}-3.0.28-strip.patch
+	"${FILESDIR}"/${PN}-3.0.33-configure-msan.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 "Additionally some features may not build or work poperly. You are on your own."
+		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
+	if use sanitize; then
+		myconf+=" --with-usan"
+		# msan is available in clang only
+		# asan is broken with current configure tests in gcc
+		tc-is-clang && myconf+=" --with-msan --with-asan"
+	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 \
+		--without-assertions \
+		--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 jit pcre-jit-compilation) \
+		$(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
+}