diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 15:48:22 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 15:48:22 -0300 |
| commit | 277f2c1ae87c97c6eaf82b9b22cae58b9460279e (patch) | |
| tree | 066cb100a3dd78132bd3f658bb675dda757189ed | |
| parent | 1ccbfc669535dfa0e64e52cec914c6d5ae0f8415 (diff) | |
| download | pfsense-packages-277f2c1ae87c97c6eaf82b9b22cae58b9460279e.tar.gz pfsense-packages-277f2c1ae87c97c6eaf82b9b22cae58b9460279e.tar.bz2 pfsense-packages-277f2c1ae87c97c6eaf82b9b22cae58b9460279e.zip | |
Sanitize sarg version, add port_category, run_depends and fix pbi checking
| -rw-r--r-- | config/sarg/sarg.inc | 2 | ||||
| -rwxr-xr-x | config/sarg/sarg_realtime.php | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 2788dab9..ce2617e1 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -32,7 +32,7 @@ */ /* ========================================================================== */ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0){ +if ($pf_version == "2.1" || $pf_version == "2.2"){ // Function to get squidGuard directory // each squidGuard version has a different directory diff --git a/config/sarg/sarg_realtime.php b/config/sarg/sarg_realtime.php index c5d926e5..f7618d1a 100755 --- a/config/sarg/sarg_realtime.php +++ b/config/sarg/sarg_realtime.php @@ -28,7 +28,7 @@ */ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); -if ($pf_version > 2.0) +if ($pf_version == "2.1" || $pf_version == "2.2") define('SARG_DIR', '/usr/pbi/sarg-' . php_uname("m")); else define('SARG_DIR', '/usr/local'); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 50f7aac4..9483df35 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -588,9 +588,11 @@ <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> <depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi> - <version>2.3.9 pkg v.0.6.4</version> + <version>0.6.4</version> <status>Release</status> <required_version>2.2</required_version> + <port_category>www</port_category> + <run_depends>bin/sarg:www/sarg</run_depends> <configurationfile>sarg.xml</configurationfile> <build_pbi> <port>www/sarg</port> |