From f21a543c952dc123841dfb239d0e0e3f3e98e216 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Sep 2015 22:43:28 +0200 Subject: squid3 - fix inverted boot check --- config/squid3/34/squid.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index 76deb94c..25d9e3a6 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -1840,7 +1840,7 @@ function squid_resync($via_rpc="no") { // detect boot process if (is_array($_POST)) { - if (platform_booting()) { + if (!platform_booting()) { unset($boot_process); } else { $boot_process="on"; -- cgit v1.2.3 From 0890ebadc7262cca72967f7e045f408b1a81975a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Thu, 10 Sep 2015 22:44:17 +0200 Subject: Bump squid3 package version --- pkg_config.10.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 082bf101..b523b974 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1052,7 +1052,7 @@ https://forum.pfsense.org/index.php/topic,48347.0.html http://www.squid-cache.org/ Network - 0.3.1 + 0.3.2 beta 2.2 marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org -- cgit v1.2.3 From 4fc2597ffea95e8362d171af36d6defd6e26fc8f Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 11 Sep 2015 07:17:22 +0200 Subject: squid pinger helper needs to be suid root (Bug #5114) --- config/squid3/34/squid.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index 25d9e3a6..e5eb2f6c 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -309,7 +309,7 @@ function squid_install_command() { /* make sure pinger is executable and suid root */ // XXX: Bug #5114 if (file_exists(SQUID_LOCALBASE. "/libexec/squid/pinger")) - chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 4755); + chgrp(SQUID_LOCALBASE. "/libexec/squid/pinger", SQUID_GID); // XXX: Is it really necessary? if (file_exists("/usr/local/etc/rc.d/squid")) @@ -1880,7 +1880,7 @@ function squid_resync($via_rpc="no") { /* make sure pinger is executable and suid root */ // XXX: Bug #5114 if (file_exists(SQUID_LOCALBASE . "/libexec/squid/pinger")) - chmod(SQUID_LOCALBASE. "/libexec/squid/pinger", 4755); + chgrp(SQUID_LOCALBASE. "/libexec/squid/pinger", SQUID_GID); $log_dir=""; // check if squid is enabled -- cgit v1.2.3