Updated vpnclient init script for proper 2.6 kernel handling and also to remove console messages at boot. Closing Bug #37678.

5 files changed, 123 insertions, 39 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index e0fa11bce942..240e50da6b8c 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.6 2004/01/08 19:53:24 wolf31o2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.7 2004/01/13 19:02:47 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.0.3b-r2 (13 Jan 2004)
+
+  13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r2.ebuild, files/vpnclient.rc:
+  Updated vpnclient init script for proper 2.6 kernel handling and also to
+  remove console messages at boot. Closing Bug #37678.
 
 *cisco-vpnclient-3des-4.0.3b-r1 (08 Jan 2004)
 
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index f32836dc890f..40f2534c05cc 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,11 +1,13 @@
+MD5 caba1b919e315ade1773668cd8d554fc cisco-vpnclient-3des-4.0.3b-r2.ebuild 1725
 MD5 d1ff82ec30a58ae6070057fe7c72aa15 cisco-vpnclient-3des-4.0.3b.ebuild 1678
 MD5 37962c76c19dd9bcebb5751be512dcd1 cisco-vpnclient-3des-4.0.3b-r1.ebuild 1725
-MD5 b556eeac5b0c8e679e579d47eb5b7295 ChangeLog 1491
+MD5 f7a35d1961afe9d4f8318a3cf3b8003c ChangeLog 1784
 MD5 2a625f3fa7c83e13e0b76f09a084155a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1755
 MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b 79
 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r1 79
-MD5 6de3b4045ff277878d6021d4a49b0240 files/vpnclient.rc 2197
+MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r2 79
+MD5 1e632bbb4a20c0544ad316b3ad906773 files/vpnclient.rc 2381
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r2.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r2.ebuild
new file mode 100644
index 000000000000..e6d6eff4eb27
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r2.ebuild,v 1.1 2004/01/13 19:02:47 wolf31o2 Exp $
+
+MY_PV=${PV/b/.B-k9}
+DESCRIPTION="Cisco VPN Client (3DES)"
+HOMEPAGE="http://www.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
+SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
+
+LICENSE="cisco-vpn-client"
+SLOT="${KV}"
+KEYWORDS="-* x86"
+RESTRICT="fetch"
+
+DEPEND="virtual/glibc
+	virtual/linux-sources
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/vpnclient
+
+VPNDIR="/etc/CiscoSystemsVPNClient"
+
+pkg_nofetch() {
+	eerror "Please goto:"
+	eerror " ${HOMEPAGE}"
+	eerror "and download"
+	eerror " ${A}"
+	eerror "to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
+	# Jesse Becker (jbecker@speakeasy.net)
+	epatch ${FILESDIR}/driver_build_CC.patch
+}
+
+src_compile () {
+	check_KV
+	sh ./driver_build.sh /lib/modules/${KV}/build
+	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini.in
+}
+
+src_install() {
+	exeinto /etc/init.d
+	#newexe vpnclient_init vpnclient
+	newexe ${FILESDIR}/vpnclient.rc vpnclient
+
+	exeinto /usr/bin
+	exeopts -m0711
+	doexe vpnclient
+	exeopts -m4711
+	doexe cvpnd
+	dobin ipseclog cisco_cert_mgr
+
+	insinto /lib/modules/${KV}/CiscoVPN
+	doins cisco_ipsec
+
+	insinto ${VPNDIR}
+	newins vpnclient.ini.in vpnclient.ini
+	insinto ${VPNDIR}/Profiles
+	doins *.pcf
+	dodir ${VPNDIR}/Certificates
+}
+
+pkg_postinst() {
+	einfo  "You must run \`/etc/init.d/vpnclient start\` before using the client."
+}
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r2 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r2
new file mode 100644
index 000000000000..ea34c5e4ad2d
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r2
@@ -0,0 +1 @@
+MD5 0f5cc298818b311b3a2b7cdc7430eda8 vpnclient-linux-4.0.3.B-k9.tar.gz 1326493
diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
index d16759afe633..7a2d4ab96124 100644
--- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
+++ b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc
@@ -7,42 +7,43 @@ opts="start stop status"
 VPNCLIENT="/usr/bin/vpnclient"
 VPNDEV="cipsec0"
 VPNMOD="cisco_ipsec"
-if [ -x /usr/bin/id ]; then
-    ID="/usr/bin/id"
-elif [ -x /bin/id ]; then
-    ID="/bin/id"
-else
-    echo "Unable to determine access level"
+
+ID="`which id`"
+if [ "$?" != "0" ]; then
+    eerror "Failed: Unable to determine access level (can't find $HILITE id $NORMAL in \$PATH)."
+    unset ID
     exit 1
 fi
-WHOAMI=`$ID|sed -e 's/(.*//'`
+WHOAMI="`$ID -u`"
 
 depend() {
 	need net
 }
 
 start() {
-	ebegin "Starting Cisco VPN Client: "
+	ebegin "Starting Cisco VPN Client"
 
 	if [ -f /etc/resolv.conf.vpnbackup ]; then
-		echo "restoring /etc/resolv.conf"
+		einfo "restoring /etc/resolv.conf"
 		mv /etc/resolv.conf.vpnbackup /etc/resolv.conf
 	fi
-	if [ -d /lib/modules/preferred ]; then
-		PC=/lib/modules/preferred/CiscoVPN
-	else
-		PC=/lib/modules/`uname -r`/CiscoVPN
-	fi
-	if [ -d $PC ] ; then
-		/sbin/modprobe -q ${PC}/${VPNMOD}
-		if [ "$?" != "0" ] ; then
-			echo "Failed to load module ${VPNMOD}"
-			exit 1
-		fi
-	else
-		echo "module directory $PC not found."
-		exit 1
-	fi
+
+        if [ -d /lib/modules/preferred ]; then
+                PC=/lib/modules/preferred/CiscoVPN
+        else
+                PC=/lib/modules/`uname -r`/CiscoVPN
+        fi
+
+        if [ -d $PC ] ; then
+                /sbin/insmod -qs ${PC}/${VPNMOD}
+                if [ "$?" != "0" ] ; then
+                        eerror "Failed to load module ${VPNMOD}"
+                        exit 1
+                fi
+        else
+                eerror "module directory $PC not found."
+                exit 1
+        fi
 	case "`uname -r`" in
 		2.6.*)
 		;;
@@ -59,14 +60,14 @@ start() {
 			#
 			ifconfig $VPNDEV 222.222.222.222 ;
 			if [ "$?" != "0" ] ; then
-				echo "Failed (ifconfig)"
-				/sbin/modprobe -qr ${VPNMOD}
+				eerror "Failed (ifconfig)."
+				/sbin/rmmod ${VPNMOD}
 				exit 1
 			fi
 		;;
 		*)
-			echo "Failed (unsupported Linux version)"
-			/sbin/modprobe -qr ${VPNMOD}
+			eerror "Failed (unsupported Linux version)."
+			/sbin/rmmod -q ${VPNMOD}
 			exit 1
 		;;
 	esac
@@ -74,23 +75,23 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping Cisco VPN Client: "
+	ebegin "Stopping Cisco VPN Client"
 	if [ -x $VPNCLIENT ]; then
 		$VPNCLIENT disconnect > /dev/null 2>&1
 	fi
 	/sbin/lsmod | grep -q "${VPNMOD}"
 	if [ "$?" != "0" ] ; then 
-		echo "module ${VPNMOD} is not running."
+		eerror "Failed: module ${VPNMOD} is not running."
 		exit 1
 	fi
 	/sbin/ifconfig $VPNDEV down
 	if [ "$?" != "0" ] ; then
-		echo "Failed (ifconfig)"
+		eerror "Failed (ifconfig)."
 		exit 1
 	fi
-	/sbin/modprobe -qr ${VPNMOD}
+	/sbin/rmmod ${VPNMOD}
 	if [ "$?" != "0" ] ; then
-		echo "Failed (rmmod)"
+		eerror "Failed (rmmod)."
 		exit 1
 	fi
 	eend $?
@@ -101,13 +102,14 @@ status() {
 	/sbin/lsmod | egrep "${VPNMOD}"
 	if [ "$?" != "0" ] ; then
 		echo
-		echo "Status Failed (lsmod ${VPNMOD}) - The VPN module is not loaded."
+		eerror "Failed (lsmod ${VPNMOD}): the VPN module is not loaded."
+		exit 1
 	fi
 	echo
 	/sbin/ifconfig $VPNDEV
 	if [ "$?" != "0" ] ; then
 		echo
-		echo "Status Failed (ifconfig ${VPNDEV}) - The virtual interface is not present."
+		eerror "Failed (ifconfig ${VPNDEV}): the virtual interface is not present."
 		exit 1
 	fi
 }