aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-09 09:11:49 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-09 09:11:49 -0300
commit6477fcaeef04b041d05d8fa1dd57ebac94355c5f (patch)
tree3160b846b7faa2717d7ed31c4486a75120316d8d
parent8efa1efc477c33dac392615187194e1f698906a8 (diff)
parent89750f086c25dfde9130f520091ba7639e6a31b9 (diff)
downloadpfsense-packages-6477fcaeef04b041d05d8fa1dd57ebac94355c5f.tar.gz
pfsense-packages-6477fcaeef04b041d05d8fa1dd57ebac94355c5f.tar.bz2
pfsense-packages-6477fcaeef04b041d05d8fa1dd57ebac94355c5f.zip
Merge pull request #852 from dneuhaeuser/patch-3
-rw-r--r--config/squidGuard/squidguard_configurator.inc6
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml4
-rw-r--r--pkg_config.8.xml.amd644
4 files changed, 8 insertions, 8 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index 38104c89..ca66d89a 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -702,7 +702,7 @@ function sg_rebuild_db($shtag, $rdb_dbhome, $rdb_itemslist)
$sh_scr[] = "chown -R -v " . OWNER_NAME . " $dbhome";
# restart squid for changes to take effects
- $sh_scr[] = SQUID_LOCALBASE . "/sbin/squid -k reconfigure";
+ $sh_scr[] = SQUID_BASE . "/sbin/squid -k reconfigure";
# store & exec sh
$sh_scr = implode("\n", $sh_scr);
@@ -2266,7 +2266,7 @@ function sg_update_blacklist($from_file)
set_file_access($dbhome, OWNER_NAME, 0755);
squidguard_update_log("Reconfigure Squid proxy.");
- mwexec(SQUID_LOCALBASE . "/sbin/squid -k reconfigure");
+ mwexec(SQUID_BASE . "/sbin/squid -k reconfigure");
squidguard_update_log("Blacklist update complete.");
@@ -2405,7 +2405,7 @@ function squidguard_blacklist_restore_arcdb()
squidguard_rebuild_db("arc_", $dbhome, $files);
squidguard_update_log("Reconfigure Squid proxy.");
- mwexec(SQUID_LOCALBASE . "/sbin/squid -k reconfigure");
+ mwexec(SQUID_BASE . "/sbin/squid -k reconfigure");
conf_mount_ro();
squidguard_update_log("Restore success.");
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 2a4ee936..6e35c82a 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -990,7 +990,7 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_7 pkg v.1.9.11</version>
+ <version>1.4_7 pkg v.1.9.12</version>
<status>Beta</status>
<required_version>2.2</required_version>
<depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 5f9e40da..5251bb19 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1292,7 +1292,7 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_4 pkg v.1.9.10</version>
+ <version>1.4_4 pkg v.1.9.12</version>
<status>Beta</status>
<required_version>1.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
@@ -1337,7 +1337,7 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_4 pkg v.1.9.6</version>
+ <version>1.4_4 pkg v.1.9.12</version>
<status>Beta</status>
<required_version>2.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 83a7c1ae..ac0df460 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1279,7 +1279,7 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_4 pkg v.1.9.10</version>
+ <version>1.4_4 pkg v.1.9.12</version>
<status>Beta</status>
<required_version>1.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
@@ -1324,7 +1324,7 @@
<website>http://www.squidGuard.org/</website>
<maintainer>dv_serg@mail.ru</maintainer>
<category>Network Management</category>
- <version>1.4_4 pkg v.1.9.6</version>
+ <version>1.4_4 pkg v.1.9.12</version>
<status>Beta</status>
<required_version>2.1</required_version>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>