Version bumped to latest upstream version and closing bug #110613.

Package-Manager: portage-2.0.53_rc7

5 files changed, 135 insertions, 2 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 32b507891658..5db464fcfa17 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.34 2005/11/20 17:58:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.35 2005/11/28 20:02:13 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.7.00.0640 (28 Nov 2005)
+
+  28 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.7.00.0640-2.6.14.patch, +cisco-vpnclient-3des-4.7.00.0640.ebuild:
+  Version bumped to latest upstream version and closing bug #110613.
 
   20 Nov 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 c3dfd10e2501..9dc156396d44 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,4 +1,4 @@
-MD5 39611034a5823e4fd0d8f6b898ca93d6 ChangeLog 8271
+MD5 0eff698abefde04910542ac60ba0454e ChangeLog 8521
 MD5 a691310df68035551cd68c4ef6c7763a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1781
 MD5 b565bd30a204dcc6c4eca0a443e2e3bc cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
 MD5 73d867d50b97300dc21f4205863600b5 cisco-vpnclient-3des-4.0.5.ebuild 1774
@@ -6,10 +6,12 @@ MD5 ff48cc35afdc04584fe99de699b2ae54 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild
 MD5 6e5b6dbe6edcd6d4686d3f9c3e99f467 cisco-vpnclient-3des-4.6.02.0030.ebuild 2350
 MD5 39b4f8f9ef79c3af48a6a914e45698e0 cisco-vpnclient-3des-4.6.03.0190-r1.ebuild 1999
 MD5 48fed1d9a24613ce6fbfd7e2cb4a5ade cisco-vpnclient-3des-4.6.03.0190.ebuild 1788
+MD5 e35e28c1c1d1e8f484e2a7f70db47764 cisco-vpnclient-3des-4.7.00.0640.ebuild 1998
 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 85b413dbfb35dc1d790002409df1bb1f files/4.6.03.0190-2.6.14.patch 584
+MD5 393a6d85fef03bd017fad57cc9917e55 files/4.7.00.0640-2.6.14.patch 1122
 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
@@ -18,6 +20,7 @@ MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.00
 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 45d0931857a18acabe4efde1aec8aa0c files/digest-cisco-vpnclient-3des-4.6.03.0190-r1 90
+MD5 4824fae229df3cae9b06e91f97a9f1a0 files/digest-cisco-vpnclient-3des-4.7.00.0640 90
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
 MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
 MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
new file mode 100644
index 000000000000..f1e32469cbe7
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild
@@ -0,0 +1,85 @@
+# 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.7.00.0640.ebuild,v 1.1 2005/11/28 20:02:13 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="0"
+KEYWORDS="~amd64 ~x86"
+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.
+	if kernel_is 2 6 && [ ${KV_PATCH} -ge 14 ]
+	then
+		epatch ${FILESDIR}/${PV}-2.6.14.patch
+	fi
+}
+
+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.7.00.0640-2.6.14.patch b/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-2.6.14.patch
new file mode 100644
index 000000000000..b560a444a8ee
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-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/digest-cisco-vpnclient-3des-4.7.00.0640 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640
new file mode 100644
index 000000000000..97461025e375
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640
@@ -0,0 +1 @@
+MD5 81b4749874b1123bdceca5cecad4e659 vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002