diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-02-26 16:11:35 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-02-26 16:14:08 -0300 |
| commit | e7aca8a470e3ea13e018c99f7db4351c4119f082 (patch) | |
| tree | c7bfd2b8c26ce9cfdc5ca3717e125c325503461a | |
| parent | 275c6d8796ee47be261045c4d53618562f8b42e7 (diff) | |
| download | pfsense-packages-e7aca8a470e3ea13e018c99f7db4351c4119f082.tar.gz pfsense-packages-e7aca8a470e3ea13e018c99f7db4351c4119f082.tar.bz2 pfsense-packages-e7aca8a470e3ea13e018c99f7db4351c4119f082.zip | |
Update siproxd pbi to 0.8.0_1 on 2.2 and fix startup script, fixes #4217
| -rw-r--r-- | config/siproxd/siproxd.inc | 12 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc index d76f79d3..d9830fb2 100644 --- a/config/siproxd/siproxd.inc +++ b/config/siproxd/siproxd.inc @@ -32,7 +32,8 @@ if(!function_exists("filter_configure")) require_once("service-utils.inc"); // Check to find out on which system the package is running -if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.0") { +$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); +if ($pfs_version == "2.0") { define('SIPROXD', '/usr/local'); } else { define('SIPROXD', '/usr/pbi/siproxd-' . php_uname("m")); @@ -108,7 +109,7 @@ function siproxd_generate_rules($type) { } function sync_package_siproxd() { - global $config; + global $config, $pfs_version; // put the constant to a variable $varSIPROXD = SIPROXD; @@ -250,9 +251,14 @@ function sync_package_siproxd() { fclose($fout); + if ($pfs_version == '2.2') + $bin_dir='bin'; + else + $bin_dir='sbin'; + write_rcfile(array( "file" => "siproxd.sh", - "start" => "$varSIPROXD/sbin/siproxd -c $varSIPROXD/etc/siproxd.conf &", + "start" => "$varSIPROXD/{$bin_dir}/siproxd -c $varSIPROXD/etc/siproxd.conf &", "stop" => "/usr/bin/killall -9 siproxd" ) ); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index a37cb595..91ab7d28 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -460,12 +460,12 @@ <descr>Proxy for handling NAT of multiple SIP devices to a single public IP.</descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/siproxd/siproxd.xml</config_file> - <depends_on_package_pbi>siproxd-0.8.0-##ARCH##.pbi</depends_on_package_pbi> + <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> <build_pbi> <port>net/siproxd</port> </build_pbi> - <version>0.8.0_2 pkg v1.0.2</version> + <version>0.8.0_1 pkg v1.0.3</version> <status>Beta</status> <required_version>2.2</required_version> <configurationfile>siproxd.xml</configurationfile> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 681f530d..fffdd91d 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -613,7 +613,7 @@ <depends_on_package_pbi>siproxd-0.8.0-i386.pbi</depends_on_package_pbi> <pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink> <build_port_path>/usr/ports/net/siproxd</build_port_path> - <version>0.8.0_2 pkg v1.0.2</version> + <version>0.8.0_1 pkg v1.0.3</version> <status>Beta</status> <required_version>1.2.1</required_version> <configurationfile>siproxd.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index c41ec11e..4c24287d 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -600,7 +600,7 @@ <depends_on_package_pbi>siproxd-0.8.0-amd64.pbi</depends_on_package_pbi> <pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink> <build_port_path>/usr/ports/net/siproxd</build_port_path> - <version>0.8.0_2 pkg v1.0.2</version> + <version>0.8.0_1 pkg v1.0.3</version> <status>Beta</status> <required_version>1.2.1</required_version> <configurationfile>siproxd.xml</configurationfile> |