aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-27 10:20:19 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-27 10:20:19 -0300
commit0881d90baf0ce2ec2db853892f60ba8cef5a9d06 (patch)
tree0d256451e626d5b67746d6b0d5ed074026ac0a6c
parent3a0d7845b25085754d83ac52757eb6649938ca17 (diff)
downloadpfsense-packages-0881d90baf0ce2ec2db853892f60ba8cef5a9d06.tar.gz
pfsense-packages-0881d90baf0ce2ec2db853892f60ba8cef5a9d06.tar.bz2
pfsense-packages-0881d90baf0ce2ec2db853892f60ba8cef5a9d06.zip
Sanitize siproxd version, add port_category, run_depends and fix pbi checking
-rw-r--r--config/siproxd/siproxd.inc6
-rw-r--r--config/siproxd/siproxd.xml2
-rw-r--r--pkg_config.10.xml4
3 files changed, 7 insertions, 5 deletions
diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc
index d9830fb2..e873e08d 100644
--- a/config/siproxd/siproxd.inc
+++ b/config/siproxd/siproxd.inc
@@ -33,10 +33,10 @@ require_once("service-utils.inc");
// Check to find out on which system the package is running
$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pfs_version == "2.0") {
- define('SIPROXD', '/usr/local');
-} else {
+if ($pfs_version == "2.1" || $pfs_version == "2.2") {
define('SIPROXD', '/usr/pbi/siproxd-' . php_uname("m"));
+} else {
+ define('SIPROXD', '/usr/local');
}
// End of system check
diff --git a/config/siproxd/siproxd.xml b/config/siproxd/siproxd.xml
index 8b1b5856..455fca9c 100644
--- a/config/siproxd/siproxd.xml
+++ b/config/siproxd/siproxd.xml
@@ -37,7 +37,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>siproxdsettings</name>
- <version>0.8.0_2 pkg v1.0.2</version>
+ <version>1.0.3</version>
<title>siproxd: Settings</title>
<include_file>/usr/local/pkg/siproxd.inc</include_file>
<aftersaveredirect>/pkg_edit.php?xml=siproxd.xml&amp;id=0</aftersaveredirect>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d7314352..06e84277 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -530,10 +530,12 @@
<config_file>https://packages.pfsense.org/packages/config/siproxd/siproxd.xml</config_file>
<depends_on_package_pbi>siproxd-0.8.0_1-##ARCH##.pbi</depends_on_package_pbi>
<pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink>
+ <port_category>net</port_category>
+ <run_depends>sbin/siproxd:net/siproxd</run_depends>
<build_pbi>
<port>net/siproxd</port>
</build_pbi>
- <version>0.8.0_1 pkg v1.0.3</version>
+ <version>1.0.3</version>
<status>Beta</status>
<required_version>2.2</required_version>
<configurationfile>siproxd.xml</configurationfile>