Added patch to resolve bug #107208.

(Portage version: 2.0.53_rc7)

4 files changed, 111 insertions, 1 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/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