Renamed supported_device.patch to 4.6.00.0045-supported_device.patch. Added 4.6.02.0030 ebuild provided by Stefan Skotte <sfs@steflo.dk> and closing bug #88408.

Package-Manager: portage-2.0.51.19

7 files changed, 168 insertions, 13 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index bb130cd95d4d..3422095be39f 100644
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,17 @@
 # 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.22 2005/02/08 22:22:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.23 2005/04/14 12:45:45 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.6.02.0030 (14 Apr 2005)
+
+  14 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/4.6.00.0045-supported_device.patch,
+  +files/4.6.02.0030-supported_device.patch, -files/supported_device.patch,
+  cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,
+  +cisco-vpnclient-3des-4.6.02.0030.ebuild:
+  Renamed supported_device.patch to 4.6.00.0045-supported_device.patch. Added
+  4.6.02.0030 ebuild provided by Stefan Skotte <sfs@steflo.dk> and closing bug
+  #88408.
 
   08 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.6.00.0045-r1.ebuild:
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index c983a9b28f58..0308ba47d4de 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,16 +1,19 @@
-MD5 3c55add3896a07c98f3d8f2ff5591656 cisco-vpnclient-3des-4.0.5.ebuild 1789
-MD5 6b2be3d1aae79109730ede9f6e2edf8b cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2163
-MD5 141160e362ffdcebef78b57a10afacfa cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
-MD5 c7f0ee25c20ee1e29a6ff29fd3419a37 ChangeLog 4993
+MD5 a82110b93201a5af06e8df11fe9cb644 ChangeLog 5475
 MD5 9d6665e9b7034f2028e63fe3451ff603 cisco-vpnclient-3des-4.0.1a-r1.ebuild 1795
+MD5 141160e362ffdcebef78b57a10afacfa cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
+MD5 3c55add3896a07c98f3d8f2ff5591656 cisco-vpnclient-3des-4.0.5.ebuild 1789
 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 563f5669f15cc3d71b1526e1e2b9db48 cisco-vpnclient-3des-4.6.02.0030.ebuild 2214
+MD5 2bce09a07768810f88cb22b21357997c cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2169
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
-MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
-MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
-MD5 5250e93732649bfbea046a13e84ff4a8 files/supported_device.patch 826
+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 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
+MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
+MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
+MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
+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 e9039147fbc74c136f4cc34f1b8baaf1 files/4.6.02.0030-supported_device.patch 807
+MD5 5250e93732649bfbea046a13e84ff4a8 files/4.6.00.0045-supported_device.patch 826
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 2ae1ebc42663..c5f7faf586d3 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-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.00.0045-r1.ebuild,v 1.2 2005/02/08 22:22:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.3 2005/04/14 12:45:45 wolf31o2 Exp $
 
 inherit eutils kernel-mod
 
@@ -37,7 +37,7 @@ src_unpack() {
 	# Jesse Becker <jbecker@speakeasy.net>
 	epatch ${FILESDIR}/driver_build_CC.patch
 	# Patch submitted to bug #69870 by James Ward <jennyandjamesward@yahoo.com>
-	epatch ${FILESDIR}/supported_device.patch
+	epatch ${FILESDIR}/${PV}-supported_device.patch
 }
 
 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
new file mode 100644
index 000000000000..7fc3e58e56cc
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild
@@ -0,0 +1,89 @@
+# 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.02.0030.ebuild,v 1.1 2005/04/14 12:45:45 wolf31o2 Exp $
+
+inherit eutils kernel-mod
+
+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-${MY_PV}.tar.gz"
+
+LICENSE="cisco-vpn-client"
+SLOT="${KV}"
+KEYWORDS="-* 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}
+
+	# Patch to allow use of alternate CC.  Patch submitted to bug #33488 by
+	# Jesse Becker <jbecker@speakeasy.net>
+	epatch ${FILESDIR}/driver_build_CC.patch
+	# 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
+}
+
+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
+	dolib.so 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
+	if kernel-mod_is_2_6_kernel; then
+		doins cisco_ipsec.ko
+	else
+		doins cisco_ipsec
+	fi
+
+	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/supported_device.patch b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch
index f21cfc7e0bfc..f21cfc7e0bfc 100644
--- a/net-misc/cisco-vpnclient-3des/files/supported_device.patch
+++ b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch
diff --git a/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch
new file mode 100644
index 000000000000..1b129f0fda34
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch
@@ -0,0 +1,51 @@
+--- interceptor.c.orig	2005-04-08 23:22:37.000000000 +0200
++++ interceptor.c	2005-04-08 23:23:19.000000000 +0200
+@@ -98,6 +98,23 @@
+     .notifier_call = handle_netdev_event,
+ };
+ 
++static int
++supported_device(struct net_device* dev)
++{
++    int rc=0;
++
++    if(dev->type == ARPHRD_ETHER)
++    {
++        rc=1;
++    }
++    else if(dev->type == ARPHRD_PPP)
++    {
++        rc=1;
++    }
++
++    return rc;
++}
++
+ static int __init
+ interceptor_init(struct net_device *dev)
+ {
+@@ -447,24 +464,6 @@
+     s->rc = 0;
+ }
+ 
+-static int
+-supported_device(struct net_device* dev)
+-{
+-    int rc=0;
+-
+-    if(dev->type == ARPHRD_ETHER)
+-    {
+-        rc=1;
+-    }
+-    else if(dev->type == ARPHRD_PPP)
+-    {
+-        rc=1;
+-    }
+-
+-    return rc;
+-}
+-
+-
+ static BINDING *
+ getbindingbydev(struct net_device *dev)
+ {
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030
new file mode 100644
index 000000000000..c03db938b69e
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030
@@ -0,0 +1 @@
+MD5 435dd370208643e526623ddfca6e938a vpnclient-linux-4.6.02.0030-k9.tar.gz 1671443