[packages] tinc: The tinc init script needs to know all valid options used in /etc...

Author: Moritz Warning <moritzwarning@web.de>
This patch updates that list to tinc 0.18 (current version).

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31837 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 1b849e7..0ad6493 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.0.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages 

diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index e93f0d9..55a86a1 100644 (file)
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -98,11 +98,12 @@ prepare_host() {
 
        # append flags
        append_conf_bools "$s" "$TMP_TINC/$n/hosts/$s" \
-               ClampMSS IndirectData PMTUDiscovery
+               ClampMSS IndirectData PMTUDiscovery TCPOnly
 
        # append params
        append_conf_params "$s" "$TMP_TINC/$n/hosts/$s" \
-               Address Cipher Compression Digest MACLength PMTU Port Subnet
+               Address Cipher Compression Digest MACLength PMTU \
+               Port PublicKey PublicKeyFile Subnet
 }
 
 check_gen_own_key() {
@@ -139,17 +140,20 @@ prepare_net() {
 
        # append flags
        append_conf_bools "$s" "$TMP_TINC/$s/tinc.conf" \
-               DirectOnly Hostnames IffOneQueue PriorityInheritance \
-               StrictSubnets TunnelServer \
-               ClampMSS IndirectData PMTUDiscovery
+               DecrementTTL DirectOnly Hostnames IffOneQueue \
+               LocalDiscovery PriorityInheritance StrictSubnets TunnelServer \
+               ClampMSS IndirectData PMTUDiscovery TCPOnly
 
        # append params
        append_conf_params "$s" "$TMP_TINC/$s/tinc.conf" \
                AddressFamily BindToAddress ConnectTo BindToInterface \
-               Forwarding GraphDumpFile Interface KeyExpire MACExpire \
-               MaxTimeout Mode Name PingInterval PingTimeout PrivateKeyFile \
-               ProcessPriority ReplayWindow UDPRcvBuf UDPSndBuf \
-               Address Cipher Compression Digest MACLength PMTU Port Subnet
+               Broadcast Device DeviceType Forwarding \
+               GraphDumpFile Interface KeyExpire MACExpire \
+               MaxTimeout Mode Name PingInterval PingTimeout \
+               PrivateKey PrivateKeyFile ProcessPriority ReplayWindow \
+               UDPRcvBuf UDPSndBuf \
+               Address Cipher Compression Digest MACLength PMTU \
+               Port PublicKey PublicKeyFile Subnet
 
        check_gen_own_key "$s" && return 0
 }