summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-04-27 14:50:13 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2020-04-27 14:50:13 +0100
commite50de50fbd980ae53e4a625aadc5793583e6baeb (patch)
treefd9544d483af95551f873442f8c95f3b2220de2a
parentPatch drbd-utils service paths for 64bit (diff)
downloadpatches-e50de50fbd980ae53e4a625aadc5793583e6baeb.tar.bz2
patches-e50de50fbd980ae53e4a625aadc5793583e6baeb.tar.xz
patches-e50de50fbd980ae53e4a625aadc5793583e6baeb.zip
Build fix for squid
-rw-r--r--net-proxy/squid/pr611.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/net-proxy/squid/pr611.patch b/net-proxy/squid/pr611.patch
new file mode 100644
index 0000000..cf4d3eb
--- /dev/null
+++ b/net-proxy/squid/pr611.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()
+ };