diff options
| -rw-r--r-- | config/havp/havp.inc | 4 | ||||
| -rw-r--r-- | config/havp/havp_avset.xml | 7 | ||||
| -rwxr-xr-x | config/squid3/34/squid.inc | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/config/havp/havp.inc b/config/havp/havp.inc index 5ecfcc29..38412f31 100644 --- a/config/havp/havp.inc +++ b/config/havp/havp.inc @@ -521,12 +521,12 @@ function havp_reconfigure_cron() { $optval = array("", "*/1", "*/2", "*/3", "*/4", "*/6", "*/8", "*/12", "0"); $opt = array("0", "*", "*", "*", "*", "root"); $opt[1] = $optval[$havp_config[F_HAVPUPDATE]]; - $on = ($opt[1] !== ""); + $on = ($opt[1] != ""); $crontask = "/usr/bin/nice -n20 " . HVDEF_AVUPD_SCRIPT; // Set new cron task or remove it if inactive if ($on === true) { - install_cron_job($crontask, $on, $opt); + install_cron_job($crontask, true, $opt[0], $opt[1], $opt[2], $opt[3], $opt[4], $opt[5]); } else { install_cron_job($crontask, false); } diff --git a/config/havp/havp_avset.xml b/config/havp/havp_avset.xml index c6429724..0f8ac5e6 100644 --- a/config/havp/havp_avset.xml +++ b/config/havp/havp_avset.xml @@ -69,13 +69,12 @@ <tab> <text>HAVP Log</text> <url>/havp_log.php?logtab=havp</url> - </tab> - </tabs> + </tab> <tab> <text>Clamd Log</text> <url>/havp_log.php?logtab=clamd</url> - </tab> - </tabs> + </tab> + </tabs> <fields> <field> <fielddescr>ClamAV Database Update</fielddescr> 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 b97a8e0f..6dcaf09b 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> @@ -1201,7 +1201,7 @@ <ports_after>security/clamav</ports_after> </build_pbi> <build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options> - <version>1.07</version> + <version>1.08</version> <status>BETA</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file> |