import clean BK tree at cset 1.3670

5 files changed, 110 insertions, 0 deletions

diff --git a/packages/tinc/.mtn2git_empty b/packages/tinc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tinc/.mtn2git_empty
diff --git a/packages/tinc/files/.mtn2git_empty b/packages/tinc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tinc/files/.mtn2git_empty
diff --git a/packages/tinc/files/init b/packages/tinc/files/init
index e69de29bb2..eb8b35bd12 100644
--- a/packages/tinc/files/init
+++ b/packages/tinc/files/init
@@ -0,0 +1,77 @@
+#! /bin/sh
+#
+# System startup script for tinc
+# $Id: tinc,v 1.1 2004/02/19 12:40:16 br1 Exp $
+#
+# Based on Lubomir Bulej's Redhat init script.
+#
+# Create a file $NETSFILE (/etc/tinc/nets.boot), and put all the names of
+# the networks in there.  These names must be valid directory names under
+# $TCONF (/etc/tinc).  Lines starting with a # will be ignored in this
+# file.
+#
+
+DAEMON="/usr/sbin/tincd"
+NAME="tinc"
+DESC="tinc daemons"
+TCONF="/etc/tinc"
+EXTRA=""
+NETSFILE="$TCONF/nets.boot"
+NETS=""
+
+test -f $DAEMON || exit 0
+
+find_nets () {
+  if [ ! -f $NETSFILE ] ; then
+    echo "Please create $NETSFILE."
+    exit 0
+  fi
+  NETS="`egrep '^[ ]*[a-zA-Z0-9_]+[ ]*$' $NETSFILE`"
+}
+
+case "$1" in
+  start)
+    find_nets
+    echo -n "Starting $DESC:"
+    for n in $NETS ; do
+      echo -n " $n"
+      $DAEMON -n $n $EXTRA
+    done
+    echo "."
+  ;;
+  stop)
+    find_nets
+    echo -n "Stopping $DESC:"
+    for n in $NETS ; do
+      echo -n " $n"
+      $DAEMON -n $n $EXTRA -k
+    done
+    echo "."
+  ;;
+  reload)
+    find_nets
+    echo -n "Reloading $DESC configuration:"
+    for n in $NETS ; do
+      echo -n " $n"
+      $DAEMON -n $n $EXTRA -k1
+    done
+    echo "."
+  ;;
+  restart|force-reload)
+    find_nets
+    echo -n "Restarting $DESC:"
+    for n in $NETS ; do
+      echo -n " $n"
+      $DAEMON -n $n $EXTRA -k
+      sleep 1
+      $DAEMON -n $n $EXTRA
+    done
+    echo "."
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}"
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/tinc/files/mtu-vlan.diff b/packages/tinc/files/mtu-vlan.diff
index e69de29bb2..f244537662 100644
--- a/packages/tinc/files/mtu-vlan.diff
+++ b/packages/tinc/files/mtu-vlan.diff
@@ -0,0 +1,12 @@
+diff -u -r1.1 -r1.2
+--- tinc/src/net.h	2004/02/19 11:55:20	1.1
++++ tinc/src/net.h	2004/03/25 11:14:45	1.2
+@@ -30,7 +30,7 @@
+ #ifdef ENABLE_JUMBOGRAMS
+ #define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
+ #else
+-#define MTU 1514				/* 1500 bytes payload + 14 bytes ethernet header */
++#define MTU 1518				/* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN header */
+ #endif
+ 
+ #define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)	/* MTU + seqno + padding + HMAC + compressor overhead */
\ No newline at end of file
diff --git a/packages/tinc/files/public-key-fix.diff b/packages/tinc/files/public-key-fix.diff
index e69de29bb2..550cd67283 100644
--- a/packages/tinc/files/public-key-fix.diff
+++ b/packages/tinc/files/public-key-fix.diff
@@ -0,0 +1,21 @@
+don't load public key for "myself" because this creates problems with
+keys saved in the subjectPublicKeyInfo format (as keys extracted from a
+certificate) and is not necessary anyways because the private key already
+contains the public key.
+
+diff -u -r1.1 -r1.2
+--- tinc/src/net_setup.c	2004/02/19 11:55:20	1.1
++++ tinc/src/net_setup.c	2004/02/19 13:00:43	1.2
+@@ -250,8 +250,10 @@
+ 		return false;
+ 	}
+ 
+-	if(!read_rsa_public_key(myself->connection))
+-		return false;
++	//br1: not needed because private key already contains the public key
++	//br1: removed because it creates problems with subjectPublicKeyInfo format keys
++	//if(!read_rsa_public_key(myself->connection))
++	//	return false;
+ 
+ 	if(!get_config_string
+ 	   (lookup_config(myself->connection->config_tree, "Port"), &myport))
\ No newline at end of file