summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/cisco-vpnclient-3des')
-rw-r--r--net-misc/cisco-vpnclient-3des/ChangeLog18
-rw-r--r--net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild83
-rw-r--r--net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild86
-rw-r--r--net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild86
-rw-r--r--net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild97
-rw-r--r--net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch17
-rw-r--r--net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch20
-rw-r--r--net-misc/cisco-vpnclient-3des/files/4.6.00.0045-2.6.14.patch38
-rw-r--r--net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch51
-rw-r--r--net-misc/cisco-vpnclient-3des/files/atheros.patch13
-rw-r--r--net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a-r11
-rw-r--r--net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r41
-rw-r--r--net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r11
-rw-r--r--net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r11
-rw-r--r--net-misc/cisco-vpnclient-3des/files/register_netdevice.patch52
15 files changed, 16 insertions, 549 deletions
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index af0e03f0f21c..2d68633340a7 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,20 @@
# 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.47 2006/12/12 15:08:12 wolf31o2 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.48 2007/02/06 22:05:51 wolf31o2 Exp $
+
+ 06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+ -files/4.6.00.0045-2.6.14.patch, -files/4.0.1a-linux26-gentoo.patch,
+ -files/4.6.00.0045-supported_device.patch, -files/4.0.5-2.6.14.patch,
+ -files/atheros.patch, -files/register_netdevice.patch,
+ -cisco-vpnclient-3des-4.0.1a-r1.ebuild,
+ -cisco-vpnclient-3des-4.0.3b-r4.ebuild,
+ -cisco-vpnclient-3des-4.0.5-r1.ebuild,
+ -cisco-vpnclient-3des-4.6.00.0045-r1.ebuild:
+ As painful as this is for me, I'm removing older versions of this ebuild.
+ This is due to my lack of access to the distfiles for the older ebuilds, and
+ bug #164344. If you use these older ebuilds and want to see them back in
+ portage, you'll need to contact me directly so we can work out arrangements
+ to make that possible. I apologize for any inconvenience this may cause.
12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc:
Changed exit 1 to eend 1 for bug #157596.
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
deleted file mode 100644
index 4d7d2da0a539..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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.1a-r1.ebuild,v 1.17 2006/12/04 14:42:42 wolf31o2 Exp $
-
-inherit eutils linux-mod
-
-MY_PV=${PV/a/.A-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="0"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
- opt/cisco-vpnclient/bin/vpnclient
- opt/cisco-vpnclient/bin/cvpnd
- opt/cisco-vpnclient/bin/cisco_cert_mgr
- opt/cisco-vpnclient/bin/ipseclog"
-
-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}
- if kernel_is 2 6; then
- epatch ${FILESDIR}/${PV}-linux26-gentoo.patch
- fi
-
- # 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 () {
- unset ARCH
- sh ./driver_build.sh ${KV_DIR}
- [ ! -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
-
- 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() {
- linux-mod_pkg_postinst
- einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-}
-
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
deleted file mode 100644
index 0f02cd9fc8f3..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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-r4.ebuild,v 1.14 2006/12/04 14:42:42 wolf31o2 Exp $
-
-inherit eutils linux-mod
-
-MY_PV=${PV/b/.B-k9}
-DESCRIPTION="Cisco VPN Client (3DES)"
-HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
-SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
- opt/cisco-vpnclient/bin/vpnclient
- opt/cisco-vpnclient/bin/cvpnd
- opt/cisco-vpnclient/bin/cisco_cert_mgr
- opt/cisco-vpnclient/bin/ipseclog"
-
-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
- # Patch to allow module to work with Atheros chipsets. Patch submitted to
- # bug #48680 by Dominic Battre <dominic.battre@gmx.de>
- epatch ${FILESDIR}/atheros.patch
-}
-
-src_compile () {
- unset ARCH
- sh ./driver_build.sh ${KV_DIR}
- [ ! -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() {
- linux-mod_pkg_postinst
- einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-}
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild
deleted file mode 100644
index a97afa2ccca1..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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.5-r1.ebuild,v 1.5 2006/12/04 14:42:42 wolf31o2 Exp $
-
-inherit eutils linux-mod
-
-MY_PV=${PV}.Rel-k9
-DESCRIPTION="Cisco VPN Client (3DES)"
-HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
-SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
- opt/cisco-vpnclient/bin/vpnclient
- opt/cisco-vpnclient/bin/cvpnd
- opt/cisco-vpnclient/bin/cisco_cert_mgr
- opt/cisco-vpnclient/bin/ipseclog"
-
-S=${WORKDIR}/vpnclient
-
-VPNDIR="/etc/CiscoSystemsVPNClient"
-
-pkg_nofetch() {
- einfo "Please visit:"
- einfo " ${HOMEPAGE}"
- einfo "and download ${A} 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
- #Fix problems with the linux >=2.6.14 kernel.
- if kernel_is 2 6 && [ ${KV_PATCH} -ge 14 ]
- then
- epatch ${FILESDIR}/${PV}-2.6.14.patch
- fi
-}
-
-src_compile () {
- unset ARCH
- sh ./driver_build.sh ${KV_DIR}
- [ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
- && 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 ${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
- if kernel_is 2 6 ; then
- doins cisco_ipsec.ko
- else
- doins cisco_ipsec
- fi
-
- insinto ${VPNDIR}
- newins vpnclient.ini.in vpnclient.ini
- insinto ${VPNDIR}/Profiles
- doins *.pcf
- dodir ${VPNDIR}/Certificates
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
-}
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
deleted file mode 100644
index 5eeb5b408974..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# 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.6.00.0045-r1.ebuild,v 1.12 2006/12/04 14:42:42 wolf31o2 Exp $
-
-inherit eutils linux-mod
-
-MY_PV=${PV}-k9
-DESCRIPTION="Cisco VPN Client (3DES)"
-HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
-SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-RESTRICT="fetch strip" # stricter"
-
-QA_TEXTRELS="opt/cisco-vpnclient/lib/libvpnapi.so"
-QA_EXECSTACK="opt/cisco-vpnclient/lib/libvpnapi.so
- opt/cisco-vpnclient/bin/vpnclient
- opt/cisco-vpnclient/bin/cvpnd
- opt/cisco-vpnclient/bin/cisco_cert_mgr
- opt/cisco-vpnclient/bin/ipseclog"
-
-S=${WORKDIR}/vpnclient
-
-VPNDIR="/etc/opt/cisco-vpnclient/"
-
-pkg_nofetch() {
- einfo "Please visit:"
- einfo " ${HOMEPAGE}"
- einfo "and download ${A} 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 submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
- epatch ${FILESDIR}/${PV}-supported_device.patch
- #Fix problems with the linux >=2.6.14 kernel.
- if kernel_is 2 6 && [ ${KV_PATCH} -ge 14 ]
- then
- epatch ${FILESDIR}/${PV}-2.6.14.patch
- fi
-}
-
-src_compile () {
- unset ARCH
- sh ./driver_build.sh ${KV_DIR}
- [ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
- && die "Failed to make module 'cisco_ipsec'"
- sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
- sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini
-}
-
-src_install() {
- exeinto /etc/init.d
- newexe ${FILESDIR}/vpnclient.rc vpnclient
-
- exeinto /opt/cisco-vpnclient/bin
- exeopts -m0711
- doexe vpnclient
- exeopts -m4711
- doexe cvpnd
- into /opt/cisco-vpnclient/
- dobin ipseclog cisco_cert_mgr
- dolib.so libvpnapi.so
- insinto /opt/cisco-vpnclient/include
- doins vpnapi.h
- dodir /usr/bin
- dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
-
- insinto /lib/modules/${KV}/CiscoVPN
- if kernel_is 2 6; then
- doins cisco_ipsec.ko
- else
- doins cisco_ipsec
- fi
-
- insinto ${VPNDIR}
- doins vpnclient.ini
- insinto ${VPNDIR}/Profiles
- doins *.pcf
- dodir ${VPNDIR}/Certificates
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
- echo
- ewarn "Configuration directory has moved to ${VPNDIR}!"
- echo
-}
diff --git a/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch b/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch
deleted file mode 100644
index dab63e806668..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- interceptor.c.orig 2003-10-27 14:59:18.474879600 -0500
-+++ interceptor.c 2003-10-27 14:59:05.186899680 -0500
-@@ -322,12 +322,12 @@
-
- dev_add_pack(&dummy_pt);
- /* this should be the original IP packet handler */
-- default_pt = dummy_pt.next;
-+ default_pt = list_entry(dummy_pt.list.next, struct packet_type, list);
- /* there may be more than one other packet handler in our bucket,
- * so look through all the buckets */
- while (default_pt != NULL && default_pt->type != htons(ETH_P_IP))
- {
-- default_pt = default_pt->next;
-+ default_pt = list_entry((*default_pt).list.next, struct packet_type, list);
- }
- if (!default_pt)
- {
diff --git a/net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch
deleted file mode 100644
index ef6c2ac98298..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- linuxcniapi.c.orig 2005-10-31 10:39:15.000000000 +1100
-+++ linuxcniapi.c 2005-10-31 10:37:44.000000000 +1100
-@@ -289,7 +289,7 @@
- goto exit_gracefully;
- }
- /* move the data into the packet */
-- do_gettimeofday(&skb->stamp);
-+ do_gettimeofday(&skb->tstamp);
-
- pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);
-
-@@ -429,7 +429,7 @@
- CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);
-
- /* put the mac header on */
-- do_gettimeofday(&skb->stamp);
-+ do_gettimeofday(&skb->tstamp);
-
- skb->dev = pBinding->pDevice;
-
diff --git a/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-2.6.14.patch
deleted file mode 100644
index b560a444a8ee..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-2.6.14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- linuxcniapi.c.orig 2005-11-25 10:24:28.000000000 -0600
-+++ linuxcniapi.c 2005-11-25 10:21:52.000000000 -0600
-@@ -274,6 +274,7 @@
- PBINDING pBinding;
- LPFRAGMENTBUFFER lpMacFragment;
- struct sk_buff *skb = NULL;
-+ struct timeval stamp;
- unsigned char *pIP = NULL, *pMac = NULL;
-
- /* we need to build the actual sk_buff from the packet structure */
-@@ -289,7 +290,8 @@
- goto exit_gracefully;
- }
- /* move the data into the packet */
-- do_gettimeofday(&skb->stamp);
-+ do_gettimeofday(&stamp);
-+ skb_set_timestamp(skb, &stamp);
-
- pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);
-
-@@ -386,6 +388,7 @@
- PBINDING pBinding,pVABinding;
- LPFRAGMENTBUFFER lpMacFragment;
- struct sk_buff *skb;
-+ struct timeval stamp;
- unsigned char *pIP = NULL, *pMac = NULL;
- int tmp_rc = 0;
-
-@@ -429,7 +432,8 @@
- CniGetPacketData(Packet, 0, lpPacketDescriptor->uiPacketSize, pIP);
-
- /* put the mac header on */
-- do_gettimeofday(&skb->stamp);
-+ do_gettimeofday(&stamp);
-+ skb_set_timestamp(skb, &stamp);
-
- skb->dev = pBinding->pDevice;
-
diff --git a/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch
deleted file mode 100644
index f21cfc7e0bfc..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- interceptor.c.orig 2004-11-02 07:27:19.296825440 -0700
-+++ interceptor.c 2004-11-02 07:22:46.545289976 -0700
-@@ -100,6 +100,24 @@
- .notifier_call = handle_netdev_event,
- };
-
-+static int
-+inline supported_device(struct net_device* dev)
-+{
-+ int rc=0;
-+
-+ if(dev->type == ARPHRD_ETHER)
-+ {
-+ rc=1;
-+ }
-+ else if(dev->type == ARPHRD_PPP)
-+ {
-+ rc=1;
-+ }
-+
-+ return rc;
-+}
-+
-+
- static int __init
- interceptor_init(struct net_device *dev)
- {
-@@ -476,23 +494,6 @@
- s->rc = 0;
- }
-
--static int
--inline supported_device(struct net_device* dev)
--{
-- int rc=0;
--
-- if(dev->type == ARPHRD_ETHER)
-- {
-- rc=1;
-- }
-- else if(dev->type == ARPHRD_PPP)
-- {
-- rc=1;
-- }
--
-- return rc;
--}
--
-
- static BINDING *
- getbindingbydev(struct net_device *dev)
diff --git a/net-misc/cisco-vpnclient-3des/files/atheros.patch b/net-misc/cisco-vpnclient-3des/files/atheros.patch
deleted file mode 100644
index b3ff9870dd63..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/atheros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -U2 interceptor.c.orig interceptor.c
---- interceptor.c.orig 2003-10-30 02:27:34.000000000 +0100
-+++ interceptor.c 2004-04-19 21:04:08.388323856 +0200
-@@ -509,4 +509,9 @@
- rc = 1;
- }
-+ else if (!strncmp(dev->name, "ath", 3)
-+ && (dev->name[3] >= '0' && dev->name[3] <= '9'))
-+ {
-+ rc = 1;
-+ }
- else if (!strncmp(dev->name, "ppp", 3) && (dev->name[3] >= '0' &&
- dev->name[3] <= '9'))
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a-r1
deleted file mode 100644
index b9e983367568..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d60cd032c8052caa7f18822e3fafad0e vpnclient-linux-4.0.1.A-k9.tar.gz 1312224
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4
deleted file mode 100644
index ea34c5e4ad2d..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f5cc298818b311b3a2b7cdc7430eda8 vpnclient-linux-4.0.3.B-k9.tar.gz 1326493
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1
deleted file mode 100644
index 1ec919a67801..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56be983a14925db4a5dbe5a9c51d4e01 vpnclient-linux-4.0.5.Rel-k9.tar.gz 1336638
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r1
deleted file mode 100644
index b3c3b9a894b5..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4204c9cc10d57d3e0d8de0fc7548bbf5 vpnclient-linux-4.6.00.0045-k9.tar.gz 1406359
diff --git a/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch b/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch
deleted file mode 100644
index 36672ea3250b..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/register_netdevice.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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;
- }
-