Adding atheros patch, submitted by Dominic Battre and closing bug #48680.

6 files changed, 110 insertions, 5 deletions

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index 59c3c29bc56b..c935e27e2383 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.12 2004/04/12 21:51:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.13 2004/04/24 15:22:30 wolf31o2 Exp $
+
+*cisco-vpnclient-3des-4.0.3b-r4 (24 Apr 2004)
+
+  24 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> +files/atheros.patch,
+  +cisco-vpnclient-3des-4.0.3b-r4.ebuild:
+  Adding atheros patch, submitted by Dominic Battre and closing bug #48680.
 
   12 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   cisco-vpnclient-3des-4.0.3b-r2.ebuild,
diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 056900b5f813..d68bf5105c02 100644
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,10 +1,13 @@
 MD5 6b1c8ad3b7270595a7b52daec467c080 cisco-vpnclient-3des-4.0.3b-r3.ebuild 1995
-MD5 6e83cde53f3b6bd992090ba844235462 ChangeLog 2898
-MD5 2a625f3fa7c83e13e0b76f09a084155a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1755
+MD5 913b8349c74d547235dd489afa4daeea cisco-vpnclient-3des-4.0.3b-r4.ebuild 2161
+MD5 0147a3835e3d5f6e588e4cab23cfd778 ChangeLog 3140
+MD5 5e41e3f2ee38a399481d55a07319dc07 cisco-vpnclient-3des-4.0.1a-r1.ebuild 1755
 MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
+MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686
 MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r3 79
+MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
 MD5 3608e2c6a4c04b8f050f590b9beacac3 files/vpnclient.rc 2504
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
index a2cbede980c8..1aa49dd73e09 100644
--- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1a-r1.ebuild,v 1.2 2003/12/12 23:54:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.3 2004/04/24 15:22:30 wolf31o2 Exp $
 
 MY_PV=${PV/a/.A-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
new file mode 100644
index 000000000000..14dfa59ad3df
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.3b-r4.ebuild,v 1.1 2004/04/24 15:22:30 wolf31o2 Exp $
+
+inherit eutils
+
+MY_PV=${PV/b/.B-k9}
+DESCRIPTION="Cisco VPN Client (3DES)"
+HOMEPAGE="http://www.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"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="virtual/glibc
+	virtual/linux-sources
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/vpnclient
+
+VPNDIR="/etc/CiscoSystemsVPNClient"
+
+pkg_nofetch() {
+	eerror "Please goto:"
+	eerror " ${HOMEPAGE}"
+	eerror "and download"
+	eerror " ${A}"
+	eerror "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 to allow module to work with kernel 2.6.x.  Patch submitted to bug
+	# #40730 by Kent Skaar <skaar@aol.net>.  Patch originally submitted to LMKL
+	# by Gertjan van Wingerde <gwingerde@home.nl>.
+	epatch ${FILESDIR}/register_netdevice.patch
+	# Patch to allow module to work with Atheros chipsets.  Patch submitted to
+	# bug #48680 by Dominic Battre <dominic.battre@gmx.de>
+	epatch ${FILESDIR}/atheros.patch
+}
+
+src_compile () {
+	check_KV
+	sh ./driver_build.sh /lib/modules/${KV}/build
+	[ ! -f ./cisco_ipsec ] && die "Failed to make module 'cisco_ipsec'"
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient_init
+	sed -i "s#@VPNBINDIR@#/usr/bin#" vpnclient.ini.in
+}
+
+src_install() {
+	exeinto /etc/init.d
+	#newexe vpnclient_init vpnclient
+	newexe ${FILESDIR}/vpnclient.rc vpnclient
+
+	exeinto /usr/bin
+	exeopts -m0711
+	doexe vpnclient
+	exeopts -m4711
+	doexe cvpnd
+	dobin ipseclog cisco_cert_mgr
+
+	insinto /lib/modules/${KV}/CiscoVPN
+	doins cisco_ipsec
+
+	insinto ${VPNDIR}
+	newins vpnclient.ini.in 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."
+}
diff --git a/net-misc/cisco-vpnclient-3des/files/atheros.patch b/net-misc/cisco-vpnclient-3des/files/atheros.patch
new file mode 100644
index 000000000000..b3ff9870dd63
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/atheros.patch
@@ -0,0 +1,13 @@
+diff -U2 interceptor.c.orig interceptor.c
+--- interceptor.c.orig	2003-10-30 02:27:34.000000000 +0100
++++ interceptor.c	2004-04-19 21:04:08.388323856 +0200
+@@ -509,4 +509,9 @@
+         rc = 1;
+     }
++    else if (!strncmp(dev->name, "ath", 3)
++             && (dev->name[3] >= '0' && dev->name[3] <= '9'))
++    {
++        rc = 1;
++    }
+     else if (!strncmp(dev->name, "ppp", 3) && (dev->name[3] >= '0' &&
+                                                dev->name[3] <= '9'))
diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4
new file mode 100644
index 000000000000..ea34c5e4ad2d
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b-r4
@@ -0,0 +1 @@
+MD5 0f5cc298818b311b3a2b7cdc7430eda8 vpnclient-linux-4.0.3.B-k9.tar.gz 1326493