diff options
Diffstat (limited to 'net-misc/cisco-vpnclient-3des')
13 files changed, 120 insertions, 487 deletions
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog index 5db464fcfa17..2c440b1a6c3d 100644 --- a/net-misc/cisco-vpnclient-3des/ChangeLog +++ b/net-misc/cisco-vpnclient-3des/ChangeLog @@ -1,213 +1,8 @@ # 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.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, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - 0->KV for bug #112817. - - 15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - KV_MINOR->KV_PATCH - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Fixing my overzealous sed call earlier. - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Changed conditions to match all kernels from 2.6.14 up. - - 14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild, - cisco-vpnclient-3des-4.6.03.0190.ebuild, - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Changed SLOT to 0. - - 13 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190-r1.ebuild: - Forcing to stable since 2.6.14 has gone stable in the tree and this patch is - required to compile against 2.6.14 successfully. - -*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, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - cisco-vpnclient-3des-4.6.02.0030.ebuild: - kernel-mod -> linux-info for kernel team. - - 06 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190.ebuild: - Fix bug #98070. - - 28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.03.0190.ebuild: - Changed dolib.so to doins to fix problems loading library on amd64. Closing - bug #97269. - -*cisco-vpnclient-3des-4.6.03.0190 (02 Jun 2005) - - 02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.6.02.0030.ebuild, - +cisco-vpnclient-3des-4.6.03.0190.ebuild: - Added information about rp_filter for bug #90693. Version bumped to version - 4.5.03.0190, and closing bug #94755. - -*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: - Marking stable on x86 and removing amd64 KEYWORDS, which were accidentally - added by me in testing and were never removed. - -*cisco-vpnclient-3des-4.6.00.0045-r1 (09 Nov 2004) - - 09 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +files/supported_device.patch, - +cisco-vpnclient-3des-4.6.00.0045-r1.ebuild, - -cisco-vpnclient-3des-4.6.00.0045.ebuild: - Added supported device patch from James Ward <jennyandjamesward@yahoo.com> - and closing bugs #68738, #70365, and #70374. - -*cisco-vpnclient-3des-4.6.00.0045 (03 Nov 2004) - - 03 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild, cisco-vpnclient-3des-4.0.5.ebuild, - +cisco-vpnclient-3des-4.6.00.0045.ebuild: - Version bumped to latest version and updated all ebuilds to use the - kernel-mod eclass rather than kmod eclass. This should resolve bugs #68738, - #68449, and #69870. - - 24 Aug 2004; Mike Frysinger <vapier@gentoo.org> files/vpnclient.rc, - cisco-vpnclient-3des-4.0.5.ebuild: - Rewrite the vpnclient script to make it flow better (eerror/exit is not the - way to go; eend/return is). - -*cisco-vpnclient-3des-4.0.5 (11 Aug 2004) - - 11 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> - +cisco-vpnclient-3des-4.0.5.ebuild: - Bumped to latest version. - - 01 Jul 2004; Jon Hood <squinky86@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild: - change virtual/glibc to virtual/libc - - 26 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> - -cisco-vpnclient-3des-4.0.3b-r3.ebuild, - cisco-vpnclient-3des-4.0.3b-r4.ebuild: - Removing old ebuild and changing HOMEPAGE. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild: - Add inherit eutils - -*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, - cisco-vpnclient-3des-4.0.3b-r3.ebuild: - Adding empty IUSE, removing old 4.0.3b-r2 ebuild, and marking 4.0.3b-r3 stable - on x86. - - 16 Mar 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r2.ebuild: - Added inherit eutils since we use epatch. - -*cisco-vpnclient-3des-4.0.3b-r3 (25 Feb 2004) - - 25 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r3.ebuild, files/register_netdevice.patch: - Adding patch to allow cisco_ipsec module to work with kernel 2.6.x, submitted - by Kent Skaar <skaar@aol.net> to bugzilla and originally submitted to LMKL by - by Gertjan van Wingerde <gwingerde@home.nl>. Closing bug #40730. - - 14 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org> files/vpnclient.rc: - Removing -qs from insmod line to allow proper support with newer - module-init-tools. Closing bug #37678. - - 13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r1.ebuild, cisco-vpnclient-3des-4.0.3b.ebuild: - Removing older revisions. - -*cisco-vpnclient-3des-4.0.3b-r2 (13 Jan 2004) - - 13 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r2.ebuild, files/vpnclient.rc: - Updated vpnclient init script for proper 2.6 kernel handling and also to - remove console messages at boot. Closing Bug #37678. - -*cisco-vpnclient-3des-4.0.3b-r1 (08 Jan 2004) - - 08 Jan 2004; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.3b-r1.ebuild, files/vpnclient.rc: - Updated init script to make it compatible with /sbin/runscript.sh. The script - was provided by Lars Corzilius (gentoo@flowsterritory.de) and updated by me. - Closing bug #36419. - -*cisco-vpnclient-3des-4.0.3b (12 Dec 2003) - - 12 Dec 2003; Chris Gianelloni <wolf31o2@gentoo.org> - cisco-vpnclient-3des-4.0.1a-r1.ebuild, cisco-vpnclient-3des-4.0.1a.ebuild, - cisco-vpnclient-3des-4.0.3b.ebuild, metadata.xml, - files/4.0.1a-linux26-gentoo.patch, files/4.0.1a-linux26.patch, - files/driver_build_CC.patch: - Added driver_build_CC.patch by Jesse Becker (jbecker@speakeasy.net) and - version bumped to newest version. Closing bugs #33488 and #35617. - -*cisco-vpnclient-3des-4.0.1a-r1 (19 Nov 2003) - - 19 Nov 2003; Mike Frysinger <vapier@gentoo.org> : - Fix typo in patch #33848. +# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.1 2003/07/05 12:42:36 blauwers Exp $ *cisco-vpnclient-3des-4.0.1a (05 JUL 2003) - 27 Oct 2003; Mike Frysinger <vapier@gentoo.org> : - Small patch so it'll work in linux-2.6.x. - - 09 Jul 2003; Mike Frysinger <vapier@gentoo.org> : - Cleaned up ebuild, made it use $KV properly. - 05 JUL 2003; Bart Lauwers <blauwers@gentoo.org> : Initial import. diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest index 9dc156396d44..923c0af965ea 100644 --- a/net-misc/cisco-vpnclient-3des/Manifest +++ b/net-misc/cisco-vpnclient-3des/Manifest @@ -1,27 +1,2 @@ -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 -MD5 ff48cc35afdc04584fe99de699b2ae54 cisco-vpnclient-3des-4.6.00.0045-r1.ebuild 2154 -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 -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 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 -MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460 +MD5 5a4e117d24b6bfda33e0803900c66406 cisco-vpnclient-3des-4.0.1a.ebuild 618 +MD5 e87a2dcccbebe59023e70bb5fa5fbca3 files/digest-cisco-vpnclient-3des-4.0.1a 79 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 a28e3130b29e..b97ebfe1af0e 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,8 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2003 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.13 2005/11/20 17:58:35 wolf31o2 Exp $ - -inherit eutils linux-info +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.1 2003/11/19 20:18:47 vapier Exp $ MY_PV=${PV/a/.A-k9} DESCRIPTION="Cisco VPN Client (3DES)" @@ -10,12 +8,11 @@ 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="0" +SLOT="${KV}" KEYWORDS="-* x86" RESTRICT="fetch" -IUSE="" -DEPEND="virtual/libc +DEPEND="virtual/glibc virtual/linux-sources >=sys-apps/sed-4" @@ -34,18 +31,11 @@ pkg_nofetch() { src_unpack() { unpack ${A} cd ${S} - if kernel_is 2 6; then - epatch ${FILESDIR}/${PV}-linux26-gentoo.patch - fi - - # Patch to allow use of alternate CC. Patch submitted to bug #33488 by - # Jesse Becker (jbecker@speakeasy.net) - epatch ${FILESDIR}/driver_build_CC.patch - + [ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26.patch } src_compile () { - unset ARCH + 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 @@ -76,4 +66,3 @@ src_install() { pkg_postinst() { einfo "You must run \`/etc/init.d/vpnclient start\` before using the client." } - 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 index 9687bd24ce26..14dfa59ad3df 100644 --- 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 @@ -1,21 +1,21 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.10 2005/11/20 17:58:35 wolf31o2 Exp $ +# $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 linux-info +inherit eutils MY_PV=${PV/b/.B-k9} DESCRIPTION="Cisco VPN Client (3DES)" -HOMEPAGE="http://cco.cisco.com/en/US/products/sw/secursw/ps2308/index.html" +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="0" +SLOT="${KV}" KEYWORDS="-* x86" RESTRICT="fetch" IUSE="" -DEPEND="virtual/libc +DEPEND="virtual/glibc virtual/linux-sources >=sys-apps/sed-4" @@ -48,7 +48,7 @@ src_unpack() { } src_compile () { - unset ARCH + 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 diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild index 2d8f5ed5ce36..d0e32f86b179 100644 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild +++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2004 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.0.5.ebuild,v 1.9 2005/11/20 17:58:35 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild,v 1.1 2004/08/11 16:03:52 wolf31o2 Exp $ -inherit eutils linux-info +inherit eutils kmod MY_PV=${PV}.Rel-k9 DESCRIPTION="Cisco VPN Client (3DES)" @@ -10,10 +10,10 @@ 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="0" -KEYWORDS="-* x86" -IUSE="" +SLOT="${KV}" +KEYWORDS="-* ~x86" RESTRICT="fetch" +IUSE="" DEPEND="virtual/libc virtual/linux-sources @@ -24,9 +24,11 @@ S=${WORKDIR}/vpnclient VPNDIR="/etc/CiscoSystemsVPNClient" pkg_nofetch() { - einfo "Please visit:" - einfo " ${HOMEPAGE}" - einfo "and download ${A} to ${DISTDIR}" + eerror "Please goto:" + eerror " ${HOMEPAGE}" + eerror "and download" + eerror " ${A}" + eerror "to ${DISTDIR}" } src_unpack() { @@ -39,9 +41,12 @@ src_unpack() { } src_compile () { - unset ARCH + check_KV + if is_kernel 2 5 || is_kernel 2 6 ; then + unset ARCH + fi sh ./driver_build.sh /lib/modules/${KV}/build - [ ! -f ./cisco_ipsec -a ! -f ./cisco_ipsec.ko ] \ + [ [ ! -f ./cisco_ipsec ] || [ ! -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.in @@ -59,8 +64,10 @@ src_install() { dobin ipseclog cisco_cert_mgr insinto /lib/modules/${KV}/CiscoVPN - if kernel_is 2 6 ; then + if is_kernel 2 5 || is_kernel 2 6 ; then doins cisco_ipsec.ko + dosed 's/VPNMOD="cisco_ipsec"/VPNMOD="cisco_ipsec.ko"/' \ + /etc/init.d/vpnclient else doins cisco_ipsec fi 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 e01db8a77071..464ab4c83d2b 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,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2004 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.7 2005/11/20 17:58:35 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045-r1.ebuild,v 1.1 2004/11/09 20:24:13 wolf31o2 Exp $ -inherit eutils linux-info +inherit eutils kernel-mod MY_PV=${PV}-k9 DESCRIPTION="Cisco VPN Client (3DES)" @@ -10,8 +10,8 @@ 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="0" -KEYWORDS="-* x86" +SLOT="${KV}" +KEYWORDS="-* ~x86 ~amd64" IUSE="" RESTRICT="fetch" @@ -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}/${PV}-supported_device.patch + epatch ${FILESDIR}/supported_device.patch } src_compile () { @@ -67,7 +67,7 @@ src_install() { dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient insinto /lib/modules/${KV}/CiscoVPN - if kernel_is 2 6; then + if kernel-mod_is_2_6_kernel; then doins cisco_ipsec.ko else doins cisco_ipsec 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 index c0582d8e6abf..7fc3e58e56cc 100644 --- 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 @@ -1,8 +1,8 @@ # 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.6 2005/11/20 17:58:35 wolf31o2 Exp $ +# $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 linux-info +inherit eutils kernel-mod MY_PV=${PV}-k9 DESCRIPTION="Cisco VPN Client (3DES)" @@ -10,7 +10,7 @@ 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="0" +SLOT="${KV}" KEYWORDS="-* x86" IUSE="" RESTRICT="fetch" @@ -68,7 +68,7 @@ src_install() { dosym /opt/cisco-vpnclient/bin/vpnclient /usr/bin/vpnclient insinto /lib/modules/${KV}/CiscoVPN - if kernel_is 2 6; then + if kernel-mod_is_2_6_kernel; then doins cisco_ipsec.ko else doins cisco_ipsec @@ -83,10 +83,7 @@ src_install() { pkg_postinst() { einfo "You must run \`/etc/init.d/vpnclient start\` before using the client." - echo + echo "" ewarn "Configuration directory has moved to ${VPNDIR}!" - echo - ewarn "If you are experiencing problems keeping a connection alive, please" - ewarn "check bug #90693 for more information about disabling rp_filter." - echo + echo "" } 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 index d65f07cc4c93..e9b460a7dd1c 100644 --- 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 @@ -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.03.0190-r1.ebuild,v 1.7 2005/11/20 17:58:35 wolf31o2 Exp $ +# $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 @@ -10,8 +10,8 @@ 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" +SLOT="${KV}" +KEYWORDS="~x86 ~amd64" IUSE="" RESTRICT="fetch" @@ -33,11 +33,8 @@ 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 + #Fix problems with the linux 2.6.14 kernel. + kernel_is 2 6 14 && epatch ${FILESDIR}/${PV}-2.6.14.patch } src_compile () { diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild index a249d4706b19..1f4c91ec16eb 100644 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild +++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.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.03.0190.ebuild,v 1.6 2005/11/20 17:58:35 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.03.0190.ebuild,v 1.1 2005/06/02 14:32:11 wolf31o2 Exp $ MY_PV=${PV}-k9 DESCRIPTION="Cisco VPN Client (3DES)" @@ -8,7 +8,7 @@ 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" +SLOT="${KV}" KEYWORDS="~x86 ~amd64" IUSE="" RESTRICT="fetch" @@ -47,8 +47,7 @@ src_install() { doexe cvpnd into /opt/cisco-vpnclient/ dobin ipseclog cisco_cert_mgr - insinto /opt/cisco-vpnclient/lib - doins libvpnapi.so + dolib.so libvpnapi.so insinto /opt/cisco-vpnclient/include doins vpnapi.h dodir /usr/bin 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 deleted file mode 100644 index f1e32469cbe7..000000000000 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.7.00.0640.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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 deleted file mode 100644 index b560a444a8ee..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/4.7.00.0640-2.6.14.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 deleted file mode 100644 index 97461025e375..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.7.00.0640 +++ /dev/null @@ -1 +0,0 @@ -MD5 81b4749874b1123bdceca5cecad4e659 vpnclient-linux-x86_64-4.7.00.0640-k9.tar.gz 2043002 diff --git a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc index 0a1ae4a4c6a1..d16759afe633 100644 --- a/net-misc/cisco-vpnclient-3des/files/vpnclient.rc +++ b/net-misc/cisco-vpnclient-3des/files/vpnclient.rc @@ -1,115 +1,113 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/files/vpnclient.rc,v 1.6 2004/08/25 00:04:32 vapier Exp $ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later opts="start stop status" VPNCLIENT="/usr/bin/vpnclient" VPNDEV="cipsec0" +VPNMOD="cisco_ipsec" +if [ -x /usr/bin/id ]; then + ID="/usr/bin/id" +elif [ -x /bin/id ]; then + ID="/bin/id" +else + echo "Unable to determine access level" + exit 1 +fi +WHOAMI=`$ID|sed -e 's/(.*//'` depend() { need net } -checkconfig() { - export KV="$(uname -r)" - - export VPNMOD="cisco_ipsec" - case "${KV}" in - 2.6.*|2.5.*) VPNMOD_FILE="${VPNMOD}.ko";; - 2.4.*|2.2.*|2.0.*) VPNMOD_FILE="${VPNMOD}.o";; - *) - eerror "Kernel version '${KV}' is not supported" - return 1;; - esac - export VPNMOD_FILE - return 0 -} - start() { - checkconfig || return 1 - - local PC="" - - ebegin "Starting Cisco VPN Client" + ebegin "Starting Cisco VPN Client: " if [ -f /etc/resolv.conf.vpnbackup ]; then - einfo "restoring /etc/resolv.conf" + echo "restoring /etc/resolv.conf" mv /etc/resolv.conf.vpnbackup /etc/resolv.conf fi - if [ -d /lib/modules/preferred ]; then - PC="/lib/modules/preferred/CiscoVPN" + PC=/lib/modules/preferred/CiscoVPN else - PC="/lib/modules/${KV}/CiscoVPN" + PC=/lib/modules/`uname -r`/CiscoVPN fi - - if [ -d "${PC}" ] ; then - /sbin/insmod ${PC}/${VPNMOD_FILE} >/dev/null 2>&1 + if [ -d $PC ] ; then + /sbin/modprobe -q ${PC}/${VPNMOD} if [ "$?" != "0" ] ; then - eend 1 "Failed to load module '${VPNMOD}'" - return 1 + echo "Failed to load module ${VPNMOD}" + exit 1 fi else - eend 1 "module directory '$PC' not found" - return 1 + echo "module directory $PC not found." + exit 1 fi - - if [ "${KV:0:3}" == "2.0" ] ; then - # This is only needed due to a bug in 2.0.x kernels that affects - # arp lookups. - ifconfig $VPNDEV 222.222.222.222 ; - if [ "$?" != "0" ] ; then - eerror "Failed (ifconfig)" - /sbin/rmmod ${VPNMOD} + case "`uname -r`" in + 2.6.*) + ;; + 2.5.*) + ;; + 2.4.*) + ;; + 2.2.*) + ;; + 2.0.*) + # + # This is only needed due to a bug in 2.0.x kernels that affects + # arp lookups. + # + ifconfig $VPNDEV 222.222.222.222 ; + if [ "$?" != "0" ] ; then + echo "Failed (ifconfig)" + /sbin/modprobe -qr ${VPNMOD} + exit 1 + fi + ;; + *) + echo "Failed (unsupported Linux version)" + /sbin/modprobe -qr ${VPNMOD} exit 1 - fi - fi - - eend 0 + ;; + esac + eend $? } stop() { - checkconfig || return 1 - - ebegin "Stopping Cisco VPN Client" - + ebegin "Stopping Cisco VPN Client: " if [ -x $VPNCLIENT ]; then $VPNCLIENT disconnect > /dev/null 2>&1 fi /sbin/lsmod | grep -q "${VPNMOD}" if [ "$?" != "0" ] ; then - eend 1 "Failed: module ${VPNMOD} is not running" - return 1 + echo "module ${VPNMOD} is not running." + exit 1 fi /sbin/ifconfig $VPNDEV down if [ "$?" != "0" ] ; then - eend 1 "Failed (ifconfig)" - return 1 + echo "Failed (ifconfig)" + exit 1 fi - /sbin/rmmod ${VPNMOD} + /sbin/modprobe -qr ${VPNMOD} if [ "$?" != "0" ] ; then - eend 1 "Failed (rmmod)" - return 1 + echo "Failed (rmmod)" + exit 1 fi - - eend 0 + eend $? } status() { - checkconfig || return 1 - + /sbin/lsmod | egrep 'Module' /sbin/lsmod | egrep "${VPNMOD}" if [ "$?" != "0" ] ; then - eerror "Failed (lsmod ${VPNMOD}): the VPN module is not loaded" - return 1 + echo + echo "Status Failed (lsmod ${VPNMOD}) - The VPN module is not loaded." fi echo /sbin/ifconfig $VPNDEV if [ "$?" != "0" ] ; then echo - eerror "Failed (ifconfig ${VPNDEV}): the virtual interface is not present" - return 1 + echo "Status Failed (ifconfig ${VPNDEV}) - The virtual interface is not present." + exit 1 fi } |