gentoo resync : 12.03.2021

6 files changed, 301 insertions, 5 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 303e5cdc8253..77ac59461f65 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index f52a68bb9d5d..3e12d9ad1637 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -7,5 +7,5 @@ AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32
 DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
 DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
 EBUILD privoxy-3.0.31.ebuild 3974 BLAKE2B eea99412188d5fc31970baef82cf1397ab1cc763a6db4c6eb83fd50e55cd5afd2a0c72e4e2413c6f1b75216f30222cb4d50e28ae0a33bbacfd7ae056a59c8e23 SHA512 b0f1165f1817316ff2abb43b01f73d79f514648ba74bffba9de720fd69b9ccb1a9283c91f94759503210471a69c793da7cdf45f4186c588cd37cacb18cd91042
-EBUILD privoxy-3.0.32.ebuild 4005 BLAKE2B 1b12add7f2cceb804331609079b82f56feb5b477c69ab17dc3797bdf84bc2c50fd2376254305996924e2e110909e76ab63f3eb50e11b44fe9aa43f6888944a80 SHA512 02e6768bdb9266f0ed6d905f9f90a6a8e6af47d4063579fae0cab846982a150b23df94da5ab8131ff3bfe54ebf44a0225cca8524c2c2215fcb875a9c4f214047
+EBUILD privoxy-3.0.32.ebuild 3999 BLAKE2B 3748a08db2f9e0c275f12fc6a796b549d9727a3d290110a430aedd4419779843cbdb42ce109beae7e9390d18868a7e91ab6ef8f30362b124cd8a0223731977f9 SHA512 a31005ced871206007b3b6b9009d79f5eb2c737cb6bba62bdf26d05800e5c8feb3f9e95f0137892e3d19b0977204f91d52dfff724aba026971ecb570a0d0bea1
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/privoxy-3.0.32.ebuild b/net-proxy/privoxy/privoxy-3.0.32.ebuild
index 18fa1136373c..260557c5c6e3 100644
--- a/net-proxy/privoxy/privoxy-3.0.32.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.32.ebuild
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index cebfcc27e675..f9ca2058af85 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,5 +5,7 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.13.tar.xz 2452752 BLAKE2B e2efdfda736f2324c6723e76272c4989a41fa6d0f52b48cc33957ae8e57e75350487d9683fc72c43926e5d91b698eef728282895018b78acefe23de2e67cfd74 SHA512 06807f82ed01e12afe2dd843aa0a94f69c351765b1889c4c5c3da1cf2ecb06ac3a4be6a24a62f04397299c8fc0df5397f76f64df5422ff78b37a9382d5fdf7fc
-EBUILD squid-4.13.ebuild 8176 BLAKE2B bfdf00d2098076f0065843b696c87c4c825abe08d4ac798acbbee39f6a1db2d22fb293bd055d4343cc0ebf23d0f5fe4866ddd5a527bc2834eecee1773ec5f99c SHA512 886a5ded8078fe47f3be439250136f7fb1ac01d0d61efafed7f533cf9292cfc65820d60c55722c0507af83da41f5c8b8607d310d7f799a1173861dec57678ec7
+DIST squid-4.14.tar.xz 2452892 BLAKE2B be8d8fc17b6b762faac0e6fbb5e428fc48b3f958b27f9da9eb941315c22185d34edb9fec73518626b6d5a7206b43f209638dc6bb874d52d6e183e5646874a668 SHA512 3509caea9e10ea54547eeb769a21f0ca4d37e39a063953821fc51d588b22facfa183d0a48be9ab15831ee646e031079b515c75162515b8a4e7c708df2d41958b
+EBUILD squid-4.13-r1.ebuild 8363 BLAKE2B 191c4ae5b5711aad2485173760f535dd4b36e02b49f23f5b394831510669533ac6ed1c8467d56651c90bd7faab07141efb34c5fb2347f1337a4209092700ad6e SHA512 c1e272f8ed510e9199ece9e952c18fc96d5c0a2e7bd7d301efaf99f0c89a4ac0c81f865eabc750fabc467b9719713cebd1410c72075568c699ba301ad6e3c358
+EBUILD squid-4.14.ebuild 8368 BLAKE2B 7cecd979db250eb02b6d7ad09ae544013a9c5adbb56e8f182b7a1c432b1d37c4df2367a87b594b2b02edb5764886996e9748cbb33d522176ace3961fbd611782 SHA512 ed8a2854af15518dae29cf210b134affa14b56fd46468e9c7e6c6de5c8bf8c6979a1662703db0d2e6954e724420687096ed68e0e2b7a8c9e16a3806f21f2e363
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/squid-4.13.ebuild b/net-proxy/squid/squid-4.13-r1.ebuild
index 6201b7c45436..3b6b5c6f58f4 100644
--- a/net-proxy/squid/squid-4.13.ebuild
+++ b/net-proxy/squid/squid-4.13-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WANT_AUTOMAKE="1.15"
 
-inherit autotools flag-o-matic linux-info pam toolchain-funcs
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="A full-featured web proxy cache"
 HOMEPAGE="http://www.squid-cache.org/"
@@ -25,7 +25,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
-	mysql postgres sqlite \
+	mysql postgres sqlite systemd \
 	perl qos tproxy \
 	+htcp +wccp +wccpv2 \
 	pf-transparent ipf-transparent kqueue \
@@ -46,6 +46,7 @@ COMMON_DEPEND="acct-group/squid
 		!gnutls? ( dev-libs/openssl:0 )
 		dev-libs/nettle:= )
 	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
 	ecap? ( net-libs/libecap:1 )
 	esi? ( dev-libs/expat dev-libs/libxml2 )
 	gnutls? ( >=net-libs/gnutls-3.1.5 )
@@ -105,6 +106,8 @@ src_prepare() {
 	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
 		libltdl/configure.ac || die
 
+	 sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
 	eapply_user
 	eautoreconf
 }
@@ -211,6 +214,7 @@ src_configure() {
 		$(use_with ssl nettle) \
 		$(use_with gnutls) \
 		$(use_enable ssl-crtd) \
+		$(use_with systemd) \
 		$(use_enable ecap) \
 		$(use_enable esi) \
 		$(use_enable htcp) \
@@ -223,6 +227,8 @@ src_configure() {
 src_install() {
 	default
 
+	systemd_dounit "tools/systemd/squid.service"
+
 	# need suid root for looking into /etc/shadow
 	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
 	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
diff --git a/net-proxy/squid/squid-4.14.ebuild b/net-proxy/squid/squid-4.14.ebuild
new file mode 100644
index 000000000000..9f2974e7de31
--- /dev/null
+++ b/net-proxy/squid/squid-4.14.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+
+# Upstream patch ID for the most recent bug-fixed update to the formal release.
+r=
+#r=-20181117-r0022167
+if [ -z "$r" ]; then
+	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz"
+else
+	SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2"
+	S="${S}${r}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite systemd \
+	perl qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-lang/perl"
+
+COMMON_DEPEND="acct-group/squid
+	acct-user/squid
+	caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( sys-libs/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? (
+		!gnutls? ( dev-libs/openssl:0 )
+		dev-libs/nettle:= )
+	sasl? ( dev-libs/cyrus-sasl )
+	systemd? ( sys-apps/systemd:= )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	gnutls? ( >=net-libs/gnutls-3.1.5 )
+	logrotate? ( app-admin/logrotate )
+	>=sys-libs/db-4:*
+	dev-libs/libltdl:0"
+
+DEPEND="${COMMON_DEPEND}
+	${BDEPEND}
+	ecap? ( virtual/pkgconfig )
+	test? ( dev-util/cppunit )"
+
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	perl? ( dev-lang/perl )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+REQUIRED_USE="tproxy? ( caps )
+		qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/purge.1  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		src/acl/external/unix_group/ext_unix_group_acl.8 \
+		src/acl/external/session/ext_session_acl.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	 sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",SMB_LM,LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="SMB_LM"
+
+	local ext_helpers="file_userip,session,unix_group,delayer,time_quota"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+	if use mysql || use postgres || use sqlite ; then
+	    ext_helpers+=",SQL_session"
+	fi
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		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}
+	tc-export CC AR
+
+	# Should be able to drop this workaround with newer versions.
+	# https://bugs.squid-cache.org/show_bug.cgi?id=4224
+	tc-is-cross-compiler && export squid_cv_gnu_atomics=no
+
+	# Bug #719662
+	(use ppc || use arm || use hppa) && append-libs -latomic
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--with-build-environment=default \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		--with-included-ltdl=/usr/include \
+		--with-ltdl-libdir=/usr/$(get_libdir) \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_with systemd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	systemd_dounit "tools/systemd/squid.service"
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# these scripts depend on perl
+	if ! use perl; then
+		for f in basic_pop3_auth \
+			ext_delayer_acl \
+			helper-mux \
+			log_db_daemon \
+			security_fake_certverify \
+			storeid_file_rewrite \
+			url_lfs_rewrite; do
+				rm "${D}"/usr/libexec/squid/${f} || die
+		done
+	fi
+
+	# cleanup
+	rm -r "${D}"/run "${D}"/var/cache || die
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc src/auth/negotiate/kerberos/README README.kerberos
+	newdoc src/auth/basic/RADIUS/README README.RADIUS
+	newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group
+	dodoc RELEASENOTES.html
+
+	if use pam; then
+		newpamd "${FILESDIR}/squid.pam" squid
+	fi
+
+	newconfd "${FILESDIR}/squid.confd-r2" squid
+	newinitd "${FILESDIR}/squid.initd-r5" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
+	if [ ${#r} -gt 0 ]; then
+		elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
+	fi
+}