diff options
author | 2003-12-12 23:54:46 +0000 | |
---|---|---|
committer | 2003-12-12 23:54:46 +0000 | |
commit | e042792c96ecd9e63fc45cd50f256edd4b1fed9e (patch) | |
tree | 5f0719991a24716901d383f9ca96c16aff7a6b3f | |
parent | Added driver_build_CC.patch and version bumped to newest version. Closing bu... (diff) | |
download | gentoo-2-e042792c96ecd9e63fc45cd50f256edd4b1fed9e.tar.gz gentoo-2-e042792c96ecd9e63fc45cd50f256edd4b1fed9e.tar.bz2 gentoo-2-e042792c96ecd9e63fc45cd50f256edd4b1fed9e.zip |
Added driver_build_CC.patch and version bumped to newest version. Closing bugs #33488 and #35617.
-rw-r--r-- | net-misc/cisco-vpnclient-3des/ChangeLog | 12 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/Manifest | 6 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a-r1.ebuild | 9 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b.ebuild (renamed from net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild) | 11 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch (renamed from net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26.patch) | 0 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a | 1 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b | 1 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch | 24 | ||||
-rw-r--r-- | net-misc/cisco-vpnclient-3des/metadata.xml | 11 |
9 files changed, 65 insertions, 10 deletions
diff --git a/net-misc/cisco-vpnclient-3des/ChangeLog b/net-misc/cisco-vpnclient-3des/ChangeLog index 08ecb3cb3b62..7fc5c9decc82 100644 --- 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.4 2003/11/19 20:18:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/ChangeLog,v 1.5 2003/12/12 23:54:44 wolf31o2 Exp $ + +*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) diff --git a/net-misc/cisco-vpnclient-3des/Manifest b/net-misc/cisco-vpnclient-3des/Manifest index 8882b2d0744f..efee54123ab5 100644 --- a/net-misc/cisco-vpnclient-3des/Manifest +++ b/net-misc/cisco-vpnclient-3des/Manifest @@ -1,5 +1,7 @@ -MD5 eeaa0fdb000b90b7f118037661f4e7e5 cisco-vpnclient-3des-4.0.3b.ebuild 1807 -MD5 357a15ed504d74c14c16030efe509f3d cisco-vpnclient-3des-4.0.1a-r1.ebuild 1596 +MD5 d1ff82ec30a58ae6070057fe7c72aa15 cisco-vpnclient-3des-4.0.3b.ebuild 1678 +MD5 c6b89455b803bd2c4b02597c9a5e6171 ChangeLog 1147 +MD5 2a625f3fa7c83e13e0b76f09a084155a cisco-vpnclient-3des-4.0.1a-r1.ebuild 1755 +MD5 ceed2261b61bf3fd7ae45aed33117100 metadata.xml 460 MD5 968b0edd0fc5b128c1c78f03d0b49336 files/4.0.1a-linux26-gentoo.patch 686 MD5 33ae35139cf3bc489e1454c3cb550659 files/digest-cisco-vpnclient-3des-4.0.3b 79 MD5 71958f1bfd76d8fc63b6c5c1a3069b0b files/digest-cisco-vpnclient-3des-4.0.1a-r1 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 b97ebfe1af0e..a2cbede980c8 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. # 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.1 2003/11/19 20:18:47 vapier Exp $ +# $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 $ MY_PV=${PV/a/.A-k9} DESCRIPTION="Cisco VPN Client (3DES)" @@ -31,7 +31,12 @@ pkg_nofetch() { src_unpack() { unpack ${A} cd ${S} - [ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26.patch + [ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26-gentoo.patch + + # 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 () { diff --git a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b.ebuild index ed66dea8a3b6..f025c8daac9b 100644 --- a/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.1a.ebuild +++ b/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b.ebuild @@ -1,8 +1,8 @@ # 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.ebuild,v 1.3 2003/10/27 20:13:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cisco-vpnclient-3des/cisco-vpnclient-3des-4.0.3b.ebuild,v 1.1 2003/12/12 23:54:44 wolf31o2 Exp $ -MY_PV=${PV/a/.A-k9} +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" @@ -18,7 +18,7 @@ DEPEND="virtual/glibc S=${WORKDIR}/vpnclient -VPNDIR=/etc/CiscoSystemsVPNClient +VPNDIR="/etc/CiscoSystemsVPNClient" pkg_nofetch() { eerror "Please goto:" @@ -31,7 +31,10 @@ pkg_nofetch() { src_unpack() { unpack ${A} cd ${S} - [ "${KV:0:3}" == "2.6" ] && epatch ${FILESDIR}/${PV}-linux26.patch + + # 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 () { diff --git a/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26.patch b/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch index dab63e806668..dab63e806668 100644 --- a/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26.patch +++ b/net-misc/cisco-vpnclient-3des/files/4.0.1a-linux26-gentoo.patch diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a deleted file mode 100644 index b9e983367568..000000000000 --- a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.1a +++ /dev/null @@ -1 +0,0 @@ -MD5 d60cd032c8052caa7f18822e3fafad0e vpnclient-linux-4.0.1.A-k9.tar.gz 1312224 diff --git a/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b new file mode 100644 index 000000000000..ea34c5e4ad2d --- /dev/null +++ b/net-misc/cisco-vpnclient-3des/files/digest-cisco-vpnclient-3des-4.0.3b @@ -0,0 +1 @@ +MD5 0f5cc298818b311b3a2b7cdc7430eda8 vpnclient-linux-4.0.3.B-k9.tar.gz 1326493 diff --git a/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch b/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch new file mode 100644 index 000000000000..75df50b60aeb --- /dev/null +++ b/net-misc/cisco-vpnclient-3des/files/driver_build_CC.patch @@ -0,0 +1,24 @@ +--- driver_build.sh 2003-06-11 20:11:53.000000000 -0500 ++++ f 2003-11-14 18:00:49.000000000 -0600 +@@ -25,7 +25,7 @@ + echo "" + } + +-CC=cc ++CC=${CC:=gcc} + LD=ld + + KSRCDIR=$1 +@@ -40,6 +40,12 @@ + + INCLUDES="-I. -I${KSRCDIR}/include" + CFLAGS="-O2 -DCNI_LINUX_INTERFACE -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DHAVE_CONFIG_H" ++ ++echo | $CC -E -v -c - 2>&1 | grep __GNUC__ > /dev/null ++if [ "0" != "$?" ]; then ++ CFLAGS="$CFLAGS -D__GNUC__" ++fi ++ + case `uname -r` in + 2.6.*) + INCLUDES="${INCLUDES} -I${KSRCDIR}/include/asm-i386/mach-default" diff --git a/net-misc/cisco-vpnclient-3des/metadata.xml b/net-misc/cisco-vpnclient-3des/metadata.xml new file mode 100644 index 000000000000..934641b9a35b --- /dev/null +++ b/net-misc/cisco-vpnclient-3des/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer> + <email>wolf31o2@gentoo.org</email> + <name>Chris Gianelloni</name> +</maintainer> +<longdescription> +This is the Cisco VPN Client, which is used to connect to Cisco VPN hardware, such as a VPN Concentrator, VPN Accelerator, or a PIX Firewall. This client is bound by export restrictions. +</longdescription> +</pkgmetadata> |