gentoo resync : 14.05.2020

6 files changed, 37 insertions, 4 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 6ce62fc9833c..afd03d7b62b6 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 872b56624d97..50bfff11cfaa 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -25,5 +25,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 1605582
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
-EBUILD obfs4proxy-0.0.11-r1.ebuild 2122 BLAKE2B e18baccd7a8d948c7e4b906c9d26e7ac3f4c63ba459b06f7c8ccf0f38a1cbcb52df6e6d9d8d9c27aa2ac0abaf163e60c849adb8b858f5b6ebc04c19961b9d9e0 SHA512 c6bc9f0b076ed01e96f574157529f192df113b828c3ff96799e4a9a8084fa3a9ec7f7a292cd17621bed000fd8a5cac1fc1bffa1629b398c0d9ea0b00b4089030
+EBUILD obfs4proxy-0.0.11-r1.ebuild 2119 BLAKE2B 311ae27c2fa56f732c8815d6d779e3705f09350ed2fb4f4ad2ae896a5ed4537bce2cd03f1d0665a45aeb1bc1c59b765998f69f73c321545df8868c6062609367 SHA512 bc7384372c75d940f6f1cd694f965da2ec02b0a57b6aa228462e09632b40387edc7a0ca337f2f661ea9e70d622b16ecb9645e200e2b66f03f7f342782231590d
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
index 1c40f48bade1..d53da0a313c4 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
@@ -41,7 +41,7 @@ SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${
 
 LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 S="${WORKDIR}/obfs4-${P}"
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c67bb8604650..49d4743ec723 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
+AUX squid-4.11-missing-debug-extra.patch 1164 BLAKE2B 21eb36900de998553efc7452701cdfa5668408b4127e7cc26a7b625f22fc7a6caac0713c7131cb5a494f980bb507c1f56b93cfafa7141d50a0f24c41cd573599 SHA512 1050f6921c1d04fce55b017afb71dfceadcd1e5f60f7683d7ed4ff3eb5ccc44d42b836e36784f2cb21276fe11dc829402c2d9208c57ee97057a82325804c3f85
 AUX squid-4.3-gentoo.patch 2767 BLAKE2B fbf424bec42a8bd29f54431107e73db1d1acd7612c8acc4d38022419a72ccabc9d0287fb34cbd26e96df2b6e2aaceae929c1005ef2ad4f731cf28edf66ac569a SHA512 eaf076cef4b60c1f5e9985a69f5ae674082b04a6f70d5b484ad13e9e397a8c67cb1780960a11fd943dc2500ec9f0590192b276bf36451d3063537661200487bf
 AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a
 AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749
@@ -7,5 +8,5 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-4.10.tar.xz 2445848 BLAKE2B 8161626f0fc448f62c9afe13194e10a3ac21c1fe25cd6a9e6a85dcc3cebc2a84750ae78235134ada38f730923e7d1815ca5fb5a6aec7ae70623798c66beaf160 SHA512 033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0
 DIST squid-4.11.tar.xz 2447700 BLAKE2B 9080508caff683bffe3e2eb64a454c95f69ab47c0ca9b1a649e553daf0dde2391aa14c6631aa6ee617687b122beef691cbe9a8e49ac5e5ea8a9737847ece9444 SHA512 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26
 EBUILD squid-4.10.ebuild 8058 BLAKE2B 35a1e7e6899d723d99fcc67e93d454725b7e12862d4a666148b829902b38552671414cb54a0fce2a2bd8fdcc637dc8fbcbef96e224007732a158ac1f19fb2ec1 SHA512 457ee367ebcf2a8252ffd8039f07eb1e8430ac6039f3021507c063f590242c69a27b906609c07156d65d5af9aac4c27254824a6479a6b7978925f712d1a92bcf
-EBUILD squid-4.11.ebuild 8063 BLAKE2B 09c61443e5bcc56c7656350c01dd6c3c402070c233f04b2b55e011523aac7bfc4e7ceaa8e8a5cbd6b893153ccf46a952566e87e49da8ddfbb9bec8a654d05ec8 SHA512 d41b8a52c9abea94d09f7090b2b0a56589bbcda3bc9af3dc732b58fced45e26d5f9f1fd72be34c30431f528cb34e113c2594bb3ea5b9ba648d7cc0d01017c6c7
+EBUILD squid-4.11.ebuild 8118 BLAKE2B ecbeaedc74f332332632142b765b4ae3734bfb7c3a142d6c8b828b739ef3f48c1237db3ccf8cea28c186f100d06ee937431d30d520cc89582d5ece22651bcd85 SHA512 fb57fc67029bd7475753ae2ee9351f991643d8202d8b15eb94f6a9ecc95eeb25beb86ddae62e32c57d2b24604e5694589ff24ba9961c5285dce6539eefdf633c
 MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056
diff --git a/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
new file mode 100644
index 000000000000..cf4d3ebb9a56
--- /dev/null
+++ b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch
@@ -0,0 +1,31 @@
+From 0cbf89e7d266aabacc8651759a8509ebbe0f5c93 Mon Sep 17 00:00:00 2001
+From: Alex Rousskov <rousskov@measurement-factory.com>
+Date: Mon, 20 Apr 2020 15:32:48 -0400
+Subject: [PATCH] Bug 5041: Missing Debug::Extra breaks build on hosts with
+ systemd
+
+Master commit 6fa8c66 (i.e. Bug 5016 fix) relied on Debug::Extra added
+by master commit (ccfbe8f) that was not ported to v4. The port of the
+former master commit lacked the required piece of the latter commit.
+
+The problem is invisible on hosts without a systemd package (that Squid
+can find/use) and with Squids explicitly ./configured --without-systemd.
+---
+ src/Debug.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Debug.h b/src/Debug.h
+index 6eecd01bf9..ddd9e38f8f 100644
+--- a/src/Debug.h
++++ b/src/Debug.h
+@@ -99,6 +99,10 @@ class Debug
+ 
+     /// configures the active debugging context to write syslog ALERT
+     static void ForceAlert();
++
++    /// prefixes each grouped debugs() line after the first one in the group
++    static std::ostream& Extra(std::ostream &os) { return os << "\n    "; }
++
+ private:
+     static Context *Current; ///< deepest active context; nil outside debugs()
+ };
diff --git a/net-proxy/squid/squid-4.11.ebuild b/net-proxy/squid/squid-4.11.ebuild
index a738f7035bc7..b0fc4013b7d9 100644
--- a/net-proxy/squid/squid-4.11.ebuild
+++ b/net-proxy/squid/squid-4.11.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~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 \
@@ -78,6 +78,7 @@ pkg_pretend() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-4.3-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-4.11-missing-debug-extra.patch"
 	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
 		INSTALL QUICKSTART \
 		scripts/fileno-to-pathname.pl \