diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-23 08:40:18 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-23 08:40:18 -0200 |
| commit | 942d92c0b2cfd5ed0a54fa35f5a6006155aa4304 (patch) | |
| tree | b11dbae0b4317e5d938e4438a3c1588a20fbdb60 | |
| parent | 018d14b1df651ff100b92823c620205d26887374 (diff) | |
| parent | c099f638fc0ed1bf264a4810fb2c5cd36dfa3392 (diff) | |
| download | pfsense-packages-942d92c0b2cfd5ed0a54fa35f5a6006155aa4304.tar.gz pfsense-packages-942d92c0b2cfd5ed0a54fa35f5a6006155aa4304.tar.bz2 pfsense-packages-942d92c0b2cfd5ed0a54fa35f5a6006155aa4304.zip | |
Merge pull request #1190 from doktornotor/patch-1
| -rw-r--r-- | config/siproxd/siproxd.inc | 1 | ||||
| -rw-r--r-- | config/siproxd/siproxd_registered_phones.php | 6 | ||||
| -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, 8 insertions, 5 deletions
diff --git a/config/siproxd/siproxd.inc b/config/siproxd/siproxd.inc index 9eae2567..eb5658b9 100644 --- a/config/siproxd/siproxd.inc +++ b/config/siproxd/siproxd.inc @@ -146,6 +146,7 @@ function sync_package_siproxd() { } $siproxd_conffile = SIPROXD . '/etc/siproxd.conf'; $siproxd_pwfile = SIPROXD . '/etc/siproxd_passwd.cfg'; + $siproxd_chroot = "/var/siproxd/"; $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3); if ($pfs_version == '2.2') { diff --git a/config/siproxd/siproxd_registered_phones.php b/config/siproxd/siproxd_registered_phones.php index 0648aa2f..429b5338 100644 --- a/config/siproxd/siproxd_registered_phones.php +++ b/config/siproxd/siproxd_registered_phones.php @@ -40,8 +40,10 @@ require_once("guiconfig.inc"); -$phonetext = file_get_contents("/var/siproxd/siproxd_registrations"); -$phonedata = explode("\n", $phonetext); +if (file_exists("/var/siproxd/siproxd_registrations")) { + $phonetext = file_get_contents("/var/siproxd/siproxd_registrations"); + $phonedata = explode("\n", $phonetext); +} if (!is_array($phonedata)) { $phonedata = array(); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 4dfe3a56..37935d71 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -568,7 +568,7 @@ <build_pbi> <port>net/siproxd</port> </build_pbi> - <version>1.0.7</version> + <version>1.0.8</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 a081c1be..9c1890eb 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -593,7 +593,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_1 pkg v1.0.7</version> + <version>0.8.0_1 pkg v1.0.8</version> <status>Beta</status> <required_version>2.1</required_version> <configurationfile>siproxd.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7113b826..12782e93 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -580,7 +580,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_1 pkg v1.0.7</version> + <version>0.8.0_1 pkg v1.0.8</version> <status>Beta</status> <required_version>2.1</required_version> <configurationfile>siproxd.xml</configurationfile> |