Copied patch from 4.7.00 to 4.6.* ebuilds and closing bug #128045.

Package-Manager: portage-2.1_pre7-r4

6 files changed, 110 insertions, 12 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 1fc8b6a0ba9e..272efa71b57b 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2006/03/24 18:09:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.40 2006/04/11 12:00:51 wolf31o2 Exp $
+
+  11 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.6.00.0045-2.6.14.patch, +files/4.6.02.0030-2.6.14.patch,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  cisco-vpnclient-3des-4.6.02.0030.ebuild:
+  Copied patch from 4.7.00 to 4.6.* ebuilds and closing bug #128045.
 
   24 Mar 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 55315c8ffe19..483b83f77c41 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,6 +1,6 @@
-MD5 cd6a189cd60d51ae8cdd78ddbb7fa486 ChangeLog 9876
-RMD160 ca2a7c121b3b3eb952c41c38c0aec3b98c6b9ca1 ChangeLog 9876
-SHA256 e6dbb0d545a0cf05b3c381bf6c76b2cb18f0a82ef26ff69cc47527c0d04c8ed8 ChangeLog 9876
+MD5 675e07af25c4eca27f63eec2abba9f21 ChangeLog 10157
+RMD160 dcb65da309856366fdb9f527c28a5f803504610d ChangeLog 10157
+SHA256 66e91a76232f97831af314129f5c0ed3b1bfdcb3647a1fa4cdd0618aa8317145 ChangeLog 10157
 MD5 73d77afc81d42ea295db034b02163ffd cisco-vpnclient-3des-4.0.1a-r1.ebuild 1766
 RMD160 16bd440746d4aca61bb970da733963b82dfc311b cisco-vpnclient-3des-4.0.1a-r1.ebuild 1766
 SHA256 8a351ff32f2e45c793c7026ad6185fcb1dea51b736ade66e77b9b94b701dca9c cisco-vpnclient-3des-4.0.1a-r1.ebuild 1766
@@ -10,12 +10,12 @@ SHA256 3a81e6e6875a31b23aec2fb8527a62237c3f9284bc393de39b42903f6ff36552 cisco-vp
 MD5 8d70a1627195995543120b857b336911 cisco-vpnclient-3des-4.0.5-r1.ebuild 1903
 RMD160 3c8f57d8ba6716145972091bd968a711878098af cisco-vpnclient-3des-4.0.5-r1.ebuild 1903
 SHA256 6ea6c1a2ba6c0477be2a9c58257ba0428204acae774b6d6c32490bddac6ab6df cisco-vpnclient-3des-4.0.5-r1.ebuild 1903
-MD5 7084df8db0c06ca230cfe7ac95959222 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2139
-RMD160 37750f1002afef598a26363a69a9b8427e0553e3 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2139
-SHA256 eb790d0a6682735a3625985c3416b918c87e629de4edbacb4250268b80f1125c cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2139
-MD5 fe3d312becd6debaed05bfb2490981d5 cisco-vpnclient-3des-4.6.02.0030.ebuild 2335
-RMD160 f88d12756dd2aff3fde543eae1714488b4a13d7e cisco-vpnclient-3des-4.6.02.0030.ebuild 2335
-SHA256 6996608453d602d7f58aea736dc9792a00843b3f7ad63755958f4cd26f969f2c cisco-vpnclient-3des-4.6.02.0030.ebuild 2335
+MD5 ce9f120e9d871b9ee05d49b60e2b7791 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2280
+RMD160 e622bec76c4a47d709a13eb89ac1de8f8a7c232f cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2280
+SHA256 d1bca1a25b1389a68652c304da38ac3f42f4dd60af78de7e1618b9e36d1a09b3 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2280
+MD5 183f4dab14bdf3cccbf1cd9b941f85cc cisco-vpnclient-3des-4.6.02.0030.ebuild 2476
+RMD160 ab9397f467090b225898be94eae9f48a237b4e8e cisco-vpnclient-3des-4.6.02.0030.ebuild 2476
+SHA256 3e451b34a98b75cee215c76fcf5da6c300590c448ba702f4344cc950e852268a cisco-vpnclient-3des-4.6.02.0030.ebuild 2476
 MD5 3e13a231cf70321d12676c199ca84829 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1987
 RMD160 b9c2d50ff536981c2765e161bd1892a0a09aa4e9 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1987
 SHA256 9e8107d62f44494b1d1cfd053200bb7125560303f4e7b0d5cb2365e0eb3a5e09 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1987
@@ -31,9 +31,15 @@ SHA256 0e482ea52a2f5548a6740677589ac1e2ed3296512c62e7186c846d8ae223f263 files/4.
 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 393a6d85fef03bd017fad57cc9917e55 files/4.6.00.0045-2.6.14.patch 1122
+RMD160 e6c7860c552548574987932029d0b8df1f4dd09b files/4.6.00.0045-2.6.14.patch 1122
+SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4 files/4.6.00.0045-2.6.14.patch 1122
 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
+MD5 393a6d85fef03bd017fad57cc9917e55 files/4.6.02.0030-2.6.14.patch 1122
+RMD160 e6c7860c552548574987932029d0b8df1f4dd09b files/4.6.02.0030-2.6.14.patch 1122
+SHA256 5067e4f32875972b1b633cb15d9a635c3edcc3ea8f26b58e10b8e57b84803ec4 files/4.6.02.0030-2.6.14.patch 1122
 MD5 e9039147fbc74c136f4cc34f1b8baaf1 files/4.6.02.0030-supported_device.patch 807
 RMD160 751eeac122d6c508ddd1f197b2e82ef026989c8b files/4.6.02.0030-supported_device.patch 807
 SHA256 df9aabb51172f6f8b7920b08338ef498a4a9c6ab5ec26b172ee6182c4ce20228 files/4.6.02.0030-supported_device.patch 807
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
index 3e2270fd8be8..0e0d3e7cbaf2 100644
--- 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
@@ -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.6.00.0045-r1.ebuild,v 1.8 2006/03/24 18:09:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.9 2006/04/11 12:00:51 wolf31o2 Exp $
 
 inherit eutils linux-info
 
@@ -38,6 +38,11 @@ src_unpack() {
 	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 () {
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
index 1b5d889ff850..4ac74805b729 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.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.6.02.0030.ebuild,v 1.7 2006/03/24 18:09:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild,v 1.8 2006/04/11 12:00:51 wolf31o2 Exp $
 
 inherit eutils linux-info
 
@@ -39,6 +39,11 @@ src_unpack() {
 	# Patch submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
 	# fixed to work on 4.6.02.0030 <sfs@steflo.dk>
 	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 () {
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
new file mode 100644
index 000000000000..b560a444a8ee
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-2.6.14.patch
@@ -0,0 +1,38 @@
+--- 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-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-2.6.14.patch
new file mode 100644
index 000000000000..b560a444a8ee
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-2.6.14.patch
@@ -0,0 +1,38 @@
+--- 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;
+