vpnc iproute fix

Package-Manager: portage-2.1_pre1

5 files changed, 61 insertions, 5 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 058b930cf20f..008ed2be341a 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.10 2005/10/24 08:30:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.11 2005/12/20 04:10:07 hanno Exp $
+
+*vpnc-0.3.3-r1 (20 Dec 2005)
+
+  20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/vpnc-iproute-fix-2.diff, +vpnc-0.3.3-r1.ebuild:
+  Real fix for iproute problem (from upstream).
 
 *vpnc-0.3.3 (24 Oct 2005)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index fe221b8d9b18..93341bb0803b 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 069348f252ace2327cf9be24687dd6ac ChangeLog 1233
+MD5 1c21418a2666a539c694f4b4186ce059 ChangeLog 1415
 MD5 d54e8a4d5935b1e97cff81e856bbf81a files/digest-vpnc-0.2 69
 MD5 a39fb4aa56f341f55789da220fe25c22 files/digest-vpnc-0.2_pre7 72
 MD5 93f950ddb46dfe6df41af92346c4176f files/digest-vpnc-0.3.2 61
 MD5 1a6e7a25b38584ea728eeb08436bf038 files/digest-vpnc-0.3.3 61
+MD5 1a6e7a25b38584ea728eeb08436bf038 files/digest-vpnc-0.3.3-r1 61
 MD5 728254537c733428bbb21c0e6c7f0f1d files/vpnc-0.3.2-64-bit.patch 8405
+MD5 04142b45c4b4157124fe43680279e7c3 files/vpnc-iproute-fix-2.diff 310
 MD5 23f1f1f9e89e90a8167152ac6a6dccb8 files/vpnc-iproute-fix.diff 318
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 MD5 39d4e738948eab214d837d8132a175ec vpnc-0.2.ebuild 816
 MD5 91d0df2f6face8216eb31781c454707f vpnc-0.2_pre7.ebuild 823
 MD5 902f606380fea4093d70e3c080cc1054 vpnc-0.3.2.ebuild 854
+MD5 91b0d95fadd080b5b9d9b1dff1d8f294 vpnc-0.3.3-r1.ebuild 892
 MD5 b0939d68e6a35e645e2969fe80634358 vpnc-0.3.3.ebuild 887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXJvmr2QksT29OyARAnJzAJwOUS5egi+1FEJUI5HP70TdtPtrygCbBtxC
-yVD6Aq9a94AM7ulC0aO3zxY=
-=mNqp
+iD8DBQFDp4SXr2QksT29OyARAu5HAJ48rgblyjxq2YEN4ggAYWuRutLDggCcCnMU
+ZUAry7VvTLm4+JK69noOIvQ=
+=25G0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/digest-vpnc-0.3.3-r1 b/net-misc/vpnc/files/digest-vpnc-0.3.3-r1
new file mode 100644
index 000000000000..0501b58e07cb
--- /dev/null
+++ b/net-misc/vpnc/files/digest-vpnc-0.3.3-r1
@@ -0,0 +1 @@
+MD5 e7518cff21326fe7eb9795b60c25ae6a vpnc-0.3.3.tar.gz 59939
diff --git a/net-misc/vpnc/files/vpnc-iproute-fix-2.diff b/net-misc/vpnc/files/vpnc-iproute-fix-2.diff
new file mode 100644
index 000000000000..8bcf5d4ebfa1
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-iproute-fix-2.diff
@@ -0,0 +1,11 @@
+--- vpnc-script.org	2005-10-28 17:59:18.593573250 +0200
++++ vpnc-script	2005-10-28 17:59:28.342182500 +0200
+@@ -72,7 +72,7 @@
+ 
+ if [ -n "$IPROUTE" ]; then
+ 	fix_ip_get_output () {
+-		sed 's/cache//;s/metric [0-9]\+ [0-9]\+//g'
++		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g'
+ 	}
+ 
+ 	set_vpngateway_route() {
diff --git a/net-misc/vpnc/vpnc-0.3.3-r1.ebuild b/net-misc/vpnc/vpnc-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..bebe4946d958
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.3.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.3.3-r1.ebuild,v 1.1 2005/12/20 04:10:07 hanno Exp $
+
+inherit eutils
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="http://www.unix-ag.uni-kl.de/~massar/vpnc/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libgcrypt-1.1.91
+	sys-apps/iproute2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/vpnc-iproute-fix-2.diff
+	# Workaround for crappy Makefile
+	sed -i -e "s:CFLAGS=-W -Wall -O:CFLAGS=${CFLAGS}:" Makefile
+}
+
+src_install() {
+	dobin vpnc vpnc-disconnect pcf2vpnc
+	dodoc ChangeLog README TODO VERSION
+	doman vpnc.8
+	insinto /etc
+	doins vpnc.conf
+	exeinto /etc/vpnc
+	doexe vpnc-script
+}