| 1 |
commit: 2ab08c4cff78184c68bc46730863d6427298e90d |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Sun May 3 09:53:08 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 15:05:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab08c4c |
| 7 |
|
| 8 |
net-proxy/squid: add patch for 4.11 (bug #719510) |
| 9 |
|
| 10 |
Patch originates from upstream bug |
| 11 |
(https://bugs.squid-cache.org/show_bug.cgi?id=5041) |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.90, Repoman-2.3.22 |
| 14 |
Closes: https://bugs.gentoo.org/719510 |
| 15 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/15621 |
| 17 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 18 |
|
| 19 |
.../files/squid-4.11-missing-debug-extra.patch | 31 ++++++++++++++++++++++ |
| 20 |
net-proxy/squid/squid-4.11.ebuild | 1 + |
| 21 |
2 files changed, 32 insertions(+) |
| 22 |
|
| 23 |
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 |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..cf4d3ebb9a5 |
| 26 |
--- /dev/null |
| 27 |
+++ b/net-proxy/squid/files/squid-4.11-missing-debug-extra.patch |
| 28 |
@@ -0,0 +1,31 @@ |
| 29 |
+From 0cbf89e7d266aabacc8651759a8509ebbe0f5c93 Mon Sep 17 00:00:00 2001 |
| 30 |
+From: Alex Rousskov <rousskov@×××××××××××××××××××.com> |
| 31 |
+Date: Mon, 20 Apr 2020 15:32:48 -0400 |
| 32 |
+Subject: [PATCH] Bug 5041: Missing Debug::Extra breaks build on hosts with |
| 33 |
+ systemd |
| 34 |
+ |
| 35 |
+Master commit 6fa8c66 (i.e. Bug 5016 fix) relied on Debug::Extra added |
| 36 |
+by master commit (ccfbe8f) that was not ported to v4. The port of the |
| 37 |
+former master commit lacked the required piece of the latter commit. |
| 38 |
+ |
| 39 |
+The problem is invisible on hosts without a systemd package (that Squid |
| 40 |
+can find/use) and with Squids explicitly ./configured --without-systemd. |
| 41 |
+--- |
| 42 |
+ src/Debug.h | 4 ++++ |
| 43 |
+ 1 file changed, 4 insertions(+) |
| 44 |
+ |
| 45 |
+diff --git a/src/Debug.h b/src/Debug.h |
| 46 |
+index 6eecd01bf9..ddd9e38f8f 100644 |
| 47 |
+--- a/src/Debug.h |
| 48 |
++++ b/src/Debug.h |
| 49 |
+@@ -99,6 +99,10 @@ class Debug |
| 50 |
+ |
| 51 |
+ /// configures the active debugging context to write syslog ALERT |
| 52 |
+ static void ForceAlert(); |
| 53 |
++ |
| 54 |
++ /// prefixes each grouped debugs() line after the first one in the group |
| 55 |
++ static std::ostream& Extra(std::ostream &os) { return os << "\n "; } |
| 56 |
++ |
| 57 |
+ private: |
| 58 |
+ static Context *Current; ///< deepest active context; nil outside debugs() |
| 59 |
+ }; |
| 60 |
|
| 61 |
diff --git a/net-proxy/squid/squid-4.11.ebuild b/net-proxy/squid/squid-4.11.ebuild |
| 62 |
index c63ab235d7d..b0fc4013b7d 100644 |
| 63 |
--- a/net-proxy/squid/squid-4.11.ebuild |
| 64 |
+++ b/net-proxy/squid/squid-4.11.ebuild |
| 65 |
@@ -78,6 +78,7 @@ pkg_pretend() { |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" |
| 69 |
+ eapply "${FILESDIR}/${PN}-4.11-missing-debug-extra.patch" |
| 70 |
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
| 71 |
INSTALL QUICKSTART \ |
| 72 |
scripts/fileno-to-pathname.pl \ |
Archives