diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-24 15:11:21 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-03-24 15:11:21 +0000 |
commit | 412226a31e10e4a137b7d77522ffca52b9fbd639 (patch) | |
tree | 04fc811306b2f9878a7d3227c992dc9a7e34fa28 /net-misc/cisco-vpnclient-3des | |
parent | Mark 1.8.4.1 stable on ia64 (diff) | |
download | gentoo-2-412226a31e10e4a137b7d77522ffca52b9fbd639.tar.gz gentoo-2-412226a31e10e4a137b7d77522ffca52b9fbd639.tar.bz2 gentoo-2-412226a31e10e4a137b7d77522ffca52b9fbd639.zip |
Added patch from 4.6.03.0190 to 4.0.5 and closing bug #120127.
(Portage version: 2.1_pre6-r2)
Diffstat (limited to 'net-misc/cisco-vpnclient-3des')
-rw-r--r-- | net-misc/cisco-vpnclient-3des/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5-r1.ebuild (renamed from net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild) | 9 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/4.0.5-2.6.14.patch | 20 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5-r1 (renamed from net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.5) | 0 |
4 files changed, 35 insertions, 3 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/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 |