Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

3 files changed, 0 insertions, 110 deletions

diff --git a/tinc/files/init b/tinc/files/init
deleted file mode 100644
index 3a54e2a34b..0000000000
--- a/tinc/files/init
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-#
-# System startup script for tinc
-# $Id$
-#
-# 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/tinc/files/mtu-vlan.diff b/tinc/files/mtu-vlan.diff
deleted file mode 100644
index f244537662..0000000000
--- a/tinc/files/mtu-vlan.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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/tinc/files/public-key-fix.diff b/tinc/files/public-key-fix.diff
deleted file mode 100644
index 550cd67283..0000000000
--- a/tinc/files/public-key-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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