From 718bfb6ac6f684fc740eaad037aabef790c33f99 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 9 May 2014 13:34:19 -0400
Subject: Make tinc pkg respect proper clog path for >= 2.1.3

---
 config/tinc/status_tinc.php | 20 ++++++++++++++++++--
 config/tinc/tinc.xml        |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'config')

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>
-- 
cgit v1.2.3