From: Saverio Proto <zioproto@gmail.com>
Date: Mon, 21 May 2012 16:45:40 +0000 (+0000)
Subject: [packages] tinc: The tinc init script needs to know all valid options used in /etc... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7d0e35a474406bf1a00cca7f84c33b1401261c58

[packages] tinc: The tinc init script needs to know all valid options used in /etc/conf/tinc.
Author: Moritz Warning <moritzwarning@web.de>
This patch updates that list to tinc 0.18 (current version).



SVN-Revision: 31837
---

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 1b849e7b49..0ad649357d 100644
--- 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 e93f0d97a3..55a86a1d70 100644
--- 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
 }