diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-24 15:09:43 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-24 15:09:43 -0300 |
| commit | fadf36be68b38a589771f19f69c20036bb053ee4 (patch) | |
| tree | c65a9a89ab50023478b7eece91390696288bee67 | |
| parent | 851ee8e025ec8c14a9daac5818cee2284ada6def (diff) | |
| download | pfsense-packages-fadf36be68b38a589771f19f69c20036bb053ee4.tar.gz pfsense-packages-fadf36be68b38a589771f19f69c20036bb053ee4.tar.bz2 pfsense-packages-fadf36be68b38a589771f19f69c20036bb053ee4.zip | |
Sanitize spamd version, add run_depends, port_category and fix check for PBI
| -rw-r--r-- | config/spamd/spamd.inc | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc index e09b2b7f..71f20106 100644 --- a/config/spamd/spamd.inc +++ b/config/spamd/spamd.inc @@ -35,7 +35,7 @@ if(!function_exists("filter_configure")) function sync_package_spamd() { global $config, $g; $pf_version = substr(trim(file_get_contents("/etc/version")),0,3); - if ($pf_version < 2.2) { + if ($pf_version != "2.2") { $localpath = "/usr/local"; } else { $ARCH = php_uname("m"); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 31ec7ec5..7e7ba64f 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -439,9 +439,11 @@ <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/spamd/spamd.xml</config_file> <depends_on_package_pbi>spamd-4.9.1_2-##ARCH##.pbi</depends_on_package_pbi> - <version>4.9.1_2 v1.1.2</version> + <version>1.1.2</version> <status>Beta</status> <required_version>2.2</required_version> + <port_category>net</port_category> + <run_depends>sbin/spamdb:mail/spamd</run_depends> <configurationfile>spamd.xml</configurationfile> <build_pbi> <port>mail/spamd</port> |