Adding patch to allow cisco_ipsec module to work with kernel 2.6.x, submitted by Kent Skaar <skaar@aol.net> to bugzilla and originally submitted to LMKL by by Gertjan van Wingerde <gwingerde@home.nl>. Closing bug #40730.

5 files changed, 147 insertions, 5 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index cf7d81af82f8..a143961a1e23 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.9 2004/02/14 23:08:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.10 2004/02/25 14:37:31 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.0.3b-r3 (25 Feb 2004)
+
+  25 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  cisco-vpnclient-3des-4.0.3b-r3.ebuild, files/register_netdevice.patch:
+  Adding patch to allow cisco_ipsec module to work with kernel 2.6.x, submitted
+  by Kent Skaar <skaar@aol.net> to bugzilla and originally submitted to LMKL by
+  by Gertjan van Wingerde <gwingerde@home.nl>. Closing bug #40730.
 
   14 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc:
   Removing -qs from insmod line to allow proper support with newer
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 5b7f03a7c65e..f428b88a3772 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,9 +1,12 @@
+MD5 9fbd0eb2e884779cbe214a6b96aab876 cisco-vpnclient-3des-4.0.3b-r3.ebuild 1988
+MD5 caba1b919e315ade1773668cd8d554fc cisco-vpnclient-3des-4.0.3b-r2.ebuild 1725
+MD5 eb4f012a3750e33db7d6a0ae6ff33357 ChangeLog 2530
+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 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r2 79
+MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r3 79
 MD5 f88efd8acf21686a9c8d4a82f45eadf2 files/vpnclient.rc 2390
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
-MD5 caba1b919e315ade1773668cd8d554fc cisco-vpnclient-3des-4.0.3b-r2.ebuild 1725
-MD5 90fa3565c0c05c656206ac08aa8c7c3e ChangeLog 2127
-MD5 2a625f3fa7c83e13e0b76f09a084155a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1755
-MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r3.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r3.ebuild
new file mode 100644
index 000000000000..87c651c59d5d
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r3.ebuild
@@ -0,0 +1,78 @@
+# 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-r3.ebuild,v 1.1 2004/02/25 14:37:31 wolf31o2 Exp $
+
+inherit eutils
+
+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
+	# Patch to allow module to work with kernel 2.6.x.  Patch submitted to bug
+	# #40730 by Kent Skaar <skaar@aol.net>.  Patch originally submitted to LMKL
+	# by Gertjan van Wingerde <gwingerde@home.nl>.
+	epatch ${FILESDIR}/register_netdevice.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-r3 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r3
new file mode 100644
index 000000000000..ea34c5e4ad2d
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r3
@@ -0,0 +1 @@
+MD5 0f5cc298818b311b3a2b7cdc7430eda8 vpnclient-linux-4.0.3.B-k9.tar.gz 1326493
diff --git a/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch b/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch
new file mode 100644
index 000000000000..36672ea3250b
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch
@@ -0,0 +1,52 @@
+--- interceptor.c.orig	2004-02-24 17:34:43.492845856 -0500
++++ interceptor.c	2004-02-24 17:37:45.465181856 -0500
+@@ -364,11 +364,6 @@
+         error = VPNIFUP_FAILURE;
+         goto error_exit;
+     }
+-    error = register_netdevice_notifier(&interceptor_notifier);
+-    if (error)
+-    {
+-        goto error_exit;
+-    }
+ 
+     vpn_is_up = TRUE;
+     return error;
+@@ -388,8 +383,6 @@
+ {
+     int i;
+ 
+-    unregister_netdevice_notifier(&interceptor_notifier);
+-
+     cleanup_frag_queue();
+     /*restore IP packet handler */
+     if (original_ip_handler.pt != NULL)
+@@ -436,6 +429,9 @@
+ {
+     struct net_device *dev = (struct net_device *) val;
+ 
++    if (!vpn_is_up)
++        return 1;
++
+     switch (event)
+     {
+     case NETDEV_REGISTER:
+@@ -853,6 +849,8 @@
+         CNICallbackTable = *PCNICallbackTable;
+         CniPluginDeviceCreated();
+ 
++        register_netdevice_notifier(&interceptor_notifier);
++
+         if ((status = register_netdev(&interceptor_dev)) != 0)
+         {
+             printk(KERN_INFO "%s: error %d registering device \"%s\".\n",
+@@ -876,6 +874,9 @@
+     CniPluginUnload();
+ 
+     unregister_netdev(&interceptor_dev);
++
++    unregister_netdevice_notifier(&interceptor_notifier);
++
+     return;
+ }
+