aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 16:57:57 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 16:57:57 -0300
commit4897bdd7deb318233d34d31ba1ea23b6b77b2215 (patch)
tree9a7cf9909184e7fa8113a6496e5f805ccb74d43d
parentfd592addeff71724326566cf2616881d2a773647 (diff)
parent4fc2597ffea95e8362d171af36d6defd6e26fc8f (diff)
downloadpfsense-packages-4897bdd7deb318233d34d31ba1ea23b6b77b2215.tar.gz
pfsense-packages-4897bdd7deb318233d34d31ba1ea23b6b77b2215.tar.bz2
pfsense-packages-4897bdd7deb318233d34d31ba1ea23b6b77b2215.zip
Merge pull request #1058 from doktornotor/patch-5
-rwxr-xr-xconfig/squid3/34/squid.inc6
-rw-r--r--pkg_config.10.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index 76deb94c..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"))
@@ -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";
@@ -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
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 6d4c2b2c..d29b3959 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1052,7 +1052,7 @@
<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
<website>http://www.squid-cache.org/</website>
<category>Network</category>
- <version>0.3.1</version>
+ <version>0.3.2</version>
<status>beta</status>
<required_version>2.2</required_version>
<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>