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

(Portage version: 2.1_pre7-r4)

5 files changed, 95 insertions, 3 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/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;
+