aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/squidGuard/squidguard_configurator.inc12
-rw-r--r--pkg_config.10.xml6
2 files changed, 11 insertions, 7 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index 551ca542..99907451 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -121,7 +121,7 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u');
# ------------------------------------------------------------------------------
-if ($pf_version > 2.0) {
+if ($pf_version == "2.0" || $pf_version == "2.2") {
if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m")))
define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m"));
else
@@ -129,10 +129,12 @@ if ($pf_version > 2.0) {
} else
define('SQUIDGUARD_LOCALBASE','/usr/local');
-if (!defined('SQUID_LOCALBASE') && ($pf_version > 2.0))
- define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
-elseif (!defined('SQUID_LOCALBASE'))
- define('SQUID_LOCALBASE','/usr/local');
+if (!defined('SQUID_LOCALBASE')) {
+ if ($pf_version == "2.0" || $pf_version == "2.2")
+ define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
+ else
+ define('SQUID_LOCALBASE','/usr/local');
+}
define('SQUID_CONFIGFILE', SQUID_LOCALBASE . '/etc/squid/squid.conf');
define('TMP_DIR', '/var/tmp');
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 7a942a23..176d3d43 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1087,12 +1087,14 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_7 pkg v.1.9.14</version>
+ <version>1.9.14</version>
<status>Beta</status>
<required_version>2.2</required_version>
<depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi>
+ <port_category>www</port_category>
+ <run_depends>bin/squidGuard:www/squidguard</run_depends>
<build_pbi>
- <ports_before>www/squid33 databases/db5 security/cyrus-sasl2</ports_before>
+ <ports_before>www/squid databases/db5 security/cyrus-sasl2</ports_before>
<port>www/squidguard</port>
</build_pbi>
<build_options>squidGuard_UNSET_FORCE=QUOTE_STRING;squidGuard_SET_FORCE=DNS_BL LDAP STRIP_NTDOMAIN;c-icap_UNSET_FORCE=IPV6;squid_UNSET_FORCE=AUTH_SMB AUTH_SQL DNS_HELPER FS_COSS ESI SNMP ECAP STACKTRACES STRICT_HTTP TP_IPF TP_IPFW VIA_DB DEBUG;squid_SET_FORCE=ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF TP_PF MSSL_CRTD WCCP WCCPV2 FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE LARGEFILE SSL SSL_CRTD</build_options>