Version bumped to latest version and updated all ebuilds to use the kernel-mod eclass...

diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog
index cf876aa674a1545ad1cc2664bafaae6dd2c4ce70..1d66967a63722c39f6857417b62c714fbe6b6a75 100644 (file)
--- a/net-misc/cisco-vpnclient-3des/ChangeLog
+++ b/net-misc/cisco-vpnclient-3des/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/cisco-vpnclient-3des
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.19 2004/08/25 00:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.20 2004/11/04 01:18:27 wolf31o2 Exp $
+
+*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:

diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest
index 1da0ff4c490f75e1e531c494cc74f52833e93aee..d0f8ac3c4df8b6f620c1909cb4e578d7ba1176fb 100644 (file)
--- a/net-misc/cisco-vpnclient-3des/Manifest
+++ b/net-misc/cisco-vpnclient-3des/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a7d27154b2f53ef6e7a8bbbe59fdf2f ChangeLog 3974
-MD5 6599d9a77e743f14728d01b4c67c5b14 cisco-vpnclient-3des-4.0.1a-r1.ebuild 1770
+MD5 e880c1eb732c2c02a0f52dd2fdd6de6a cisco-vpnclient-3des-4.0.5.ebuild 1789
+MD5 a062393ef10d6dd9848fdbcc9bf429fd cisco-vpnclient-3des-4.6.00.0045.ebuild 2004
+MD5 b76399024efc481b4dadef25a254c31b cisco-vpnclient-3des-4.0.3b-r4.ebuild 2164
+MD5 79d84348b74721ad24f96847ad2346bc ChangeLog 4411
+MD5 9ecd26f9a6974c847392926604c68e9b cisco-vpnclient-3des-4.0.1a-r1.ebuild 1795
 MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460
-MD5 ae95fc7e09cd212607b833d565556473 cisco-vpnclient-3des-4.0.3b-r4.ebuild 2152
-MD5 07e1eda5b9e9b622e9aaabc38da684bc cisco-vpnclient-3des-4.0.5.ebuild 1845
+MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
 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 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 79
+MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
+MD5 bc0669d18439e508bd493312d307afa4 files/digest-cisco-vpnclient-3des-4.6.00.0045 83
 MD5 ca9acd2b20bd1b92519e520a8ec5a5c2 files/vpnclient.rc 2306
-MD5 0181d77c1dd8b6929b7dd81fb2db45f1 files/atheros.patch 478
 MD5 fffa4fdd9a7bd0eeae2d4832895ce99f files/driver_build_CC.patch 547
-MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b-r4 79
-MD5 43220e6569806f24251abfbb44742532 files/digest-cisco-vpnclient-3des-4.0.5 81
-MD5 49c26fcaba6aec15a8116f8868e39d88 files/register_netdevice.patch 1233
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD4DBQFBK9eXHTu7gpaalycRAnWEAJiRDDQ0eX1UbEf3LU1gGiADYG0iAKDYaYsS
-FRq2/M0Yb1jVqemU7Giw/Q==
-=BLTJ
------END PGP SIGNATURE-----

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 7da51985cfce584d45ed8e1c7bd19df057406f9b..ab866232be65edb0184321e7fda367303e984995 100644 (file)
--- 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,8 @@
 # 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.1a-r1.ebuild,v 1.7 2004/07/01 20:54:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild,v 1.8 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils
+inherit eutils kernel-mod
 
 MY_PV=${PV/a/.A-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -34,7 +34,9 @@ pkg_nofetch() {
 src_unpack() {
        unpack ${A}
        cd ${S}
-       [ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26-gentoo.patch
+       if kernel-mod_is_2_6_kernel; 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)
@@ -43,7 +45,7 @@ src_unpack() {
 }
 
 src_compile () {
-       check_KV
+       unset ARCH
        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
@@ -74,3 +76,4 @@ 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 574b80511eec0bb1a5afce85a184c58321a13f2f..fb6e2c5144cf7bcd99bbcb6c192173af8aaa356c 100644 (file)
--- 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,8 +1,8 @@
 # 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.3b-r4.ebuild,v 1.4 2004/07/01 20:54:27 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b-r4.ebuild,v 1.5 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils
+inherit eutils kernel-mod
 
 MY_PV=${PV/b/.B-k9}
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -48,7 +48,7 @@ src_unpack() {
 }
 
 src_compile () {
-       check_KV
+       unset ARCH
        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 6f0d1ac3a71e7ae284f6feb547ec0a22e28af003..ffa57f5f8bc9a00906aaa9071f7fa70243661ef8 100644 (file)
--- 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-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.3 2004/08/25 00:04:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.5.ebuild,v 1.4 2004/11/04 01:18:27 wolf31o2 Exp $
 
-inherit eutils kmod
+inherit eutils kernel-mod
 
 MY_PV=${PV}.Rel-k9
 DESCRIPTION="Cisco VPN Client (3DES)"
@@ -11,7 +11,7 @@ SRC_URI="vpnclient-linux-${MY_PV}.tar.gz"
 
 LICENSE="cisco-vpn-client"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 RESTRICT="fetch"
 
@@ -39,10 +39,7 @@ src_unpack() {
 }
 
 src_compile () {
-       check_KV
-       if is_kernel 2 5 || is_kernel 2 6 ; then
-               unset ARCH
-       fi
+       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'"
@@ -62,7 +59,7 @@ src_install() {
        dobin ipseclog cisco_cert_mgr
 
        insinto /lib/modules/${KV}/CiscoVPN
-       if is_kernel 2 5 || is_kernel 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.00.0045.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
new file mode 100644 (file)
index 0000000..a34a70e
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.00.0045.ebuild
@@ -0,0 +1,86 @@
+# 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.ebuild,v 1.1 2004/11/04 01:18:27 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
+}
+
+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
+       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/digest-cisco-vpnclient-3des-4.6.00.0045 b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045
new file mode 100644 (file)
index 0000000..b3c3b9a
--- /dev/null
+++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.00.0045
@@ -0,0 +1 @@
+MD5 4204c9cc10d57d3e0d8de0fc7548bbf5 vpnclient-linux-4.6.00.0045-k9.tar.gz 1406359