net-misc/anytun: New Version 0.3.3. Some init.d script changes.

svn path=/sunrise/; revision=10161

4 files changed, 26 insertions, 21 deletions

diff --git a/net-misc/anytun/ChangeLog b/net-misc/anytun/ChangeLog
index f59bcda57..09143cf16 100644
--- a/net-misc/anytun/ChangeLog
+++ b/net-misc/anytun/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-misc/anytun
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v3
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v3
 # $Header: $
 
+  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:
+  New Version 0.3.3. Some init.d script changes.
+
   05 Dec 2009; Bernhard Tittelbach (xro) <xro@gmx.net> -anytun-0.3.1.ebuild,
   +anytun-0.3.2.ebuild:
   New Version 0.3.2. ebuild changes to reflect improvements in anytun build
diff --git a/net-misc/anytun/Manifest b/net-misc/anytun/Manifest
index ee6206fb3..0cd34aa3b 100644
--- a/net-misc/anytun/Manifest
+++ b/net-misc/anytun/Manifest
@@ -1,5 +1,5 @@
-AUX anytun-0.3.1.init 4132 RMD160 e913cee56b91b12cdd37cfc026b589ec7f3f23bc SHA1 c8bf76fd5486351d72934165c16e22b8903a4e36 SHA256 5aa33087d9d2b5496bb42cd6841087a275d4bfa2b4817931fd01f72e51e908be
-DIST anytun-0.3.2.tar.gz 135773 RMD160 47f4c43f3ddb5fcb13bc8205054326bf138df1bf SHA1 b7700f3f9a3718adcf1f952f37857ad9426ab6a0 SHA256 f13eea22d0ff509f24ff89e4298d3ac4be4c71f2fb9aa610dfb4d968c11bc2c2
-EBUILD anytun-0.3.2.ebuild 2546 RMD160 fc65b649b7b1f60472f8e35a178ac0cc40448385 SHA1 cabb2cca7de79c7b030b5b8981ad01a4aa5a3c7c SHA256 25e67f67056df98571a84af8532451d808b4f9f3824f83d8caa0c89c11e15fa9
-MISC ChangeLog 1238 RMD160 551427de4d4ea349d724c8bada59c97cd9b51ba6 SHA1 0c7e212a395130aa6a0495c82368e9a0fc9ff2a5 SHA256 29be42a38fd349b0ac98ea4f4615a70b58e0a70542093c31be1f62ce2484b93f
+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
 MISC metadata.xml 676 RMD160 076aacf8fa6c9063e3e6cff368e8f5c45980ede3 SHA1 0a0af1b5f03b28a698c8cd3f22e62cdfa7418481 SHA256 2f185c8e9c5cbcf72c2e344d17923dfb4745a87d28860e45824d67412afc4e1b
diff --git a/net-misc/anytun/anytun-0.3.2.ebuild b/net-misc/anytun/anytun-0.3.3.ebuild
index d38d2d9db..e1fb9b710 100644
--- a/net-misc/anytun/anytun-0.3.2.ebuild
+++ b/net-misc/anytun/anytun-0.3.3.ebuild
@@ -44,13 +44,14 @@ src_install() {
 	keepdir /var/run/anytun || die "failed to mkdir"
 	keepdir /var/run/anytun-controld || die "failed to mkdir"
 
-	newinitd "${FILESDIR}/${PN}-0.3.1.init" ${PN} || die "failed to copy/install initrd script"
+	newinitd "${FILESDIR}/${PN}-0.3.3.init" ${PN} || die "failed to copy/install initrd script"
 
 	cd ../
 	dodoc AUTHORS ChangeLog README || die "failed to install docs"
 
-	insinto /usr/share/${P}/wireshark-lua/
-	doins wireshark-lua/satp.lua || die "failed to install wireshark-lua contrib script"
+	#forgotten in current upstream package
+	#insinto /usr/share/${P}/wireshark-lua/
+	#doins wireshark-lua/satp.lua || die "failed to install wireshark-lua contrib script"
 }
 
 pkg_config() {
@@ -72,5 +73,7 @@ pkg_postinst() {
 	elog "# ln -s /etc/init.d/${PN} /etc/init.d/${PN}.client1"
 	elog
 	elog "You can disect anytun traffic using wireshark by plugging the script"
-	elog " /usr/share/${P}/wireshark-lua/satp.lua into wireshark"
+	elog "satp.lua into wireshark. Get it here:"
+	elog " http://svn.anytun.org/anytun-common/trunk/wireshark-lua/satp.lua"
+	#elog " /usr/share/${P}/wireshark-lua/satp.lua into wireshark"
 }
diff --git a/net-misc/anytun/files/anytun-0.3.1.init b/net-misc/anytun/files/anytun-0.3.3.init
index 188bf0d9c..7a61b11fb 100755
--- a/net-misc/anytun/files/anytun-0.3.1.init
+++ b/net-misc/anytun/files/anytun-0.3.3.init
@@ -22,8 +22,8 @@ VPN=${SVCNAME#*.}
 [ "$VPN" = "$SVCNAME" ] && VPN=""
 
 # Include anytun defaults if available
-if [ -f /etc/default/anytun ] ; then
-	. /etc/default/anytun
+if [ -f /etc/conf.d/anytun ] ; then
+	. /etc/conf.d/anytun
 fi
 
 test -x $DAEMON || exit 1
@@ -59,11 +59,12 @@ start_configd () {
 		test -d $VARCONFIG_DIR || mkdir -p $VARCONFIG_DIR
 		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`
-			$ANYTUNCONFIG $DAEMONARG >> $VARCONFIG_DIR/$NAME
+			$ANYTUNCONFIG $DAEMONARG $CIPHER $AUTHALGO $KDPRF >> $VARCONFIG_DIR/$NAME
 		done
-		CONTROLHOST=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed  's/^/ --/'`
+		CONTROLHOST=`sed 's/#.*//'  <  $CONFIG_DIR/$NAME/config | grep -e 'control-host' | sed  's/^/ --/'i | xargs echo`
 		start-stop-daemon --start --pidfile $VARCONFIG_DIR/${NAME}.pid --exec $CONTROLDAEMON \
 			-- -f $VARCONFIG_DIR/$NAME $DAEMONOPTS $CONTROLHOST --write-pid $VARCONFIG_DIR/${NAME}.pid
 	fi
@@ -98,8 +99,7 @@ start () {
 stop () {
 	if test -z "$VPN" ; then
 		for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
-			NAME=`echo $PIDFILE | cut -c17-`
-			NAME=${NAME%%.pid}
+			NAME=`basename $PIDFILE .pid`
 			ebegin "Stopping ${DESC} VPN: ${NAME}"
 			stop_vpn
 			eend $?
@@ -107,8 +107,7 @@ stop () {
 	else
 		if test -e $VARRUN_DIR/${VPN}.pid ; then
 			PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null`
-			NAME=`echo $PIDFILE | cut -c17-`
-			NAME=${NAME%%.pid}
+			NAME=`basename $PIDFILE .pid`
 			ebegin "Stopping ${DESC} VPN: ${NAME}"
 			stop_vpn
 			eend $?
@@ -121,8 +120,7 @@ stop () {
 reload () {
 	if test -z "$VPN" ; then
 		for PIDFILE in `ls $VARRUN_DIR/*.pid 2> /dev/null`; do
-			NAME=`echo $PIDFILE | cut -c17-`
-			NAME=${NAME%%.pid}
+			NAME=`basename $PIDFILE .pid`
 			if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
 				ebegin "Reloading ${DESC} VPN: ${NAME}"
 				stop_vpn
@@ -138,8 +136,7 @@ reload () {
 	else
 		if test -e $VARRUN_DIR/${VPN}.pid ; then
 			PIDFILE=`ls $VARRUN_DIR/${VPN}.pid 2> /dev/null`
-			NAME=`echo $PIDFILE | cut -c17-`
-			NAME=${NAME%%.pid}
+			NAME=`basename $PIDFILE .pid`
 			if [ -d $CONFIG_DIR/$NAME/conf.d ] ; then
 				ebegin "Reloading ${DESC} VPN: ${NAME}"
 				stop_vpn