Added 2.6.19 patch and closing bug #155837.

Package-Manager: portage-2.1.2_rc2-r2

5 files changed, 120 insertions, 27 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/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 40659bc9fcea..39081d46473d 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.6.19.patch 3247 RMD160 c3b6dac23c6e297f4a4468a653407b769fb72742 SHA1 bb7d3efa9cfaa1aaf0dcf9811202d651b8aeabd0 SHA256 e6b221751bc87d914b55912304ba0a72536ebc6bd0e3476024b4eb554391e5e5
+MD5 3f4623681d5bcd124174906e9f3a6372 files/2.6.19.patch 3247
+RMD160 c3b6dac23c6e297f4a4468a653407b769fb72742 files/2.6.19.patch 3247
+SHA256 e6b221751bc87d914b55912304ba0a72536ebc6bd0e3476024b4eb554391e5e5 files/2.6.19.patch 3247
 AUX 4.0.1a-linux26-gentoo.patch 686 RMD160 1a15a1acd1a67dc126f6af7f496f5ad3a7b9f135 SHA1 32533ca3c5cb7d8de26debb1a6a6e2a5f931c935 SHA256 0e482ea52a2f5548a6740677589ac1e2ed3296512c62e7186c846d8ae223f263
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
 RMD160 1a15a1acd1a67dc126f6af7f496f5ad3a7b9f135 files/4.0.1a-linux26-gentoo.patch 686
@@ -81,18 +85,18 @@ EBUILD cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2260 RMD160 b04d558389ddaf097c
 MD5 c79111a56a2cd5b390408ecf518f7c5f cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2260
 RMD160 b04d558389ddaf097c879dc0ad771670fa21ea86 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2260
 SHA256 77cc49e44676623d60a6fa1202fd559adec1b80811543a74f916416f47cb0cb3 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 2260
-EBUILD cisco-vpnclient-3des-4.7.00.0640.ebuild 2256 RMD160 2efe380766e25db75cd7516b9b0d08b97432c3d3 SHA1 b30650943636e6ce6d42cbe96680c812f2f1f243 SHA256 b46ce801d2a674073a65774099c6e43f118873b145ac88bdcb6783a9325992fe
-MD5 908a2a461030a75fe77509bbfcf2c5e2 cisco-vpnclient-3des-4.7.00.0640.ebuild 2256
-RMD160 2efe380766e25db75cd7516b9b0d08b97432c3d3 cisco-vpnclient-3des-4.7.00.0640.ebuild 2256
-SHA256 b46ce801d2a674073a65774099c6e43f118873b145ac88bdcb6783a9325992fe cisco-vpnclient-3des-4.7.00.0640.ebuild 2256
-EBUILD cisco-vpnclient-3des-4.8.00.0490.ebuild 2266 RMD160 030063ca3ec137a7150e1c79227b0074b17b56ce SHA1 c1b7d2d0c26980843a7bdf8f280928969a57530a SHA256 55343061e14eca4199b308df95a627e8bdabfa680bfbe3326b68b8e6d1f65e4b
-MD5 97a34435fafba439fa0d806b3935a1e7 cisco-vpnclient-3des-4.8.00.0490.ebuild 2266
-RMD160 030063ca3ec137a7150e1c79227b0074b17b56ce cisco-vpnclient-3des-4.8.00.0490.ebuild 2266
-SHA256 55343061e14eca4199b308df95a627e8bdabfa680bfbe3326b68b8e6d1f65e4b cisco-vpnclient-3des-4.8.00.0490.ebuild 2266
-MISC ChangeLog 12132 RMD160 1dc0578cb9a15b80bd3145badddfd5f29762aed4 SHA1 9ad89fa132865e249698c1eef8a93c2af6e44a19 SHA256 5a0082c480462328186a910e7d15f8f173783b1c8369d0a6f74c9d3ed06869e8
-MD5 35c941b352a4eaae65ea7a2016d46b7a ChangeLog 12132
-RMD160 1dc0578cb9a15b80bd3145badddfd5f29762aed4 ChangeLog 12132
-SHA256 5a0082c480462328186a910e7d15f8f173783b1c8369d0a6f74c9d3ed06869e8 ChangeLog 12132
+EBUILD cisco-vpnclient-3des-4.7.00.0640.ebuild 2289 RMD160 a6b00c3d5c45c079fb62ab133d306bb60f9e260b SHA1 12cff08d860175004329e06dff088c599806dbd0 SHA256 50541e52eeccc6d7682cd4c4282e6de7dfc29663366e150bf4361be9c2a68951
+MD5 0d6ab43050d192fd764fb14413229304 cisco-vpnclient-3des-4.7.00.0640.ebuild 2289
+RMD160 a6b00c3d5c45c079fb62ab133d306bb60f9e260b cisco-vpnclient-3des-4.7.00.0640.ebuild 2289
+SHA256 50541e52eeccc6d7682cd4c4282e6de7dfc29663366e150bf4361be9c2a68951 cisco-vpnclient-3des-4.7.00.0640.ebuild 2289
+EBUILD cisco-vpnclient-3des-4.8.00.0490.ebuild 2152 RMD160 b3968d1fbdc6293af0713c49e3012b5b008545a3 SHA1 b9fd917faefbc50a5c71dc8babc8589242d54b30 SHA256 eb09aad09fa2c30777ab102eaaa91d368468d7ad24fcd662e0e1e72cc9bb6ee6
+MD5 69c8c3579b77ae50244fe3f23c4eeced cisco-vpnclient-3des-4.8.00.0490.ebuild 2152
+RMD160 b3968d1fbdc6293af0713c49e3012b5b008545a3 cisco-vpnclient-3des-4.8.00.0490.ebuild 2152
+SHA256 eb09aad09fa2c30777ab102eaaa91d368468d7ad24fcd662e0e1e72cc9bb6ee6 cisco-vpnclient-3des-4.8.00.0490.ebuild 2152
+MISC ChangeLog 12340 RMD160 f45f3dd278a779fca9c4ef7806b8978834528fb3 SHA1 8e90e33bb17f6e75e588ba51d21b68142c2674f7 SHA256 93a4b56222894a100795397b3291ad092dc6127941cb8f186bf288222b757f1a
+MD5 df705b686551e4296574e47fa1c9e4f2 ChangeLog 12340
+RMD160 f45f3dd278a779fca9c4ef7806b8978834528fb3 ChangeLog 12340
+SHA256 93a4b56222894a100795397b3291ad092dc6127941cb8f186bf288222b757f1a ChangeLog 12340
 MISC metadata.xml 736 RMD160 32476fef069b92f0c479739950e9f2b4716b9bd3 SHA1 0fa2a32af9afd4da12dc0a13082944db6e50b9c5 SHA256 5060571cb14461b496c370fa5221d3c3f911eb42a9d47ecbc23bf397b2233ca0
 MD5 7f9364577f20b4c572db8b73225a8623 metadata.xml 736
 RMD160 32476fef069b92f0c479739950e9f2b4716b9bd3 metadata.xml 736
@@ -124,7 +128,7 @@ SHA256 a3e015b55bb71f18f8fef4a6e76b9086a3e6f86aec3bab193884d1e8bbf015a4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFdDPrkT4lNIS36YERAtRIAJ9q8RSYbHnQ4ypHwftCKuZmw9xfGgCgoJUY
-8EZe4GfgmUIrau0e4hwxn/s=
-=/Z0b
+iD8DBQFFfsShkT4lNIS36YERAuXXAJ4nGk4q5xnlBmDnxFEpDDFgDXzn6gCfdrON
+UJLDlSikN8Po26gHupq62Dc=
+=oMeE
 -----END PGP SIGNATURE-----
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>