Added patch from 4.6.03.0190 to 4.0.5 and closing bug #120127.

Package-Manager: portage-2.1_pre6-r2

5 files changed, 47 insertions, 12 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 051fe50a85eb..015a2f8d746c 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2006/02/10 22:06:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.38 2006/03/24 15:11:21 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.0.5-r1 (24 Mar 2006)
+
+  24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.0.5-2.6.14.patch, -cisco-vpnclient-3des-4.0.5.ebuild,
+  +cisco-vpnclient-3des-4.0.5-r1.ebuild:
+  Added patch from 4.6.03.0190 to 4.0.5 and closing bug #120127.
 
 *cisco-vpnclient-3des-4.8.00.0490 (10 Feb 2006)
 
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index acdd57065d51..c8075d98ea62 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,15 +1,15 @@
-MD5 418d12a96c5b4617a4f9808e840f6ba3 ChangeLog 9021
-RMD160 bbc26345e1181e5d5c07f307d60fdb4323db9486 ChangeLog 9021
-SHA256 1c8fe04cf2f8331df42b13fc97d683a81ada2960d4b3901dd4795f0a4c93ca57 ChangeLog 9021
+MD5 2e561ddfb8733227cb7fed45127e0b74 ChangeLog 9293
+RMD160 797b3402d049d609acfb00016f3177beff768f48 ChangeLog 9293
+SHA256 803570761cecdf6bf4be088cdf30a58c97c03d36b8aeca8cd05915e98cb11680 ChangeLog 9293
 MD5 a691310df68035551cd68c4ef6c7763a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1781
 RMD160 09433259b828f0eb0a126bca03ac928e4a213ed1 cisco-vpnclient-3des-4.0.1a-r1.ebuild 1781
 SHA256 55a8c0578a93e1c60c7bbdc32c6d2157b50870c7805a7086aa3e57919d54f1c8 cisco-vpnclient-3des-4.0.1a-r1.ebuild 1781
 MD5 b565bd30a204dcc6c4eca0a443e2e3bc cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
 RMD160 90ea4f1a49e0320e19933d50b3e920b93efb077e cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
 SHA256 17c11db704d3fe7117d863ad8a4fa9331284d0a61dca04071e3f5adabc4bd0e7 cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
-MD5 73d867d50b97300dc21f4205863600b5 cisco-vpnclient-3des-4.0.5.ebuild 1774
-RMD160 fc617d1fd41dcec8d027ef9e0a924f45ed7ababb cisco-vpnclient-3des-4.0.5.ebuild 1774
-SHA256 f125424c8d0ddfb4c1c8ff77cfb350fd115215edf759a51800930199ebe6420f cisco-vpnclient-3des-4.0.5.ebuild 1774
+MD5 a779692b216b3eaa433f9af4403b1692 cisco-vpnclient-3des-4.0.5-r1.ebuild 1918
+RMD160 c810cc502ee67c9a436444cebccfcd5af83eebaf cisco-vpnclient-3des-4.0.5-r1.ebuild 1918
+SHA256 7c198ccd9564de385b495828a89774dfc8483b1d742bd8aa31bca8088172126b cisco-vpnclient-3des-4.0.5-r1.ebuild 1918
 MD5 ff48cc35afdc04584fe99de699b2ae54 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2154
 RMD160 b6ddc8c3e8014287a02e969ed12e99eb851e1b79 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2154
 SHA256 852c2f6f70614fe27b153d04408b8a4df11bd77b94482cdb2353f57fd8ca95aa cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2154
@@ -28,6 +28,9 @@ SHA256 da784d8aa2b364a9b0e3ff93c5d2782cedb705d982639790a7ae2e012c1b6efe cisco-vp
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
 RMD160 1a15a1acd1a67dc126f6af7f496f5ad3a7b9f135 files/4.0.1a-linux26-gentoo.patch 686
 SHA256 0e482ea52a2f5548a6740677589ac1e2ed3296512c62e7186c846d8ae223f263 files/4.0.1a-linux26-gentoo.patch 686
+MD5 85b413dbfb35dc1d790002409df1bb1f files/4.0.5-2.6.14.patch 584
+RMD160 1571949fb116774a3784f1623809872559d14e06 files/4.0.5-2.6.14.patch 584
+SHA256 99b50667afb2fc20a1d12a568de9c63d9a0a4ab4497962fd48b9ef1dd0296a39 files/4.0.5-2.6.14.patch 584
 MD5 5250e93732649bfbea046a13e84ff4a8 files/4.6.00.0045-supported_device.patch 826
 RMD160 8fb9b4c2bc3eb9e43cde09b478e2854f9417bbeb files/4.6.00.0045-supported_device.patch 826
 SHA256 50b03bd3e4928988ae8438630f25ee10d73ab3c8ccc277e1ec785bfa8e1cbe8e files/4.6.00.0045-supported_device.patch 826
@@ -49,9 +52,9 @@ SHA256 54c52be1e7c26ac7cbbd977f310f945aa3637dc95ee55553232704ee1e01efef files/di
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
 RMD160 8a90d97885345e445a3b69e093160254bc33e08c files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
 SHA256 705f26dc60657c00c4bae68a4d8e1f1097efbfbc2bcff7521aa06cc40de200f8 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
-MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
-RMD160 5b1c33cfeba4f4eb530c2ffeec94d0814047f690 files/digest-cisco-vpnclient-3des-4.0.5 81
-SHA256 2291e3bb1c0dea27867c0fe144bf07dd5212bab18c9beb0501311592c197da1a files/digest-cisco-vpnclient-3des-4.0.5 81
+MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5-r1 81
+RMD160 5b1c33cfeba4f4eb530c2ffeec94d0814047f690 files/digest-cisco-vpnclient-3des-4.0.5-r1 81
+SHA256 2291e3bb1c0dea27867c0fe144bf07dd5212bab18c9beb0501311592c197da1a files/digest-cisco-vpnclient-3des-4.0.5-r1 81
 MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
 RMD160 b8edf03cdf819c6e41a686a55bd2009a493b589c files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
 SHA256 dc238f5ef85b637f8e917826d6c07cd0f6b3919f9f96a7af896a1a6fab84d955 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild
index 2d8f5ed5ce36..3be571f22339 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.9 2005/11/20 17:58:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild,v 1.1 2006/03/24 15:11:21 wolf31o2 Exp $
 
 inherit eutils linux-info
 
@@ -36,6 +36,11 @@ src_unpack() {
 	# 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 () {
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
new file mode 100644
index 000000000000..ef6c2ac98298
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch
@@ -0,0 +1,20 @@
+--- 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/digest-cisco-vpnclient-3des-4.0.5 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1
index 1ec919a67801..1ec919a67801 100644
--- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1