diff options
| author | jim-p <jimp@pfsense.org> | 2014-05-09 13:34:19 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-05-09 13:34:19 -0400 |
| commit | 718bfb6ac6f684fc740eaad037aabef790c33f99 (patch) | |
| tree | 9044371b83d9d7d2c94dadb95f6a7ac09ac6c275 | |
| parent | c18e6be175e6e0e2939fd8dde7dcd1138a97a0a3 (diff) | |
| download | pfsense-packages-718bfb6ac6f684fc740eaad037aabef790c33f99.tar.gz pfsense-packages-718bfb6ac6f684fc740eaad037aabef790c33f99.tar.bz2 pfsense-packages-718bfb6ac6f684fc740eaad037aabef790c33f99.zip | |
Make tinc pkg respect proper clog path for >= 2.1.3
| -rw-r--r-- | config/tinc/status_tinc.php | 20 | ||||
| -rw-r--r-- | config/tinc/tinc.xml | 2 | ||||
| -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, 22 insertions, 6 deletions
diff --git a/config/tinc/status_tinc.php b/config/tinc/status_tinc.php index 725ccce6..cd7b0aad 100644 --- a/config/tinc/status_tinc.php +++ b/config/tinc/status_tinc.php @@ -6,7 +6,15 @@ require("guiconfig.inc"); function tinc_status_1() { exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR1"); usleep(500000); - exec("/usr/sbin/clog /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); + $clog_path = ""; + $result = array(); + if (is_executable("/usr/local/sbin/clog")) { + $clog_path = "/usr/local/sbin/clog"; + } elseif (is_executable("/usr/sbin/clog")) { + $clog_path = "/usr/sbin/clog"; + + if (!empty($clog_path)) + exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); $i=0; foreach($result as $line) { @@ -30,7 +38,15 @@ function tinc_status_1() { function tinc_status_2() { exec("/usr/local/sbin/tincd --config=/usr/local/etc/tinc -kUSR2"); usleep(500000); - exec("/usr/sbin/clog /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); + $clog_path = ""; + $result = array(); + if (is_executable("/usr/local/sbin/clog")) { + $clog_path = "/usr/local/sbin/clog"; + } elseif (is_executable("/usr/sbin/clog")) { + $clog_path = "/usr/sbin/clog"; + + if (!empty($clog_path)) + exec("{$clog_path} /var/log/tinc.log | sed -e 's/.*tinc\[.*\]: //'",$result); $i=0; foreach($result as $line) { diff --git a/config/tinc/tinc.xml b/config/tinc/tinc.xml index f016dd41..183ae161 100644 --- a/config/tinc/tinc.xml +++ b/config/tinc/tinc.xml @@ -42,7 +42,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>tinc</name> - <version>1.0.21 v1.1</version> + <version>1.0.23 v1.2.1</version> <title>VPN: tinc</title> <!-- Menu is where this packages menu will appear --> <menu> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 33815883..1aa4c47d 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1404,7 +1404,7 @@ <port>security/tinc</port> </build_pbi> <build_options></build_options> - <version>1.0.23 v1.1</version> + <version>1.0.23 v1.2.1</version> <status>ALPHA</status> <pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink> <required_version>2.2</required_version> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a260b511..3ccda834 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1839,7 +1839,7 @@ <port>security/tinc</port> </build_pbi> <build_options></build_options> - <version>1.0.23 v1.2</version> + <version>1.0.23 v1.2.1</version> <status>ALPHA</status> <pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink> <required_version>2.1</required_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d42775ea..3046213f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1826,7 +1826,7 @@ <port>security/tinc</port> </build_pbi> <build_options></build_options> - <version>1.0.23 v1.2</version> + <version>1.0.23 v1.2.1</version> <status>ALPHA</status> <pkginfolink>https://doc.pfsense.org/index.php/tinc_package</pkginfolink> <required_version>2.1</required_version> |