summaryrefslogtreecommitdiffstats
path: root/package/vtun
diff options
context:
space:
mode:
Diffstat (limited to 'package/vtun')
-rw-r--r--package/vtun/vtun.mk3
-rw-r--r--package/vtun/vtun.patch186
2 files changed, 187 insertions, 2 deletions
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 595a6f82b..864214783 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -12,7 +12,6 @@ VTUN_DIR:=$(BUILD_DIR)/vtun-2.6
VTUN_CAT:=zcat
VTUN_BINARY:=vtund
VTUN_TARGET_BINARY:=usr/sbin/vtund
-VTUN_PATCH:=$(SOURCE_DIR)/vtun.patch
$(DL_DIR)/$(VTUN_SOURCE):
$(WGET) -P $(DL_DIR) $(VTUN_SITE)/$(VTUN_SOURCE)
@@ -22,7 +21,7 @@ vtun-source: $(DL_DIR)/$(VTUN_SOURCE)
$(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE)
$(VTUN_CAT) $(DL_DIR)/$(VTUN_SOURCE) | tar -C $(BUILD_DIR) -xvf -
mv $(BUILD_DIR)/vtun $(VTUN_DIR)
- cat $(VTUN_PATCH) | patch -p1 -d $(VTUN_DIR)
+ toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun*.patch
touch $(VTUN_DIR)/.unpacked
$(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked zlib lzo openssl
diff --git a/package/vtun/vtun.patch b/package/vtun/vtun.patch
new file mode 100644
index 000000000..00a12454e
--- /dev/null
+++ b/package/vtun/vtun.patch
@@ -0,0 +1,186 @@
+diff -urN vtun/Makefile.in vtun-2.6/Makefile.in
+--- vtun/Makefile.in 2002-12-20 09:55:47.000000000 -0700
++++ vtun-2.6/Makefile.in 2003-06-05 12:38:31.000000000 -0600
+@@ -28,7 +28,7 @@
+ LEXFLAGS = -t
+
+ INSTALL = @INSTALL@
+-INSTALL_OWNER = -o root -g 0
++INSTALL_OWNER =
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -86,15 +86,15 @@
+
+ install_config:
+ $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
+- if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
+- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
+- fi
++ $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR);
++ $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR);
+
+ install: vtund install_config install_man
+- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
+ $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
+ $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)
+ $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)
+ $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)
++ $(INSTALL) -m 755 $(INSTALL_OWNER) scripts/vtund.rc.debian \
++ $(DESTDIR)$(ETC_DIR)/init.d/S90vtun
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -urN vtun/scripts/vtund.rc.debian vtun-2.6/scripts/vtund.rc.debian
+--- vtun/scripts/vtund.rc.debian 2000-03-26 10:06:37.000000000 -0700
++++ vtun-2.6/scripts/vtund.rc.debian 2003-06-05 12:38:46.000000000 -0600
+@@ -1,92 +1,48 @@
+-#! /usr/bin/perl -w
++#! /bin/sh
++#
+
+-### vtund-start
+-###
+-### script to start vtund as either a server or a client, according to
+-### the config file /etc/vtund-start.conf
+-###
+-### Copyright 1999 Craig Sanders <cas@taz.net.au>
+-###
+-### Written for the Debian GNU/Linux distribution. This script is free
+-### software licensed under the terms of the GNU General Public License.
+-
+-$DAEMON="/usr/sbin/vtund" ;
+-
+-$do_what = shift ;
+-$args="start|stop|reload|force-reload|restart" ;
+-if ( $do_what !~ /^($args)$/i ) {
+- print "Usage: /etc/init.d/vtun {$args}\n" ;
+- exit 0 ;
+-}
+-
+-$SSD="/sbin/start-stop-daemon" ;
+-$SSDARGS="--verbose --exec $DAEMON" ;
+-
+-$sconf="/etc/vtund-start.conf" ;
+-open(SCONF,"<$sconf") || die "couldn't open $sconf: $!\n" ;
+-while (<SCONF>) {
+- chomp ;
+- s/#.*//;
+- s/^ +| +$//;
+- next if (/^$/) ;
+-
+- @line = split ;
+- $host = shift(@line) ;
+- $server = shift(@line) ;
+- $args = "" ;
+- foreach (@line) { $args .= " $_" } ;
+-
+- $host='' if ($host =~ /--server--/i ) ;
+-
+- if ( $do_what eq 'start' ) {
+- &start($host,$server,$args) ;
+- } elsif ( $do_what eq 'stop' ) {
+- &stop($host,$server,$args) ;
+- } elsif ( $do_what eq 'restart' ) {
+- &stop($pidfile) ;
+- &start($host,$server,$args) ;
+- } elsif ( $do_what =~ /^(reload|force-reload)$/ ) {
+- &reload($host,$server) ;
+- }
+-}
+-close (SCONF);
+-
+-
+-sub start {
+- my($host,$server,$args) = @_ ;
+- print " Starting vtun " ;
+- if ($host eq '') {
+- print "server\n" ;
+- system "$SSD --start $SSDARGS -- $args -s -P $server" ;
+- } else {
+- print "client $host to $server\n" ;
+- $pidfile="/var/run/vtun.$host.$server" ;
+- system "$SSD --start $SSDARGS --pidfile $pidfile -- $args $host $server" ;
+- }
+-} ;
+-
+-sub stop {
+- my($host,$server,$args) = @_ ;
+- print " Stopping vtun " ;
+- if ($host eq '') {
+- print "server\n" ;
+- system "$SSD --stop $SSDARGS" ;
+- } else {
+- print "client $host to $server\n" ;
+- $pidfile="/var/run/vtun.$host.$server" ;
+- system "$SSD --stop $SSDARGS --pidfile $pidfile" ;
+- }
+-} ;
+-
+-sub reload {
+- my($host,$server) = @_ ;
+- print " Reloading vtun " ;
+- if ($host eq '') {
+- print "server\n" ;
+- system "$SSD --stop $SSDARGS --signal 1" ;
+- } else {
+- print "client $host to $server\n" ;
+- $pidfile="/var/run/vtun.$host.$server" ;
+- system "$SSD --stop $SSDARGS --signal 1 --pidfile $pidfile" ;
+- }
+-}
++PATH=/bin:/usr/bin:/sbin:/usr/sbin
++DAEMON=/usr/sbin/vtund
++CONFFILE=/etc/vtund-start.conf
++PIDPREFIX=/var/run/vtund
++
++test -f $DAEMON || exit 0
++
++case "$1" in
++ start)
++ # find all the defined tunnels
++ egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true;
++ do
++ read i
++ # no more lines available? done, then.
++ if [ $? != 0 ] ; then break; fi
++ SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`;
++ if [ -n "$SARGS" ];
++ then
++ echo "Starting vtund server."
++ start-stop-daemon -S -x $DAEMON -- $SARGS;
++ else
++ # split args into host and rest
++ HOST=`echo $i|cut -f 1 -d " "`;
++ TARGET=`echo $i|cut -f 2 -d " "`;
++ echo "Starting vtund client $HOST to $TARGET.";
++ start-stop-daemon -S -x $DAEMON -- $i;
++ fi
++ done
++ ;;
++ stop)
++ echo "Stopping vtund.";
++ start-stop-daemon -K -x vtund;
++ ;;
++
++ restart|reload|force-reload)
++ $0 stop
++ sleep 1;
++ $0 start
++ ;;
++ *)
++ echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
++ exit 1
++ ;;
++esac
++exit 0
+--- vtun-2.6/configure.dist 2004-03-11 10:39:10.000000000 -0600
++++ vtun-2.6/configure 2004-03-11 10:45:52.000000000 -0600
+@@ -2112,7 +2112,7 @@
+ echo $ac_n "checking "for blowfish.h"""... $ac_c" 1>&6
+ echo "configure:2114: checking "for blowfish.h"" >&5
+ ac_hdr_found=no
+- for p in $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto; do
++ for p in $BLOWFISH_HDR_DIR $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto; do
+ if test -n "$p"; then
+ dir="$p"
+ else