Moved check for the vpnclient executable and added a sleep 1. Closing bug #141065.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 22 insertions, 17 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 1c03a04b469e..5d1e472d494b 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.41 2006/05/30 21:01:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.42 2006/07/19 21:11:53 wolf31o2 Exp $
+
+  19 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc:
+  Moved check for the vpnclient executable and added a sleep 1. Closing bug
+  #141065.
 
   30 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.0.1a-r1.ebuild,
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 261ec03c1651..d2a7813ae098 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -45,10 +45,10 @@ AUX register_netdevice.patch 1233 RMD160 28e358c26772ce0b4ea68600b511a21573b1366
 MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
 RMD160 28e358c26772ce0b4ea68600b511a21573b13667 files/register_netdevice.patch 1233
 SHA256 1acad6fdc8de19af50a66f93061bfa4af2f84a775ac0ae607e93655d3b9e988e files/register_netdevice.patch 1233
-AUX vpnclient.rc 2306 RMD160 b15c46356e436e5bfa963f2101272015e6cf961d SHA1 6597575b887175cb727e3492613bd5651462ee02 SHA256 78599e8adc7c9a7e74f12202b57af3aa8c6447bfc3fc13698e55cd46b5eede64
-MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
-RMD160 b15c46356e436e5bfa963f2101272015e6cf961d files/vpnclient.rc 2306
-SHA256 78599e8adc7c9a7e74f12202b57af3aa8c6447bfc3fc13698e55cd46b5eede64 files/vpnclient.rc 2306
+AUX vpnclient.rc 2318 RMD160 2279fb0c39dcb4b0107d04aa5197384fbf0b32a9 SHA1 ab86dd8d397affd2e943f5d2b87e1fe52a340ca1 SHA256 54c2e5751950c11591ac4cd4e13c5489086b68c935dc6cd2f438fb58deccc8d0
+MD5 6054056ea25b03df23d942dd403cd28a files/vpnclient.rc 2318
+RMD160 2279fb0c39dcb4b0107d04aa5197384fbf0b32a9 files/vpnclient.rc 2318
+SHA256 54c2e5751950c11591ac4cd4e13c5489086b68c935dc6cd2f438fb58deccc8d0 files/vpnclient.rc 2318
 DIST vpnclient-linux-4.0.1.A-k9.tar.gz 1312224
 DIST vpnclient-linux-4.0.3.B-k9.tar.gz 1326493
 DIST vpnclient-linux-4.0.5.Rel-k9.tar.gz 1336638
@@ -89,10 +89,10 @@ EBUILD cisco-vpnclient-3des-4.8.00.0490.ebuild 2011 RMD160 afa416375ca12de95be4b
 MD5 fadebf369c7a5aa528a4f77143f74d2d cisco-vpnclient-3des-4.8.00.0490.ebuild 2011
 RMD160 afa416375ca12de95be4bb6ee029fa9b88812636 cisco-vpnclient-3des-4.8.00.0490.ebuild 2011
 SHA256 06f129852e503961a05b9d5c9902d16ec80059652a8e7c415e41d4937271e8c1 cisco-vpnclient-3des-4.8.00.0490.ebuild 2011
-MISC ChangeLog 10662 RMD160 ae798a42b3cc6e9666fb01f6407c8ee7105664f5 SHA1 6c2c9f0584628179428aaf5e2992e383635ee5f5 SHA256 878145771563c797be0e420b8f17c7d35a62e650d3b7b0dd8f027369d9d8ad86
-MD5 e046d15c70990dde75f09285428ff4f8 ChangeLog 10662
-RMD160 ae798a42b3cc6e9666fb01f6407c8ee7105664f5 ChangeLog 10662
-SHA256 878145771563c797be0e420b8f17c7d35a62e650d3b7b0dd8f027369d9d8ad86 ChangeLog 10662
+MISC ChangeLog 10824 RMD160 05c44dc44aa3dda9989e3af3dabe0de4606dad16 SHA1 a586b8914891671274b3d45251ac06b26024fa65 SHA256 9fad1e3726dbde7f45071095c83d349627783b389e9091525b3e29715727211b
+MD5 1a93ab8d579ce9a82321327cc181a757 ChangeLog 10824
+RMD160 05c44dc44aa3dda9989e3af3dabe0de4606dad16 ChangeLog 10824
+SHA256 9fad1e3726dbde7f45071095c83d349627783b389e9091525b3e29715727211b ChangeLog 10824
 MISC metadata.xml 736 RMD160 32476fef069b92f0c479739950e9f2b4716b9bd3 SHA1 0fa2a32af9afd4da12dc0a13082944db6e50b9c5 SHA256 5060571cb14461b496c370fa5221d3c3f911eb42a9d47ecbc23bf397b2233ca0
 MD5 7f9364577f20b4c572db8b73225a8623 metadata.xml 736
 RMD160 32476fef069b92f0c479739950e9f2b4716b9bd3 metadata.xml 736
@@ -122,9 +122,9 @@ MD5 b629ca886d55951825a39b009bb4f624 files/digest-cisco-vpnclient-3des-4.8.00.04
 RMD160 ebed3d7aa111ac70849fab7c39e108bf98cf062e files/digest-cisco-vpnclient-3des-4.8.00.0490 316
 SHA256 a3e015b55bb71f18f8fef4a6e76b9086a3e6f86aec3bab193884d1e8bbf015a4 files/digest-cisco-vpnclient-3des-4.8.00.0490 316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEpyW8FdQwWVoAgN4RAj8bAJ0ZfTkVADN3IHMOgR3yqn4iEUjFlwCg8j9d
-IrYF2ErcfZ/SYinfe46Zkps=
-=snFM
+iD8DBQFEvqAhkT4lNIS36YERAqpSAJ9W41B9lp4WAFRJULAxlhDnnSPBMwCfQIUi
+r5Ek6FwvySqrLnAqJJAZTno=
+=YLyO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
index 0a1ae4a4c6a1..4344d98f6a2e 100644
--- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
+++ b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/vpnclient.rc,v 1.6 2004/08/25 00:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/vpnclient.rc,v 1.7 2006/07/19 21:11:53 wolf31o2 Exp $
 
 opts="start stop status"
 
@@ -75,14 +75,15 @@ stop() {
 
 	ebegin "Stopping Cisco VPN Client"
 
-	if [ -x $VPNCLIENT ]; then
-		$VPNCLIENT disconnect > /dev/null 2>&1
-	fi
 	/sbin/lsmod | grep -q "${VPNMOD}"
 	if [ "$?" != "0" ] ; then 
 		eend 1 "Failed: module ${VPNMOD} is not running"
 		return 1
 	fi
+	if [ -x $VPNCLIENT ]; then
+		$VPNCLIENT disconnect > /dev/null 2>&1
+		sleep 1
+	fi
 	/sbin/ifconfig $VPNDEV down
 	if [ "$?" != "0" ] ; then
 		eend 1 "Failed (ifconfig)"