commit: 2ab08c4cff78184c68bc46730863d6427298e90d Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Sun May 3 09:53:08 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Sun May 3 15:05:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab08c4c
net-proxy/squid: add patch for 4.11 (bug #719510) Patch originates from upstream bug (https://bugs.squid-cache.org/show_bug.cgi?id=5041) Package-Manager: Portage-2.3.90, Repoman-2.3.22 Closes: https://bugs.gentoo.org/719510 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://github.com/gentoo/gentoo/pull/15621 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> .../files/squid-4.11-missing-debug-extra.patch | 31 ++++++++++++++++++++++ net-proxy/squid/squid-4.11.ebuild | 1 + 2 files changed, 32 insertions(+) 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 00000000000..cf4d3ebb9a5 --- /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 <rouss...@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 c63ab235d7d..b0fc4013b7d 100644 --- a/net-proxy/squid/squid-4.11.ebuild +++ b/net-proxy/squid/squid-4.11.ebuild @@ -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 \
