cleanup, remove old ebuild and old patches

(Portage version: 2.1.6.13/cvs/Linux x86_64)

10 files changed, 10 insertions, 800 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 8ed24d81c750..d7d6829f1858 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.65 2009/07/07 23:15:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.66 2009/08/23 01:53:14 darkside Exp $
+
+  23 Aug 2009; Jeremy Olexa <darkside@gentoo.org> -files/2.6.19.patch,
+  -files/4.7.00.0640-2.6.14.patch,
+  -cisco-vpnclient-3des-4.6.03.0190-r1.ebuild,
+  -files/4.6.02.0030-supported_device.patch,
+  -files/4.6.02.0030-2.6.14.patch, -files/4.6.03.0190-2.6.14.patch,
+  -files/4.7.00.0640-2.6.22.patch,
+  -cisco-vpnclient-3des-4.7.00.0640-r1.ebuild, -files/driver_build_CC.patch:
+  cleanup, remove old ebuild and old patches
 
   07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   cisco-vpnclient-3des-4.8.01.0640.ebuild:
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
deleted file mode 100644
index 5dabfde09928..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 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.03.0190-r1.ebuild,v 1.16 2008/06/02 22:26:43 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-x86_64-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* amd64 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}"
-
-	# 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() {
-	newinitd "${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
-	insinto /opt/cisco-vpnclient/lib
-	doins 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/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild
deleted file mode 100644
index 02cca838ca12..000000000000
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 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.7.00.0640-r1.ebuild,v 1.4 2008/06/02 22:26:43 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-x86_64-${MY_PV}.tar.gz"
-
-LICENSE="cisco-vpn-client"
-SLOT="0"
-KEYWORDS="-* amd64 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}"
-
-	# 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
-	epatch "${FILESDIR}"/${PV}-2.6.22.patch
-}
-
-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() {
-	newinitd "${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
-	insinto /opt/cisco-vpnclient/lib
-	doins 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/2.6.19.patch b/net-misc/cisco-vpnclient-3des/files/2.6.19.patch
deleted file mode 100644
index 77082d62abfa..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/2.6.19.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Nur vpnclient/IPSecDrvOS_linux.c vpnclient.new/IPSecDrvOS_linux.c
---- vpnclient/IPSecDrvOS_linux.c	2005-11-22 10:52:00.000000000 +0100
-+++ vpnclient.new/IPSecDrvOS_linux.c	2006-12-06 16:25:49.000000000 +0100
-@@ -11,7 +11,7 @@
- *   
- *
- ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/vmalloc.h>
- #include <linux/sched.h>
-diff -Nur vpnclient/frag.c vpnclient.new/frag.c
---- vpnclient/frag.c	2005-11-22 10:52:00.000000000 +0100
-+++ vpnclient.new/frag.c	2006-12-06 16:25:32.000000000 +0100
-@@ -1,4 +1,4 @@
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-diff -Nur vpnclient/interceptor.c vpnclient.new/interceptor.c
---- vpnclient/interceptor.c	2005-11-22 10:52:00.000000000 +0100
-+++ vpnclient.new/interceptor.c	2006-12-07 09:13:29.000000000 +0100
-@@ -8,7 +8,7 @@
- ***************************************************************************
- * This module implements the linux driver.
- ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -33,6 +33,14 @@
- #include "mtu.h"
- #include "unixkernelapi.h"
- 
-+// With linux 2.6.19, they renamed CHECKSUM_HW to CHECKSUM_COMPLETE
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+  #define CHECKSUM_HW CHECKSUM_COMPLETE
-+  #define SKB_CHECKSUM_HELP(a,b)	skb_checksum_help((a))
-+#else
-+  #define SKB_CHECKSUM_HELP(a,b)	skb_checksum_help((a),(b))
-+#endif
-+
- static uint8_t interceptor_eth_addr[] = { 0x00, 0x0b, 0xfc, 0xf8, 0x01, 0x8f };
- 
- // packet statistics 
-@@ -554,9 +562,9 @@
-     {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
--       if (skb_checksum_help(skb,1))
-+       if (SKB_CHECKSUM_HELP(skb,1))
- #else
--       if (skb_checksum_help(&skb,1))
-+       if (SKB_CHECKSUM_HELP(&skb,1))
- #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-        {
-            dev_kfree_skb(skb);
-@@ -680,11 +688,11 @@
-     if (skb->ip_summed == CHECKSUM_HW)
-     {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
--       if (skb_checksum_help(skb,0))
-+       if (SKB_CHECKSUM_HELP(skb,0))
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
--       if (skb_checksum_help(&skb,0))
-+       if (SKB_CHECKSUM_HELP(&skb,0))
- #else
--       if ((skb = skb_checksum_help(skb)) == NULL)
-+       if ((skb = SKB_CHECKSUM_HELP(skb)) == NULL)
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
-        {
-            goto exit_gracefully;
-diff -Nur vpnclient/linuxcniapi.c vpnclient.new/linuxcniapi.c
---- vpnclient/linuxcniapi.c	2005-11-22 10:52:00.000000000 +0100
-+++ vpnclient.new/linuxcniapi.c	2006-12-06 16:24:51.000000000 +0100
-@@ -9,7 +9,7 @@
-  * This module implements a translation layer between the CNI API and the
-  * Linux Interceptor driver.
-  ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/netdevice.h>
- #include <linux/if.h>
diff --git a/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-2.6.14.patch
deleted file mode 100644
index b560a444a8ee..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-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.02.0030-supported_device.patch b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch
deleted file mode 100644
index 1b129f0fda34..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- interceptor.c.orig	2005-04-08 23:22:37.000000000 +0200
-+++ interceptor.c	2005-04-08 23:23:19.000000000 +0200
-@@ -98,6 +98,23 @@
-     .notifier_call = handle_netdev_event,
- };
- 
-+static int
-+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)
- {
-@@ -447,24 +464,6 @@
-     s->rc = 0;
- }
- 
--static int
--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/4.6.03.0190-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.6.03.0190-2.6.14.patch
deleted file mode 100644
index ef6c2ac98298..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.6.03.0190-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.7.00.0640-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-2.6.14.patch
deleted file mode 100644
index b560a444a8ee..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-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.7.00.0640-2.6.22.patch b/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-2.6.22.patch
deleted file mode 100644
index eaf310a500ae..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-2.6.22.patch
+++ /dev/null
@@ -1,356 +0,0 @@
---- IPSecDrvOS_linux.c	2005-09-14 05:40:56.000000000 +0300
-+++ IPSecDrvOS_linux.c	2007-07-14 13:25:53.150630303 +0300
-@@ -11,7 +11,7 @@
- *   
- *
- ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/vmalloc.h>
- #include <linux/sched.h>
---- frag.c	2005-09-14 05:40:56.000000000 +0300
-+++ frag.c	2007-07-14 13:25:53.150630303 +0300
-@@ -1,4 +1,18 @@
--#include <linux/config.h>
-+/**************************************************************************
-+ *           Copyright (c) 2001, Cisco Systems, All Rights Reserved
-+ ***************************************************************************
-+ *
-+ *  File:    frag.c
-+ *  Date:    22/03/01
-+ *
-+ *  Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by
-+ *  Alexander Griesser 29/05/07 <cisco@tuxx-home.at>
-+ *
-+ ***************************************************************************
-+ * This module does some really cool stuff only Cisco knows about
-+ ***************************************************************************/
-+
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-@@ -37,9 +51,10 @@
-     int ret=FALSE;
-     struct frag_queue_entry *cur=NULL,*n=NULL,*prev=NULL;
- 
--    id = ntohs(skb->nh.iph->id);
-+    id = ntohs(CISCOVPN_SKB_NH_ID(skb));
-+
-     /* look for an entry with the same id as this packet*/
--    if (frag_queue_head && id != ntohs(frag_queue_head->skb->nh.iph->id))
-+    if (frag_queue_head && id != ntohs(CISCOVPN_SKB_NH_ID(frag_queue_head->skb)))
-     {
-         printk(KERN_INFO "%s: incomplete fragment set destroyed",__FUNCTION__);
-         cleanup_frag_queue();
-@@ -57,10 +72,13 @@
-     cur = frag_queue_head;
- 
-     prev = NULL;
--    skb_offset = ntohs(skb->nh.iph->frag_off) & IP_OFFSET;
-+
-+    skb_offset = ntohs(CISCOVPN_SKB_NH_FRAGOFF(skb)) & IP_OFFSET;
-+
-     while (cur)
-     {
--        cur_offset = ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET;
-+        cur_offset = ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET;
-+
-         /*sanity check*/
-         if (cur_offset < prev_offset)
-         {
-@@ -112,8 +130,9 @@
-         goto done_with_tests;
-     }
-     cur = frag_queue_head;
-+
-     /*first in queue must be first frag.*/
--    if ((ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET) != 0)
-+    if ((ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET) != 0)
-     {
-         goto done_with_tests;
-     }
-@@ -121,19 +140,22 @@
-        by comparing adjacent offset values and packet lengths*/
-     while (cur)
-     {
--        cur_offset = (ntohs(cur->skb->nh.iph->frag_off) & IP_OFFSET)*8;
--        if (cur_offset != prev_end_offset)
-+	cur_offset = (ntohs(CISCOVPN_SKB_NH_FRAGOFF(cur->skb)) & IP_OFFSET)*8;
-+
-+	if (cur_offset != prev_end_offset)
-         { 
-             goto done_with_tests;
-         }
-         prev = cur;
-         prev_offset = cur_offset;
--        prev_end_offset = prev_offset + ntohs(prev->skb->nh.iph->tot_len)
--                          - (prev->skb->nh.iph->ihl*4);
-+
-+        prev_end_offset = prev_offset + ntohs(CISCOVPN_SKB_NH_TOTLEN(prev->skb))
-+	                  - (CISCOVPN_SKB_NH_IHL(prev->skb)*4);
-         cur = cur->next;
-     } 
-     /*last in queue must not have more frags set*/
--    if (ntohs(prev->skb->nh.iph->frag_off) & IP_MF)
-+
-+    if (ntohs(CISCOVPN_SKB_NH_FRAGOFF(prev->skb)) & IP_MF)
-     {
-         goto done_with_tests;
-     }
-@@ -185,10 +207,12 @@
-         /*not an IP packet*/
-         goto done_with_tests;
-     }
--    iph = skb->nh.iph;
-+
-+    iph = CISCOVPN_SKB_IPHEADER(skb);
-+
-     if (!iph)
-     {
--        printk(KERN_DEBUG "%s: skb->nh is NULL.", __FUNCTION__);
-+        printk(KERN_DEBUG "%s: iph (IP Header) is NULL.", __FUNCTION__);
-         goto done_with_tests;
-     }
-     offset = ntohs(iph->frag_off);
---- interceptor.c	2005-09-14 05:40:56.000000000 +0300
-+++ interceptor.c	2007-07-14 13:25:53.150630303 +0300
-@@ -5,10 +5,13 @@
- *  File:    interceptor.c
- *  Date:    04/10/2001
- *
-+*  Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by
-+*  Alexander Griesser 29/05/07 <cisco@tuxx-home.at>
-+*
- ***************************************************************************
- * This module implements the linux driver.
- ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -339,13 +342,18 @@
- 
-     dp = NULL;
-     num_target_devices = 0;
--    for (dp = dev_base; dp != NULL; dp = dp->next)
--    {
-+
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+      for_each_netdev(dp)
-+    #else
-+      for (dp = dev_base; dp != NULL; dp = dp->next)
-+    #endif
-+      {
-         if (add_netdev(dp) == 0)
-         {
-             num_target_devices++;
-         }
--    }
-+      }
- 
-     if (num_target_devices == 0)
-     {
-@@ -550,13 +558,13 @@
-         goto exit_gracefully;
-     }
- 
--    if (skb->ip_summed == CHECKSUM_HW)
-+    if (CHECK_IP_SUMMED(skb->ip_summed))
-     {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
--       if (skb_checksum_help(skb,1))
-+       if (SKB_CHECKSUM_HELP(skb,1))
- #else
--       if (skb_checksum_help(&skb,1))
-+       if (SKB_CHECKSUM_HELP(&skb,1))
- #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-        {
-            dev_kfree_skb(skb);
-@@ -569,9 +577,10 @@
-     }
- 
-     reset_inject_status(&pBinding->recv_stat);
--    if (skb->mac.raw)
-+
-+    if (CISCOVPN_SKB_MACHEADER(skb))
-     {
--        hard_header_len = skb->data - skb->mac.raw;
-+        hard_header_len = skb->data - CISCOVPN_SKB_MACHEADER(skb);
-         if ((hard_header_len < 0) || (hard_header_len > skb_headroom(skb)))
-         {
-             printk(KERN_DEBUG "bad hh len %d\n", hard_header_len);
-@@ -588,7 +597,7 @@
-     switch (hard_header_len)
-     {
-     case ETH_HLEN:
--        CniNewFragment(ETH_HLEN, skb->mac.raw, &MacHdr, CNI_USE_BUFFER);
-+        CniNewFragment(ETH_HLEN, CISCOVPN_SKB_MACHEADER(skb), &MacHdr, CNI_USE_BUFFER);
-         break;
-     case IPPP_MAX_HEADER:
-     case 0:
-@@ -677,14 +686,14 @@
-     tmp_InjectSend = NULL;
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
--    if (skb->ip_summed == CHECKSUM_HW)
-+    if (CHECK_IP_SUMMED(skb->ip_summed))
-     {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
--       if (skb_checksum_help(skb,0))
-+       if (SKB_CHECKSUM_HELP(skb,0))
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
--       if (skb_checksum_help(&skb,0))
-+       if (SKB_CHECKSUM_HELP(&skb,0))
- #else
--       if ((skb = skb_checksum_help(skb)) == NULL)
-+       if ((skb = SKB_CHECKSUM_HELP(skb)) == NULL)
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
-        {
-            goto exit_gracefully;
-@@ -692,7 +701,8 @@
-     }
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-     reset_inject_status(&pBinding->send_stat);
--    hard_header_len = skb->nh.raw - skb->data;
-+
-+    hard_header_len = CISCOVPN_SKB_NETWORKHEADER(skb) - skb->data;
-     pBinding->send_real_hh_len = hard_header_len;
-     switch (hard_header_len)
-     {
---- linux_os.h	2005-09-14 05:40:56.000000000 +0300
-+++ linux_os.h	2007-07-14 13:25:53.150630303 +0300
-@@ -5,6 +5,9 @@
- *  File:    linux_os.h
- *  Date:    04/25/2001
- *
-+*  Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by
-+*  Alexander Griesser 29/05/07 <cisco@tuxx-home.at>
-+*
- ***************************************************************************
- *
- * Macros for handling differences in the linux kernel api.
-@@ -30,6 +33,39 @@
- #define PACKET_TYPE_NEXT(pt) ((pt)->next)
- #endif
- 
-+/* With linux 2.6.19, CHECKSUM_HW was split into CHECKSUM_COMPLETE
-+ * and CHECKSUM_PARTIAL
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-+  #define CHECK_IP_SUMMED(n) \
-+    (((n) == CHECKSUM_COMPLETE) || ((n) == CHECKSUM_PARTIAL))
-+  #define SKB_CHECKSUM_HELP(a,b)        skb_checksum_help((a))
-+#else
-+  #define CHECK_IP_SUMMED(n) ((n) == CHECKSUM_HW)
-+  #define SKB_CHECKSUM_HELP(a,b)        skb_checksum_help((a),(b))
-+#endif
-+
-+
-+/* With linux 2.6.22, the sk_buff struct has changed
-+ */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+  #define CISCOVPN_SKB_NH_ID(a)           (ip_hdr(a)->id)
-+  #define CISCOVPN_SKB_NH_FRAGOFF(a)      (ip_hdr(a)->frag_off)
-+  #define CISCOVPN_SKB_NH_TOTLEN(a)       (ip_hdr(a)->tot_len)
-+  #define CISCOVPN_SKB_NH_IHL(a)          (ip_hdr(a)->ihl)
-+  #define CISCOVPN_SKB_IPHEADER(a)        (ip_hdr(a))
-+  #define CISCOVPN_SKB_MACHEADER(a)       (skb_mac_header(a))
-+  #define CISCOVPN_SKB_NETWORKHEADER(a)   (skb_network_header(a))
-+#else
-+  #define CISCOVPN_SKB_NH_ID(a)           (a->nh.iph->id)
-+  #define CISCOVPN_SKB_NH_FRAGOFF(a)      (a->nh.iph->frag_off)
-+  #define CISCOVPN_SKB_NH_TOTLEN(a)       (a->nh.iph->tot_len)
-+  #define CISCOVPN_SKB_NH_IHL(a)          (a->nh.iph->ihl)
-+  #define CISCOVPN_SKB_IPHEADER(a)        (a->nh.iph)
-+  #define CISCOVPN_SKB_MACHEADER(a)       (a->mac.raw)
-+  #define CISCOVPN_SKB_NETWORKHEADER(a)   (a->nh.raw)
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,5)
- #include <asm/uaccess.h>
- #else
---- linuxcniapi.c	2007-07-14 13:31:21.152541062 +0300
-+++ linuxcniapi.c	2007-07-14 13:29:40.151949943 +0300
-@@ -5,11 +5,14 @@
-  *  File:    linuxcniapi.c
-  *  Date:    22/03/01
-  *
-+ *  Updated to work with Linux kernels >=2.6.19 (including 2.6.22) by
-+ *  Alexander Griesser 29/05/07 <cisco@tuxx-home.at>
-+ *
-  ***************************************************************************
-  * This module implements a translation layer between the CNI API and the
-  * Linux Interceptor driver.
-  ***************************************************************************/
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/netdevice.h>
- #include <linux/if.h>
-@@ -291,7 +294,11 @@
-     }
-     /* move the data into the packet */
-     do_gettimeofday(&stamp);
--    skb_set_timestamp(skb, &stamp);
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+        skb->tstamp = timeval_to_ktime(stamp);
-+    #else
-+            skb_set_timestamp(skb,&stamp);
-+    #endif
- 
-     pIP = skb_put(skb, lpPacketDescriptor->uiPacketSize);
- 
-@@ -321,8 +328,13 @@
- 
-     skb->ip_summed = CHECKSUM_UNNECESSARY;
- 
--    skb->nh.iph = (struct iphdr *) skb->data;
--    skb->mac.raw = pMac;
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+      skb_reset_network_header(skb);
-+      skb_reset_mac_header(skb);
-+    #else
-+      skb->nh.iph = (struct iphdr *) skb->data;
-+      skb->mac.raw = pMac;
-+    #endif
- 
-     pBinding->recv_stat.called = TRUE;
- 
-@@ -433,15 +445,29 @@
- 
-     /* put the mac header on */
-     do_gettimeofday(&stamp);
--    skb_set_timestamp(skb, &stamp);
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+        skb->tstamp = timeval_to_ktime(stamp);
-+    #else
-+        skb_set_timestamp(skb,&stamp);
-+    #endif
- 
-     skb->dev = pBinding->pDevice;
- 
--    skb->mac.raw = pMac;
--    skb->nh.raw = pIP;
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+      skb_reset_mac_header(skb);
-+      skb_reset_network_header(skb);
-+    #else
-+      skb->mac.raw = pMac;
-+      skb->nh.raw = pIP;
-+    #endif
- 
-     /*ip header length is in 32bit words */
--    skb->h.raw = pIP + (skb->nh.iph->ihl * 4);
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+      skb->transport_header = skb->network_header + (ip_hdr(skb)->ihl * 4);
-+    #else
-+      skb->h.raw = pIP + (skb->nh.iph->ihl * 4);
-+    #endif
-+
-     skb->protocol = htons(ETH_P_IP);
- 
-     /* send this packet up the NIC driver */
diff --git a/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch b/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch
deleted file mode 100644
index 75df50b60aeb..000000000000
--- a/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- driver_build.sh	2003-06-11 20:11:53.000000000 -0500
-+++ f	2003-11-14 18:00:49.000000000 -0600
-@@ -25,7 +25,7 @@
- 	echo ""
- }
- 
--CC=cc
-+CC=${CC:=gcc}
- LD=ld
- 
- KSRCDIR=$1
-@@ -40,6 +40,12 @@
- 
- INCLUDES="-I. -I${KSRCDIR}/include"
- CFLAGS="-O2 -DCNI_LINUX_INTERFACE -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DHAVE_CONFIG_H"
-+
-+echo | $CC -E -v -c - 2>&1 | grep __GNUC__ > /dev/null
-+if [ "0" != "$?" ]; then
-+	CFLAGS="$CFLAGS -D__GNUC__"
-+fi
-+
- case `uname -r` in
- 2.6.*)
-     INCLUDES="${INCLUDES} -I${KSRCDIR}/include/asm-i386/mach-default"