Added 2.6.19 patch and closing bug #155837.

(Portage version: 2.1.2_rc2-r2)

4 files changed, 101 insertions, 12 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index a2270a1c60a4..db2fd35a5617 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,11 @@
 # 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.45 2006/12/04 14:42:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.46 2006/12/12 15:02:51 wolf31o2 Exp $
+
+  12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> +files/2.6.19.patch,
+  cisco-vpnclient-3des-4.7.00.0640.ebuild,
+  cisco-vpnclient-3des-4.8.00.0490.ebuild:
+  Added 2.6.19 patch and closing bug #155837.
 
   04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.0.1a-r1.ebuild,
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
index bfa854016850..29683c8fe567 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
@@ -1,6 +1,6 @@
 # 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.7.00.0640.ebuild,v 1.7 2006/12/04 14:42:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild,v 1.8 2006/12/12 15:02:51 wolf31o2 Exp $
 
 inherit eutils linux-mod
 
@@ -41,6 +41,7 @@ src_unpack () {
 	then
 		epatch ${FILESDIR}/${PV}-2.6.14.patch
 	fi
+	epatch ${FILESDIR}/2.6.19.patch
 }
 
 src_compile () {
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild
index caa39f2b9a2a..66aa348f134d 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild
@@ -1,6 +1,6 @@
 # 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.8.00.0490.ebuild,v 1.6 2006/12/04 14:42:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.8.00.0490.ebuild,v 1.7 2006/12/12 15:02:51 wolf31o2 Exp $
 
 inherit eutils linux-mod
 
@@ -32,16 +32,12 @@ pkg_nofetch() {
 	einfo "and download ${A} to ${DISTDIR}"
 }
 
-#src_unpack () {
-#	unpack ${A}
-#	cd ${S}
+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}/2.6.19.patch
+}
 
 src_compile () {
 	unset ARCH
diff --git a/net-misc/cisco-vpnclient-3des/files/2.6.19.patch b/net-misc/cisco-vpnclient-3des/files/2.6.19.patch
new file mode 100644
index 000000000000..77082d62abfa
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/2.6.19.patch
@@ -0,0 +1,87 @@
+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>