summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Timofeev <timp87@gmail.com>2025-06-21 00:24:23 +0300
committerVladimir Druzenko <vvd@FreeBSD.org>2025-06-21 00:45:43 +0300
commita8cbb070ffbb4845ad2250774782d796d798dc3e (patch)
treeaabe213d6bbf5077aacd55c4cabfa47ff3eb541b
parent51a1ba6b70ae21c30129cbdade00f3a5e7cb0265 (diff)
www/squid: Fix SIGSEGV during run rc script
Any kind of "-k" usage is not working now - comment out all "-k" invokations. Upstream bugreport: https://bugs.squid-cache.org/show_bug.cgi?id=5390 PR: 284312 MFH: 2025Q2 (cherry picked from commit 5cd00d39487925356b911041673b770074bf5626)
-rw-r--r--www/squid/files/squid.in17
1 files changed, 10 insertions, 7 deletions
diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in
index e8ea315cc356..b1ba8938bf56 100644
--- a/www/squid/files/squid.in
+++ b/www/squid/files/squid.in
@@ -60,14 +60,16 @@ rcvar=squid_enable
# Make sure that we invoke squid with "-f ${squid_conf}"; define this
# variable early so reload_cmd and stop_precmd pick it up:
-extra_commands="reload configtest"
-reload_cmd=squid_reload
+# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
+#extra_commands="reload configtest"
+#reload_cmd=squid_reload
start_precmd=squid_prestart
start_postcmd=squid_getpid
-stop_precmd=squid_prestop
-configtest_cmd=squid_configtest
-reload_precmd=squid_configtest
-restart_precmd=squid_configtest
+# Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
+#stop_precmd=squid_prestop
+#configtest_cmd=squid_configtest
+#reload_precmd=squid_configtest
+#restart_precmd=squid_configtest
# squid(8) will not start if ${squid_conf} is not present so try
# to catch that beforehand via ${required_files} rather than make
@@ -128,7 +130,8 @@ squid_prestart()
return 0
fi
- squid_configtest
+ # Workaround for https://bugs.squid-cache.org/show_bug.cgi?id=5390 until squid-7 is ported
+ #squid_configtest
}
squid_reload()