From 58d9f7ff39e6bf7c6d0a17c9d1e2347c445f1c06 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 14 Apr 2005 12:45:45 +0000 Subject: Renamed supported_device.patch to 4.6.00.0045-supported_device.patch. Added 4.6.02.0030 ebuild provided by Stefan Skotte and closing bug #88408. (Portage version: 2.0.51.19) --- net-misc/cisco-vpnclient-3des/ChangeLog | 13 +++- .../cisco-vpnclient-3des-4.6.00.0045-r1.ebuild | 4 +- .../cisco-vpnclient-3des-4.6.02.0030.ebuild | 89 ++++++++++++++++++++++ .../files/4.6.00.0045-supported_device.patch | 51 +++++++++++++ .../files/4.6.02.0030-supported_device.patch | 51 +++++++++++++ .../files/digest-cisco-vpnclient-3des-4.6.02.0030 | 1 + .../files/supported_device.patch | 51 ------------- 7 files changed, 206 insertions(+), 54 deletions(-) create mode 100644 net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.6.02.0030.ebuild create mode 100644 net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch create mode 100644 net-misc/cisco-vpnclient-3des/files/4.6.02.0030-supported_device.patch create mode 100644 net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.6.02.0030 delete mode 100644 net-misc/cisco-vpnclient-3des/files/supported_device.patch (limited to 'net-misc') 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 + +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 and closing bug + #88408. 08 Feb 2005; Chris Gianelloni cisco-vpnclient-3des-4.6.00.0045-r1.ebuild: 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 epatch ${FILESDIR}/driver_build_CC.patch # Patch submitted to bug #69870 by James Ward - 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 + epatch ${FILESDIR}/driver_build_CC.patch + # Patch submitted to bug #69870 by James Ward + # fixed to work on 4.6.02.0030 + 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/4.6.00.0045-supported_device.patch b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch new file mode 100644 index 000000000000..f21cfc7e0bfc --- /dev/null +++ b/net-misc/cisco-vpnclient-3des/files/4.6.00.0045-supported_device.patch @@ -0,0 +1,51 @@ +--- interceptor.c.orig 2004-11-02 07:27:19.296825440 -0700 ++++ interceptor.c 2004-11-02 07:22:46.545289976 -0700 +@@ -100,6 +100,24 @@ + .notifier_call = handle_netdev_event, + }; + ++static int ++inline 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) + { +@@ -476,23 +494,6 @@ + s->rc = 0; + } + +-static int +-inline 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/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 diff --git a/net-misc/cisco-vpnclient-3des/files/supported_device.patch b/net-misc/cisco-vpnclient-3des/files/supported_device.patch deleted file mode 100644 index f21cfc7e0bfc..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/supported_device.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- interceptor.c.orig 2004-11-02 07:27:19.296825440 -0700 -+++ interceptor.c 2004-11-02 07:22:46.545289976 -0700 -@@ -100,6 +100,24 @@ - .notifier_call = handle_netdev_event, - }; - -+static int -+inline 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) - { -@@ -476,23 +494,6 @@ - s->rc = 0; - } - --static int --inline 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) -- cgit v1.2.3-65-gdbad