gentoo resync : 07.01.2022

9 files changed, 11 insertions, 38 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index af51b0cee45e..d13a763b96bf 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 403486bd6949..706b94060d8d 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
-EBUILD dante-1.4.1-r6.ebuild 2701 BLAKE2B 07aba4920687aee82bfde6d868d9da98dc31de2bdb3add0fb6406ea44d2659ebd091c51a6320fb159106d33c4058890182fc00032c9280b9e08a51966573b4b3 SHA512 ee042c1073326a25715da3dd72ca5ced83b88e3861dde05d88472b9ad2f5ff063ee54200dfa72c5b1af3001cd43cfd1210838e94a7f975b19dcb50ce94407fcb
+EBUILD dante-1.4.1-r6.ebuild 2683 BLAKE2B 74af8133cd8b65c234ec70797af9de43087ddc5d5a2801f11be35cb82ce5702d1944c70ef322870bba48f843a5783f652d2eca028fb7830412f6fa3a10521c2f SHA512 70a96b23e15651258d98d330439efca4cf259fff724f2880c1f64c7e747009831b8282e472674b8e3771835a50d5f6f1ba6e0fa411fbc1ea7b426b46b06a51b5
 MISC metadata.xml 213 BLAKE2B 8999188a1062bf7ec3ba841f532113bb39808fbdbfd3cba1107aec6c8796e897b1ade98d0ea8e92eb504f132a51aa46fb49b6ad1a04c5b389d333f054c2589b8 SHA512 7d3e51679dce13a213e18c54e9072c88a121abad190a83dd7d1ce224b075ac639e4a0d0d8a2b98ca8a59da3a1576629b021afb9fe48c180345e609605c6aef0e
diff --git a/net-proxy/dante/dante-1.4.1-r6.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild
index a08c030e38dc..18dc73c8e8b4 100644
--- a/net-proxy/dante/dante-1.4.1-r6.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,12 +15,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 CDEPEND="
+	sys-apps/shadow
 	virtual/libcrypt:=
 	kerberos? ( virtual/krb5 )
 	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	upnp? ( net-libs/miniupnpc:= )
-	userland_GNU? ( sys-apps/shadow )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index a3b05396609a..be7cd72d91ea 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -5,5 +5,5 @@ AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74b
 AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
 DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75
-EBUILD privoxy-3.0.33.ebuild 4429 BLAKE2B 40958b54ec53f6a45d1d25f38fa03904322dbcc61f7d32a66541f57cb04ee2fae89177724c17fe09ff4dfc79af6f109ad49a12a78c77fe697dd8ee1e7d65d8f0 SHA512 201363638066144b7f57cad0045514f2b5a4be74d5c5ed66caadd55ae9350b8b0d7a400147d74a41188cbdd66753bfab40a6c91c26634e94d4781f1d76e7f03d
+EBUILD privoxy-3.0.33.ebuild 4410 BLAKE2B a3af85469e662025a1a6e99a4091ebe900f96faaeb6111db9a179b2836764c744f8490f60f2997ff8a99da1bf42e72ad73d99e8b6e58825055ebbc1cfec792ef SHA512 cd490ed35dec9d2c401c3f3c8fe6f5a0a129a2d334e3e9cb960c5d73d2af920ced892d4f87504762707ea28bc845bdc49a883d272c0de384c53c3536c6c33e9e
 MISC metadata.xml 3093 BLAKE2B 58650d47956558fb62caf8e39420983c2c49ac1632a3636813dee4a458ca9e3094bb528f01f166507861a56bc2b44d1cb5c19464e15e5f93ebfe6f5d21bff227 SHA512 684ab8be2109f3bcfc8ad6868e221cd7046b06cf65ee66e82b69cb2e6a4b4d16bd96e978968461f2044c984abc2331e1963b4b61169b65b68e9581b4d25431d7
diff --git a/net-proxy/privoxy/privoxy-3.0.33.ebuild b/net-proxy/privoxy/privoxy-3.0.33.ebuild
index 715d61e54e67..369532bf8820 100644
--- a/net-proxy/privoxy/privoxy-3.0.33.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -96,6 +96,7 @@ src_configure() {
 	#	since docs are already pregenerated in the source tarball
 	econf \
 		--sysconfdir=/etc/privoxy \
+		--disable-accept-filter \
 		--enable-dynamic-pcre \
 		--without-assertions \
 		--with-user=privoxy \
@@ -113,7 +114,6 @@ src_configure() {
 		$(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) \
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index bbd22a974c92..300f42eec6ab 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -6,6 +6,6 @@ AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f48
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50d006eb3f84bbc5b894ee3641929551d00a1800d6676add62f967067ec62b5b7c41d767766eeab5dfc17980e SHA512 8f0ce6e30dd9173927e8133618211ffb865fb5dde4c63c2fb465e2efccda4a6efb33f2c0846870c9b915340aff5f59461a60171882bcc0c890336b846fe60bd1
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
-EBUILD squid-4.15-r2.ebuild 8335 BLAKE2B 601c1b0280abf87634deaa4a180af9bf7fd2ddfe544c342b0ea0d7af375f400a294353579ceb4f8b158cb7d3cbe43aab3c84d256119abb73739959b074074b83 SHA512 3b6b846784d4c05d7ccf51e42c909bb3615baf27b3cb91269df7e1ed910383cf06b4bcce9d406f6d36498aa541097de689d89488986c96c44a97b35156c34b97
-EBUILD squid-4.17.ebuild 8340 BLAKE2B 03234244bd620577345f143eecd3d629b077dcc677159ed2c000a7e2020259eabec0055449493d520722a8fe1782066f2cf81c82cea6665873269d5b5c797b0f SHA512 22c615afbdafd4500a6ce5796ccdfd7e8463bc62eea1f2cade56f11888099e7ac49190d9feb966d8366e17ac04b9d55d2e4988d1101cca616b96bc525e1400bd
-MISC metadata.xml 1473 BLAKE2B 9220167bb398dda2f0e047d6f4b7841544a077745544bc117eb2a6db7230b3e2076d177c406b86444de0b2843c51f5de2e7df43a9dcde7bbbd600087ab96c575 SHA512 504ce7a1c7e2e5b862607dcd8ead69b130a058ea3b887ff11067495f7da372c3fc073169a2455e894a5657691f1f1abad2313afcaf9751114658b872e93f98d8
+EBUILD squid-4.15-r2.ebuild 8006 BLAKE2B 94401dfd44bcbf932dfcaf10b77799407c673887e4bfcf61076eccd221943adbe220dd092730d21cc420e742dec6cc80d64dd1f83fade26df47e616f8bda843d SHA512 d6d9e49974d65347e910d9aca3b3b0542a4d26edb5b5e6dfc5112c12cd7bd09ced908a17f82ed430a7d0a9e328aec767fc253a6b2d6d823b4b59d2845917fc8d
+EBUILD squid-4.17.ebuild 8011 BLAKE2B 43148108a2ad811aa49ba3f9177b0be41c4f3bde47cec23d5c47dad40acf3ace70f48254b1b149a407ec33ecc9dbedea714155b16d48e437489e287676cb9710 SHA512 bc405b8abd4dbcf6cd36b690a3d4eaa1abbc312249fd79ef2b9c0dcfbd89f67f618ab154fff5e5a88d4bb93ad16612238ec8131116554e3eb05b11e954ed1acb
+MISC metadata.xml 1178 BLAKE2B ef1e50d591c080e753b2eded1cb9934d26f46358125188ae539489e7bcaa787862c177e3a72f48217ade968fa1bf7870fb0420ae8fc214cc142522a9bf2675f2 SHA512 72db9b79e1861ccd78df889cd5d95e17fdfdc55846b1f3a21171ff5b24ddada441dc807dc818086689b3c20b9e53e6cbc83abfc5afdaea6d744b486e519b6d64
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index 6252c436660b..ecf120351c73 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -11,13 +11,8 @@
     <flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies
       to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
     <flag name="htcp">Enable HTCP protocol</flag>
-    <flag name="ipf-transparent">Adds transparent proxy support for systems
-      using IP-Filter (only for *bsd)</flag>
     <flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating
       logs</flag>
-    <flag name="kqueue">Enables *BSD kqueue() support</flag>
-    <flag name="pf-transparent">Adds transparent proxy support for systems using
-      PF (only for *bsd)</flag>
     <flag name="qos">Adds support for Quality of Service using netfilter conntrack
       - see qos_flow directive for more info</flag>
     <flag name="ssl-crtd">Adds support for dynamic SSL certificate generation in
diff --git a/net-proxy/squid/squid-4.15-r2.ebuild b/net-proxy/squid/squid-4.15-r2.ebuild
index af49050da0f0..001300cc8b7e 100644
--- a/net-proxy/squid/squid-4.15-r2.ebuild
+++ b/net-proxy/squid/squid-4.15-r2.ebuild
@@ -25,9 +25,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
 	ecap esi ssl-crtd \
 	mysql postgres sqlite systemd \
 	perl qos tproxy \
-	+htcp +wccp +wccpv2 \
-	pf-transparent ipf-transparent kqueue \
-	kernel_linux"
+	+htcp +wccp +wccpv2"
 
 RESTRICT="!test? ( test )"
 
@@ -160,15 +158,6 @@ src_configure() {
 		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
 	fi
 
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
 	tc-export_build_env BUILD_CXX
 	export BUILDCXX=${BUILD_CXX}
 	export BUILDCXXFLAGS=${BUILD_CXXFLAGS}
diff --git a/net-proxy/squid/squid-4.17.ebuild b/net-proxy/squid/squid-4.17.ebuild
index ab6503cc44ac..92eaac54a145 100644
--- a/net-proxy/squid/squid-4.17.ebuild
+++ b/net-proxy/squid/squid-4.17.ebuild
@@ -25,9 +25,7 @@ IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
 	ecap esi ssl-crtd \
 	mysql postgres sqlite systemd \
 	perl qos tproxy \
-	+htcp +wccp +wccpv2 \
-	pf-transparent ipf-transparent kqueue \
-	kernel_linux"
+	+htcp +wccp +wccpv2"
 
 RESTRICT="!test? ( test )"
 
@@ -160,15 +158,6 @@ src_configure() {
 		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
 	fi
 
-	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
-		transparent+=" $(use_enable kqueue)"
-		if use pf-transparent; then
-			transparent+=" --enable-pf-transparent"
-		elif use ipf-transparent; then
-			transparent+=" --enable-ipf-transparent"
-		fi
-	fi
-
 	tc-export_build_env BUILD_CXX
 	export BUILDCXX=${BUILD_CXX}
 	export BUILDCXXFLAGS=${BUILD_CXXFLAGS}