From c6edd140ec401b4e53ff468373c2f5171e4dc232 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 17 May 2017 06:23:47 +0200
Subject: [PATCH] security/tinc: fixes from master

---
 security/tinc/Makefile                         |  1 +
 security/tinc/src/etc/rc.d/opnsense-tincd      | 18 +++++++++---------
 .../mvc/app/models/OPNsense/Tinc/Tinc.xml      |  2 +-
 .../mvc/app/views/OPNsense/Tinc/index.volt     |  8 ++++----
 .../service/templates/OPNsense/Tinc/rc.conf.d  |  4 ++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 0c4a40ed6..70be98fc1 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		tinc
 PLUGIN_VERSION=		1.2
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Tinc VPN
 PLUGIN_DEPENDS=		tinc
 PLUGIN_MAINTAINER=	ad@opnsense.org
diff --git a/security/tinc/src/etc/rc.d/opnsense-tincd b/security/tinc/src/etc/rc.d/opnsense-tincd
index 7da078c14..6a611bc1b 100755
--- a/security/tinc/src/etc/rc.d/opnsense-tincd
+++ b/security/tinc/src/etc/rc.d/opnsense-tincd
@@ -2,32 +2,32 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: tincd
+# PROVIDE: opnsense-tincd
 # REQUIRE: SERVERS
 # KEYWORD: shutdown
 #
 
 . /etc/rc.subr
 
-name=opnsense-tincd
+name=ostincd
 
-stop_cmd=tincd_stop
-start_cmd=tincd_start
-rcvar=OPNtincd_enable
+stop_cmd=ostincd_stop
+start_cmd=ostincd_start
+rcvar=ostincd_enable
 
-load_rc_config $name
+load_rc_config opnsense-tincd
 
-[ -z "$OPNtincd_enable" ] && OPNtincd_enable="NO"
+[ -z "$ostincd_enable" ] && ostincd_enable="NO"
 
 # stop tincd
-tincd_stop()
+ostincd_stop()
 {
 	echo "stopping tincd"
 	/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py stop
 }
 
 # start tincd
-tincd_start()
+ostincd_start()
 {
 	echo "starting tincd"
 	/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py start
diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
index b54455a8a..6a3086b78 100644
--- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
+++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
@@ -99,7 +99,7 @@
                             <display>name</display>
                         </hosts>
                     </Model>
-                    <ValidationMessage>Related pipe or queue not found</ValidationMessage>
+                    <ValidationMessage>Related network not found</ValidationMessage>
                     <Required>Y</Required>
                 </network>
                 <hostname type="TextField">
diff --git a/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt b/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt
index 730e6e20f..5e00f7265 100644
--- a/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt
+++ b/security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt
@@ -97,10 +97,10 @@ POSSIBILITY OF SUCH DAMAGE.
             <thead>
             <tr>
                 <th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                <th data-column-id="id" data-type="number"  data-visible="false">{{ lang._('ID') }}</th>
+                <th data-column-id="id" data-type="number" data-visible="false">{{ lang._('ID') }}</th>
                 <th data-column-id="name" data-type="string">{{ lang._('Name') }}</th>
                 <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
-                <th data-column-id="uuid" data-type="string" data-identifier="true"  data-visible="false">{{ lang._('ID') }}</th>
+                <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
             </tr>
             </thead>
             <tbody>
@@ -126,7 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     <th data-column-id="network" data-type="string">{{ lang._('Network') }}</th>
                     <th data-column-id="hostname" data-type="string">{{ lang._('Hostname') }}</th>
                     <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
-                    <th data-column-id="uuid" data-type="string" data-identifier="true"  data-visible="false">{{ lang._('ID') }}</th>
+                    <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -146,7 +146,7 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
     <div class="col-md-12">
         <hr/>
-        <button class="btn btn-primary"  id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b><i id="reconfigureAct_progress" class=""></i></button>
+        <button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b> <i id="reconfigureAct_progress" class=""></i></button>
         <br/><br/>
     </div>
 </div>
diff --git a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
index ade8376cd..d59a0b81f 100644
--- a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
+++ b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
@@ -5,7 +5,7 @@
 {%   endif %}
 {% endfor %}
 {% if networks|length > 0 %}
-OPNtincd_enable=YES
+ostincd_enable=YES
 {% else %}
-OPNtincd_enable=NO
+ostincd_enable=NO
 {% endif %}