Update of /cvsroot/leaf/src/bering-uclibc/apps/openvpn
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7730
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
openvpn-2.0.9.tar.gz openvpn.ifdown openvpn.ifup openvpn.init
Removed Files:
openvpn openvpn-2.0.6.tar.gz
Log Message:
update to openvpn 2.0.9 and improved startup
--- NEW FILE: openvpn.ifup ---
#!/bin/sh
OPENVPN=/etc/init.d/openvpn
if [ ! -x $OPENVPN ]; then
exit 0
fi
if [ -n "$IF_OPENVPN" ]; then
$OPENVPN start $IF_OPENVPN
fi
--- openvpn-2.0.6.tar.gz DELETED ---
--- NEW FILE: openvpn.ifdown ---
#!/bin/sh
OPENVPN=/etc/init.d/openvpn
if [ ! -x $OPENVPN ]; then
exit 0
fi
if [ -n "$IF_OPENVPN" ]; then
$OPENVPN stop $IF_OPENVPN
fi
--- NEW FILE: openvpn-2.0.9.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- openvpn DELETED ---
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** buildtool.mk 16 Sep 2006 21:19:28 -0000 1.14
--- buildtool.mk 3 Dec 2006 10:37:42 -0000 1.15
***************
*** 6,13 ****
! OPENVPN_DIR:=openvpn-2.0.6
! OPENVPN_TARGET_DIR:=$(BT_BUILD_DIR)/openvpn20
! OPENVPNLZO_TARGET_DIR:=$(BT_BUILD_DIR)/openvpnlzo20
! STRIP_OPTIONS=-s --remove-section=.note --remove-section=.comment
--- 6,11 ----
! OPENVPN_DIR:=openvpn-2.0.9
! OPENVPN_TARGET_DIR:=$(BT_BUILD_DIR)/openvpn
***************
*** 39,50 ****
mkdir -p $(OPENVPN_TARGET_DIR)/etc/openvpn
mkdir -p $(OPENVPN_TARGET_DIR)/etc/init.d
mkdir -p $(OPENVPN_TARGET_DIR)/usr/sbin
- mkdir -p $(BT_STAGING_DIR)/etc/openvpn
- mkdir -p $(OPENVPNLZO_TARGET_DIR)/etc/openvpn
- mkdir -p $(OPENVPNLZO_TARGET_DIR)/etc/init.d
- mkdir -p $(OPENVPNLZO_TARGET_DIR)/usr/sbin
- mkdir -p $(OPENVPNLZO_TARGET_DIR)/usr/bin
- mkdir -p $(BT_STAGING_DIR)/etc/init.d
- mkdir -p $(BT_STAGING_DIR)/usr/sbin
# Build a version without lzo support
--- 37,44 ----
mkdir -p $(OPENVPN_TARGET_DIR)/etc/openvpn
mkdir -p $(OPENVPN_TARGET_DIR)/etc/init.d
+ mkdir -p $(OPENVPN_TARGET_DIR)/etc/default
+ mkdir -p $(OPENVPN_TARGET_DIR)/etc/network/if-up.d
+ mkdir -p $(OPENVPN_TARGET_DIR)/etc/network/if-down.d
mkdir -p $(OPENVPN_TARGET_DIR)/usr/sbin
# Build a version without lzo support
***************
*** 72,88 ****
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
! $(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPN_TARGET_DIR) -C $(OPENVPN_DIR) install
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
! cp openvpn $(OPENVPN_TARGET_DIR)/etc/init.d/openvpn20
rm $(OPENVPN_DIR)/openvpn
# make sure lzo is disabled in the sample config
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
-
cp $(OPENVPN_DIR)/easy-rsa/build-ca
$(OPENVPN_TARGET_DIR)/usr/sbin/
cp $(OPENVPN_DIR)/easy-rsa/build-dh
$(OPENVPN_TARGET_DIR)/usr/sbin/
--- 66,84 ----
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
! $(BT_STRIP) $(BT_STRIP_BINOPS) $(OPENVPN_DIR)/openvpn
make DESTDIR=$(OPENVPN_TARGET_DIR) -C $(OPENVPN_DIR) install
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/
! cp openvpn.init $(OPENVPN_TARGET_DIR)/etc/init.d/openvpn
! cp openvpn.default $(OPENVPN_TARGET_DIR)/etc/default/openvpn
! cp openvpn.ifup
$(OPENVPN_TARGET_DIR)/etc/network/if-up.d/openvpn
! cp openvpn.ifdown
$(OPENVPN_TARGET_DIR)/etc/network/if-down.d/openvpn
rm $(OPENVPN_DIR)/openvpn
# make sure lzo is disabled in the sample config
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf
! perl -i -p -e 's,^comp-lzo,;comp-lzo,'
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf
cp $(OPENVPN_DIR)/easy-rsa/build-ca
$(OPENVPN_TARGET_DIR)/usr/sbin/
cp $(OPENVPN_DIR)/easy-rsa/build-dh
$(OPENVPN_TARGET_DIR)/usr/sbin/
***************
*** 100,112 ****
cp $(OPENVPN_DIR)/easy-rsa/vars $(OPENVPN_TARGET_DIR)/usr/sbin/
- mv $(OPENVPN_TARGET_DIR)/usr/sbin/openvpn
$(OPENVPN_TARGET_DIR)/usr/sbin/openvpn20
- # copy everything to the staging dir
- cp $(OPENVPN_TARGET_DIR)/etc/openvpn/server.conf20
$(BT_STAGING_DIR)/etc/openvpn/
- cp $(OPENVPN_TARGET_DIR)/etc/openvpn/client.conf20
$(BT_STAGING_DIR)/etc/openvpn/
- cp $(OPENVPN_TARGET_DIR)/etc/init.d/openvpn20
$(BT_STAGING_DIR)/etc/init.d/
- cp -a $(OPENVPN_TARGET_DIR)/usr/sbin/*
$(BT_STAGING_DIR)/usr/sbin/
-
-
# clean up for the next round
make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
--- 96,100 ----
***************
*** 137,154 ****
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
! $(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
! make DESTDIR=$(OPENVPNLZO_TARGET_DIR) -C $(OPENVPN_DIR) install
! rm $(OPENVPN_DIR)/openvpn
!
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPNLZO_TARGET_DIR)/etc/openvpn/server.conf20
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPNLZO_TARGET_DIR)/etc/openvpn/client.conf20
! cp openvpn $(OPENVPNLZO_TARGET_DIR)/etc/init.d/openvpn20
!
! mv $(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn
$(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn_lzo20
!
! cp $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/server.conf20
$(BT_STAGING_DIR)/etc/openvpn/server.lzo.conf20
! cp $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/client.conf20
$(BT_STAGING_DIR)/etc/openvpn/client.lzo.conf20
! cp -a $(OPENVPNLZO_TARGET_DIR)/usr/sbin/*
$(BT_STAGING_DIR)/usr/sbin/
touch $(OPENVPN_DIR)/.build
--- 125,134 ----
make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
! $(BT_STRIP) $(BT_STRIP_BINOPTS) $(OPENVPN_DIR)/openvpn
! cp $(OPENVPN_DIR)/sample-config-files/server.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/server.lzo.conf
! cp $(OPENVPN_DIR)/sample-config-files/client.conf
$(OPENVPN_TARGET_DIR)/etc/openvpn/client.lzo.conf
! mv $(OPENVPN_DIR)/openvpn
$(OPENVPN_TARGET_DIR)/usr/sbin/openvpn_lzo
! cp -a $(OPENVPN_TARGET_DIR)/* $(BT_STAGING_DIR)
touch $(OPENVPN_DIR)/.build
***************
*** 162,172 ****
make -C $(OPENVPN_DIR) clean
rm -rf $(OPENVPN_TARGET_DIR)
- rm -rf $(OPENVPNLZO_TARGET_DIR)
srcclean:
rm -rf $(OPENVPN_DIR)
! rm -rf $(BT_STAGING_DIR)/etc/openvpn20
! rm -f $(BT_STAGING_DIR)/etc/init.d/openvpn20
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn20
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo20
!
--- 142,153 ----
make -C $(OPENVPN_DIR) clean
rm -rf $(OPENVPN_TARGET_DIR)
srcclean:
rm -rf $(OPENVPN_DIR)
! rm -rf $(BT_STAGING_DIR)/etc/openvpn
! rm -f $(BT_STAGING_DIR)/etc/init.d/openvpn
! rm -f $(BT_STAGING_DIR)/etc/default/openvpn
! rm -f $(BT_STAGING_DIR)/etc/network/if-up.d/openvpn
! rm -f $(BT_STAGING_DIR)/etc/network/if-down.d/openvpn
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn
! rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.cfg,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** buildtool.cfg 31 Oct 2006 22:18:33 -0000 1.16
--- buildtool.cfg 3 Dec 2006 10:37:42 -0000 1.17
***************
*** 5,9 ****
</File>
! <File openvpn-2.0.6.tar.gz>
Server = cvs-sourceforge
envname = OPENVPN_SOURCE
--- 5,9 ----
</File>
! <File openvpn-2.0.9.tar.gz>
Server = cvs-sourceforge
envname = OPENVPN_SOURCE
***************
*** 12,16 ****
</File>
! <File openvpn>
Server = cvs-sourceforge
directory = openvpn
--- 12,34 ----
</File>
! <File openvpn.init>
! Server = cvs-sourceforge
! directory = openvpn
! revision = HEAD
! </File>
!
! <File openvpn.default>
! Server = cvs-sourceforge
! directory = openvpn
! revision = HEAD
! </File>
!
! <File openvpn.ifup>
! Server = cvs-sourceforge
! directory = openvpn
! revision = HEAD
! </File>
!
! <File openvpn.ifdown>
Server = cvs-sourceforge
directory = openvpn
***************
*** 20,25 ****
<Package>
<openvpn>
! Version = 2.0.6
! Revision = 2
Help <<EOF
--- 38,43 ----
<Package>
<openvpn>
! Version = 2.0.9
! Revision = 1
Help <<EOF
***************
*** 52,62 ****
<File>
Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.conf20
Type = binary
</File>
<File>
Filename = etc/openvpn/client.conf
! Source = etc/openvpn/client.conf20
Type = binary
</File>
<File>
--- 70,88 ----
<File>
Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.conf
Type = binary
</File>
<File>
Filename = etc/openvpn/client.conf
! Source = etc/openvpn/client.conf
! Type = binary
! </File>
! <File>
! Filename = etc/default/openvpn
! Source = etc/default/openvpn
Type = binary
+ Type = conf
+ Type = local
+ Description = openvpn daemon configuration
</File>
<File>
***************
*** 66,70 ****
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn20
Type = binary
Permissions = 755
--- 92,96 ----
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn
Type = binary
Permissions = 755
***************
*** 72,87 ****
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn20
Type = binary
Permissions = 755
</File>
!
!
</Contents>
</openvpn>
<openvpnz>
! Version = 2.0.6
! Revision = 2
Help <<EOF
--- 98,127 ----
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn
Type = binary
Permissions = 755
</File>
! <File>
! Filename = etc/network/if-up.d/openvpn
! Source = etc/network/if-up.d/openvpn
! Type = binary
! Permissions = 755
! </File>
! <File>
! Filename = etc/network/if-down.d/openvpn
! Source = etc/network/if-down.d/openvpn
! Type = binary
! Permissions = 755
! </File>
! <File>
! Filename = usr/lib/openvpn
! Type = directory
! </File>
</Contents>
</openvpn>
<openvpnz>
! Version = 2.0.9
! Revision = 1
Help <<EOF
***************
*** 116,128 ****
<File>
Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.lzo.conf20
Type = binary
</File>
<File>
Filename = etc/openvpn/client.conf
! Source = etc/openvpn/client.lzo.conf20
Type = binary
</File>
<File>
Filename = etc/openvpn/*.conf
Type = conf
--- 156,176 ----
<File>
Filename = etc/openvpn/server.conf
! Source = etc/openvpn/server.lzo.conf
Type = binary
</File>
<File>
Filename = etc/openvpn/client.conf
! Source = etc/openvpn/client.lzo.conf
Type = binary
</File>
<File>
+ Filename = etc/default/openvpn
+ Source = etc/default/openvpn
+ Type = binary
+ Type = conf
+ Type = local
+ Description = openvpn daemon configuration
+ </File>
+ <File>
Filename = etc/openvpn/*.conf
Type = conf
***************
*** 130,134 ****
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn_lzo20
Type = binary
Permissions = 755
--- 178,182 ----
<File>
Filename = usr/sbin/openvpn
! Source = usr/sbin/openvpn_lzo
Type = binary
Permissions = 755
***************
*** 136,148 ****
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn20
Type = binary
Permissions = 755
</File>
</Contents>
</openvpnz>
<easyrsa>
! Version = 2.0.6
Revision = 1
--- 184,212 ----
<File>
Filename = etc/init.d/openvpn
! Source = etc/init.d/openvpn
! Type = binary
! Permissions = 755
! </File>
! <File>
! Filename = etc/network/if-up.d/openvpn
! Source = etc/network/if-up.d/openvpn
Type = binary
Permissions = 755
</File>
+ <File>
+ Filename = etc/network/if-down.d/openvpn
+ Source = etc/network/if-down.d/openvpn
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = usr/lib/openvpn
+ Type = directory
+ </File>
</Contents>
</openvpnz>
<easyrsa>
! Version = 2.0.9
Revision = 1
--- NEW FILE: openvpn.init ---
#!/bin/sh -e
#
# Original version by Robert Leslie
# <[EMAIL PROTECTED]>, edited by iwj and cs
# Modified for openvpn by Alberto Gonzalez Iniesta <[EMAIL PROTECTED]>
# Modified for restarting / starting / stopping single tunnels by Richard
Mueller <[EMAIL PROTECTED]>
RCDLINKS="0,K80 1,K80 2,S16 3,S16 4,S16 5,S16 6,K80"
DAEMON=/usr/sbin/openvpn
DESC="virtual private network daemon"
CONFIG_DIR=/etc/openvpn
test -x $DAEMON || exit 0
test -d $CONFIG_DIR || exit 0
# Source defaults file; edit that file to configure this script.
AUTOSTART="all"
STATUSREFRESH=10
if test -e /etc/default/openvpn ; then
. /etc/default/openvpn
fi
start_vpn () {
if grep -q '^[ ]*daemon' $CONFIG_DIR/$NAME.conf ; then
# daemon already given in config file
DAEMONARG=
else
# need to daemonize
DAEMONARG="--daemon ovpn-$NAME"
fi
if grep -q '^[ ]*status ' $CONFIG_DIR/$NAME.conf ; then
# status file already given in config file
STATUSARG=""
elif test $STATUSREFRESH -eq 0 ; then
# default status file disabled in /etc/default/openvpn
STATUSARG=""
else
# prepare default status file
STATUSARG="--status /var/run/openvpn.$NAME.status $STATUSREFRESH"
fi
echo -n " $NAME"
STATUS="OK"
$DAEMON --writepid /var/run/openvpn.$NAME.pid \
$DAEMONARG $STATUSARG --cd $CONFIG_DIR \
--config $CONFIG_DIR/$NAME.conf < /dev/null || STATUS="FAILED"
echo -n "($STATUS)"
}
stop_vpn () {
kill `cat $PIDFILE` || true
rm $PIDFILE
rm -f /var/run/openvpn.$NAME.status 2> /dev/null
}
case "$1" in
start)
echo -n "Starting $DESC:"
# autostart VPNs
if test -z "$2" ; then
# check if automatic startup is disabled by AUTOSTART=none
if test "x$AUTOSTART" = "xnone" -o -z "$AUTOSTART" ; then
echo " Autostart disabled."
exit 0
fi
if test -z "$AUTOSTART" -o "x$AUTOSTART" = "xall" ; then
# all VPNs shall be started automatically
for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
NAME=${CONFIG%%.conf}
start_vpn
done
else
# start only specified VPNs
for NAME in $AUTOSTART ; do
if test -e $CONFIG_DIR/$NAME.conf ; then
start_vpn
else
echo -n " (failure: No such VPN: $NAME)"
fi
done
fi
#start VPNs from command line
else
while shift ; do
[ -z "$1" ] && break
if test -e $CONFIG_DIR/$1.conf ; then
NAME=$1
start_vpn
else
echo -n " (failure: No such VPN: $1)"
fi
done
fi
echo "."
;;
stop)
echo -n "Stopping $DESC:"
if test -z "$2" ; then
for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
stop_vpn
echo -n " $NAME"
done
else
while shift ; do
[ -z "$1" ] && break
if test -e /var/run/openvpn.$1.pid ; then
PIDFILE=`ls /var/run/openvpn.$1.pid 2> /dev/null`
NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
stop_vpn
echo -n " $NAME"
else
echo -n " (failure: No such VPN is running: $1)"
fi
done
fi
echo "."
;;
# We only 'reload' for running VPNs. New ones will only start with 'start' or
'restart'.
reload|force-reload)
echo -n "Reloading $DESC:"
for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
# If openvpn if running under a different user than root we'll need to restart
if egrep '^( |\t)*user' $CONFIG_DIR/$NAME.conf > /dev/null 2>&1 ; then
stop_vpn
sleep 1
start_vpn
echo -n "(restarted)"
else
kill -HUP `cat $PIDFILE` || true
echo -n " $NAME"
fi
done
echo "."
;;
restart)
shift
$0 stop [EMAIL PROTECTED]
sleep 1
$0 start [EMAIL PROTECTED]
;;
cond-restart)
echo -n "Restarting $DESC:"
for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
NAME=`echo $PIDFILE | cut -c18-`
NAME=${NAME%%.pid}
stop_vpn
sleep 1
start_vpn
done
echo "."
;;
*)
echo "Usage: $0 {start|stop|reload|restart|force-reload|cond-restart}" >&2
exit 1
;;
esac
exit 0
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
