Added patch to resolve bug #107208.

Package-Manager: portage-2.0.53_rc7

5 files changed, 126 insertions, 13 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 5463cf0b1f0a..8a8258b1e12a 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.27 2005/08/29 17:43:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.28 2005/11/13 22:08:35 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.6.03.0190-r1 (13 Nov 2005)
+
+  13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.6.03.0190-2.6.14.patch,
+  +cisco-vpnclient-3des-4.6.03.0190-r1.ebuild:
+  Added patch to resolve bug #107208.
 
   29 Aug 2005; 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 d8c1f94d52d8..92eedf7c5a57 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,21 +1,24 @@
-MD5 eb5e6f36f438dc7dc4ee0e94623ae909 cisco-vpnclient-3des-4.6.03.0190.ebuild 1792
-MD5 dac4cba542b2de924aa25c232276b504 cisco-vpnclient-3des-4.6.02.0030.ebuild 2354
+MD5 02bcb3b8322752a1d584d5a7d533bc7f ChangeLog 6621
+MD5 d5e8fe6fb854a0fd079b21a3809e7f8f cisco-vpnclient-3des-4.0.1a-r1.ebuild 1785
+MD5 87807b43c04582540005217d9206186d cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
 MD5 9cc89facf68a35a0033fd1e7c11a52b7 cisco-vpnclient-3des-4.0.5.ebuild 1778
 MD5 952e23ee5dfb7d2adc3ada6e5dc4a1b4 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2158
-MD5 87807b43c04582540005217d9206186d cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
-MD5 ca083356bdf1234700d65e218bbec55f ChangeLog 6394
-MD5 d5e8fe6fb854a0fd079b21a3809e7f8f cisco-vpnclient-3des-4.0.1a-r1.ebuild 1785
-MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
-MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
-MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
+MD5 dac4cba542b2de924aa25c232276b504 cisco-vpnclient-3des-4.6.02.0030.ebuild 2354
+MD5 cd268b3aca857f4655a4ba45d23c8203 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1968
+MD5 eb5e6f36f438dc7dc4ee0e94623ae909 cisco-vpnclient-3des-4.6.03.0190.ebuild 1792
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
+MD5 5250e93732649bfbea046a13e84ff4a8 files/4.6.00.0045-supported_device.patch 826
 MD5 e9039147fbc74c136f4cc34f1b8baaf1 files/4.6.02.0030-supported_device.patch 807
-MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
-MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
+MD5 85b413dbfb35dc1d790002409df1bb1f files/4.6.03.0190-2.6.14.patch 584
+MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
+MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
+MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045-r1 83
 MD5 1f75a65b37e5ade3cab77a4ff0d8a368 files/digest-cisco-vpnclient-3des-4.6.02.0030 83
 MD5 45d0931857a18acabe4efde1aec8aa0c files/digest-cisco-vpnclient-3des-4.6.03.0190 90
-MD5 5250e93732649bfbea046a13e84ff4a8 files/4.6.00.0045-supported_device.patch 826
-MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
+MD5 45d0931857a18acabe4efde1aec8aa0c files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 90
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
+MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
+MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
+MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
new file mode 100644
index 000000000000..e9b460a7dd1c
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 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.03.0190-r1.ebuild,v 1.1 2005/11/13 22:08:35 wolf31o2 Exp $
+
+inherit eutils linux-info
+
+MY_PV=${PV}-k9
+DESCRIPTION="Cisco VPN Client (3DES)"
+HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html"
+SRC_URI="vpnclient-linux-x86_64-${MY_PV}.tar.gz"
+
+LICENSE="cisco-vpn-client"
+SLOT="${KV}"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RESTRICT="fetch"
+
+DEPEND="virtual/libc
+	virtual/linux-sources
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/vpnclient
+
+VPNDIR="/etc/opt/cisco-vpnclient/"
+
+pkg_nofetch() {
+	einfo "Please visit:"
+	einfo " ${HOMEPAGE}"
+	einfo "and download ${A} to ${DISTDIR}"
+}
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+
+	#Fix problems with the linux 2.6.14 kernel.
+	kernel_is 2 6 14 && epatch ${FILESDIR}/${PV}-2.6.14.patch
+}
+
+src_compile () {
+	unset ARCH
+	sh ./driver_build.sh /lib/modules/${KV}/build
+	[ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \
+		&& die "Failed to make module 'cisco_ipsec'"
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini
+}
+
+src_install() {
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/vpnclient.rc vpnclient
+
+	exeinto /opt/cisco-vpnclient/bin
+	exeopts -m0711
+	doexe vpnclient
+	exeopts -m4711
+	doexe cvpnd
+	into /opt/cisco-vpnclient/
+	dobin ipseclog cisco_cert_mgr
+	insinto /opt/cisco-vpnclient/lib
+	doins libvpnapi.so
+	insinto /opt/cisco-vpnclient/include
+	doins vpnapi.h
+	dodir /usr/bin
+	dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient
+
+	insinto /lib/modules/${KV}/CiscoVPN
+	doins cisco_ipsec*
+
+	insinto ${VPNDIR}
+	doins vpnclient.ini
+	insinto ${VPNDIR}/Profiles
+	doins *.pcf
+	dodir ${VPNDIR}/Certificates
+}
+
+pkg_postinst() {
+	einfo "You must run \`/etc/init.d/vpnclient start\` before using the client."
+	echo ""
+	ewarn "Configuration directory has moved to ${VPNDIR}!"
+	echo ""
+}
diff --git a/net-misc/cisco-vpnclient-3des/files/4.6.03.0190-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.6.03.0190-2.6.14.patch
new file mode 100644
index 000000000000..ef6c2ac98298
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.6.03.0190-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.6.03.0190-r1 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1
new file mode 100644
index 000000000000..3b2e25d349c9
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.03.0190-r1
@@ -0,0 +1 @@
+MD5 3cfd333f77894f9cfe597b372f857ab1 vpnclient-linux-x86_64-4.6.03.0190-k9.tar.gz 1839683