diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-05-05 15:51:48 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-05 15:51:48 -0300 |
| commit | 65a85c16b76449f0296b3bd8b02c4aa1a90c590b (patch) | |
| tree | d2f7f564771f6c17ee5560011ccc7fba12b7f10b | |
| parent | b45090398fec02835d5ada9255f4b5dd97865c42 (diff) | |
| download | pfsense-packages-65a85c16b76449f0296b3bd8b02c4aa1a90c590b.tar.gz pfsense-packages-65a85c16b76449f0296b3bd8b02c4aa1a90c590b.tar.bz2 pfsense-packages-65a85c16b76449f0296b3bd8b02c4aa1a90c590b.zip | |
For some reason, global pfs_version has a wrong value during installation. Force it to re-read /etc/version inside functions
| -rw-r--r-- | config/lightsquid/lightsquid.inc | 6 | ||||
| -rw-r--r-- | config/lightsquid/lightsquid.xml | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/config/lightsquid/lightsquid.inc b/config/lightsquid/lightsquid.inc index 60ec1fc9..233f42d3 100644 --- a/config/lightsquid/lightsquid.inc +++ b/config/lightsquid/lightsquid.inc @@ -115,8 +115,6 @@ define('LS_XML_SHEDULERTIME', 'lightsquid_refreshsheduler_time'); define('LS_XML_SQUID_SHEDULERTIME', 'lightsquid_squidrotatelog_sheduler_time'); function lightsquid_install() { - global $pfs_version; - update_log("lightsquid_install: started"); // create lightsquid report catalog @@ -125,6 +123,7 @@ function lightsquid_install() { mwexec("/bin/mkdir -p " . LS_REPORTPATH); } + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if ($pfs_version == "2.1" || $pfs_version == "2.2") { # check perl $perl_path = '/usr/bin/perl'; @@ -174,10 +173,11 @@ function lightsquid_deinstall() { } function lightsquid_resync() { - global $config, $pfs_version; + global $config; $tm = ''; $tm_squid = ''; + $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); if ($pfs_version == "2.1" || $pfs_version == "2.2") { # check perl if (!file_exists("/usr/bin/perl")) diff --git a/config/lightsquid/lightsquid.xml b/config/lightsquid/lightsquid.xml index 4f60997c..f5f09b94 100644 --- a/config/lightsquid/lightsquid.xml +++ b/config/lightsquid/lightsquid.xml @@ -46,7 +46,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>lightsquid</name> - <version>2.40</version> + <version>2.41</version> <title>Services: Proxy Reports (LightSquid, SQStat) -> Settings</title> <category>Status</category> <include_file>/usr/local/pkg/lightsquid.inc</include_file> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index afba6042..f7adf97e 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -563,7 +563,7 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>2.40</version> + <version>2.41</version> <maintainer>dv_serg@mail.ru</maintainer> <port_category>www</port_category> <run_depends>libexec/lightsquid/ip2name.list:www/lightsquid</run_depends> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index f69eb30c..d641bf4d 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -665,7 +665,7 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>2.40</version> + <version>2.41</version> <maintainer>dv_serg@mail.ru</maintainer> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package>lightsquid-1.8_2.tbz</depends_on_package> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index fa1e0bc1..8f67c917 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -652,7 +652,7 @@ <descr>High performance web proxy report (LightSquid). Proxy realtime stat (SQStat). Requires squid HTTP proxy.</descr> <website>http://lightsquid.sf.net/</website> <category>Network Report</category> - <version>2.40</version> + <version>2.41</version> <maintainer>dv_serg@mail.ru</maintainer> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>lightsquid-1.8_2.tbz</depends_on_package> |