net-misc/anytun: Version bump for anytun

svn path=/sunrise/; revision=12652

4 files changed, 23 insertions, 17 deletions

diff --git a/net-misc/anytun/ChangeLog b/net-misc/anytun/ChangeLog
index 09143cf16..9f2e39813 100644
--- a/net-misc/anytun/ChangeLog
+++ b/net-misc/anytun/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-misc/anytun
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v3
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v3
 # $Header: $
 
+*anytun-0.3.4 (14 Jan 2012)
+
+  14 Jan 2012; Bernhard Tittelbach (xro) <xro@gmx.net> -anytun-0.3.3.ebuild,
+  files/anytun-0.3.3.init, +anytun-0.3.4.ebuild:
+  Version bump for anytun
+
   18 Feb 2010; Bernhard Tittelbach (xro) <xro@gmx.net>
   -files/anytun-0.3.1.init, -anytun-0.3.2.ebuild, +anytun-0.3.3.ebuild,
   +files/anytun-0.3.3.init:
diff --git a/net-misc/anytun/Manifest b/net-misc/anytun/Manifest
index d43ea70f7..88ba38272 100644
--- a/net-misc/anytun/Manifest
+++ b/net-misc/anytun/Manifest
@@ -1,5 +1,5 @@
-AUX anytun-0.3.3.init 4172 RMD160 072e28f6c62116f5334cf029d1434a5e7147bfed SHA1 a8893cedccc7dd0023b84979d49059f3af6ef21b SHA256 461bf52e88280eefb63815339ea0808793b7e7b291ba0ea970942a02c09e9515
-DIST anytun-0.3.3.tar.gz 112014 RMD160 21fab4cd82cdbb6ab2333eba95bbebf32eb5e7fe SHA1 8f094648f853e057b3e0a7a0fec1f690b939f9b6 SHA256 b2d5e46c45e798f5754713b13593390c743672f622de4d92e2e89b43d347afb3
-EBUILD anytun-0.3.3.ebuild 2709 RMD160 7c730cea65ef541b8de7fe933266d7f652889e1e SHA1 d89cc33552867f04fe60a46f66711df3901ccf25 SHA256 6a674d84c7cdde8972ce6eeda04739584fd1d7cd53528053708f9c0e017e0451
-MISC ChangeLog 1443 RMD160 3edb25460e34022ff5116addcf752c89f3559aea SHA1 35003ac9aafc379bcee0b5470dc2e48222169d73 SHA256 0bd00acc5120172da717ae863aeeadad8a8f0adecde6b18d8c729862d12e2cc4
+AUX anytun-0.3.3.init 4067 RMD160 e291d98c1f64f86a10d3047f89d61bfe06cb774d SHA1 1801b3d4c6ec1feb48b0c2bbf71505996c7404e1 SHA256 df083821b9b8c65dae555a3216b4124d642e5d7bd4f332beab92d99cbd0c9de2
+DIST anytun-0.3.4.tar.gz 111715 RMD160 c4dbb711a820e174a461ceecadfdb24b4bac5a2e SHA1 935c7d0940afa9e0ec12cceccad6e29299d95f52 SHA256 9cb00bd295f7bd820708157a2c36d9b369932ea4461fc8125c28d8aa2b3dcdca
+EBUILD anytun-0.3.4.ebuild 2709 RMD160 9ce6851764118b45cf208cdab9bec2cb2a68b894 SHA1 0ee0f1e70afcb152d5835115c1b8bcc09e78c016 SHA256 700f284c0c41d8c1ed99543353e6e11b618467916af06fb1f7ec7605d75ad76b
+MISC ChangeLog 1625 RMD160 b88dc5f2f7eab7167f48e061ab230290c5f6c7b5 SHA1 1ed9feefbc2911b1225ebbef5ecd6376ea8a8f9a SHA256 80b7828b99fbd23e39739129073d124074c0ec54df10bec8bd756845bf4f6bc0
 MISC metadata.xml 714 RMD160 cf5ec38e04acaf7cb0a821e304f8e453ab0f6732 SHA1 1f8d44d66847f3db6b9648b9ff88ac8ac38d41bd SHA256 1a2a35b1c12b82c81b87e7cc938aad7368e67bde2556184ea563bc9b321339da
diff --git a/net-misc/anytun/anytun-0.3.3.ebuild b/net-misc/anytun/anytun-0.3.4.ebuild
index e1fb9b710..af65620c7 100644
--- a/net-misc/anytun/anytun-0.3.3.ebuild
+++ b/net-misc/anytun/anytun-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/net-misc/anytun/files/anytun-0.3.3.init b/net-misc/anytun/files/anytun-0.3.3.init
index 7a61b11fb..e629043b7 100644
--- a/net-misc/anytun/files/anytun-0.3.3.init
+++ b/net-misc/anytun/files/anytun-0.3.3.init
@@ -40,7 +40,7 @@ start_vpn () {
 		test -d $VARRUN_DIR || mkdir -p $VARRUN_DIR
 		DAEMONARG=`sed 's/#.*//' < $CONFIG_DIR/$NAME/config | grep -e '\w' | sed  's/^/--/' | tr '\n' ' '`
 		start-stop-daemon --start --pidfile $VARRUN_DIR/${NAME}.pid --exec $DAEMON -- --write-pid $VARRUN_DIR/${NAME}.pid $POSTUP \
-			$DAEMONOPTS $DAEMONARG || return 1 
+			$DAEMONOPTS $DAEMONARG || return 1
 	else
 		eerror "no config found"
 		return 1
@@ -49,7 +49,7 @@ start_vpn () {
 	return 0
 }
 stop_vpn () {
-	start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo
+	start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON
 	rm -f $PIDFILE
 	stop_configd
 }
@@ -60,8 +60,8 @@ start_configd () {
 		chmod 700 $VARCONFIG_DIR
 		rm -f $VARCONFIG_DIR/$NAME 2>/dev/null
 		KDPRF=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'kd-prf' | sed  's/^/ --/' | xargs echo`
-		for CLIENTNAME in `ls $CONFIG_DIR/$NAME/conf.d`; do
-			DAEMONARG=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/conf.d/$CLIENTNAME | grep -e '\w' | sed  's/^/ --/' | xargs echo`
+		for CLIENTPATH in $CONFIG_DIR/$NAME/conf.d/* ; do
+			DAEMONARG=`sed 's/#.*//'  <  $CLIENTPATH | grep -e '\w' | sed  's/^/ --/' | xargs echo`
 			$ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONFIG_DIR/$NAME
 		done
 		CONTROLHOST=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed  's/^/ --/'i | xargs echo`
@@ -71,7 +71,7 @@ start_configd () {
 }
 stop_configd () {
 	if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
-		start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON --oknodo 
+		start-stop-daemon --stop --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON
 		rm -f $VARCONFIG_DIR/${NAME}.pid
 	fi 
 }
@@ -98,15 +98,15 @@ start () {
 
 stop () {
 	if test -z "$VPN" ; then
-		for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
+		for PIDFILE in ${VARRUN_DIR}/*.pid ; do
 			NAME=`basename $PIDFILE .pid`
 			ebegin "Stopping ${DESC} VPN: ${NAME}"
 			stop_vpn
 			eend $?
 		done
 	else
-		if test -e $VARRUN_DIR/${VPN}.pid ; then
-			PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null`
+		if test -e ${VARRUN_DIR}/${VPN}.pid ; then
+			PIDFILE=${VARRUN_DIR}/${VPN}.pid
 			NAME=`basename $PIDFILE .pid`
 			ebegin "Stopping ${DESC} VPN: ${NAME}"
 			stop_vpn
@@ -119,7 +119,7 @@ stop () {
 
 reload () {
 	if test -z "$VPN" ; then
-		for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
+		for PIDFILE in ${VARRUN_DIR}/*.pid ; do
 			NAME=`basename $PIDFILE .pid`
 			if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
 				ebegin "Reloading ${DESC} VPN: ${NAME}"
@@ -134,8 +134,8 @@ reload () {
 			fi
 		done
 	else
-		if test -e $VARRUN_DIR/${VPN}.pid ; then
-			PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null`
+		if test -e ${VARRUN_DIR}/${VPN}.pid ; then
+			PIDFILE=${VARRUN_DIR}/${VPN}.pid
 			NAME=`basename $PIDFILE .pid`
 			if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
 				ebegin "Reloading ${DESC} VPN: ${NAME}"