Version Bump, #392999, fix for compilation with as-needed, respect CC, ensure correct deps, #397511

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

6 files changed, 157 insertions, 32 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index f79231c48221..8cde8984d35c 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vpnc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.98 2011/07/03 17:30:21 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.99 2012/02/14 19:14:11 jlec Exp $
+
+*vpnc-0.5.3_p514 (14 Feb 2012)
+
+  14 Feb 2012; Justin Lecher <jlec@gentoo.org> vpnc-0.5.3_p457-r2.ebuild,
+  +vpnc-0.5.3_p514.ebuild, +files/vpnc-0.5.3_p514-as-needed.patch,
+  metadata.xml:
+  Version Bump, #392999, fix for compilation with as-needed, respect CC, ensure
+  correct deps, #397511
 
 *vpnc-0.5.3_p457-r2 (03 Jul 2011)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 756fd6849d3a..3a8a75ceed40 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX vpnc-0.5.3_p514-as-needed.patch 1386 RMD160 9e2fd78cf75b828abd56044960153453260a9789 SHA1 bb81b07c579cf7e522610162d89e7afc44756c0e SHA256 d7fb90fe49d1758b334755542e84b679abd2aab3ce79b6ac4ccd5a909394fd8f
 AUX vpnc-2.init 2323 RMD160 b9bf723d06025d9be67b326deb3a1ca64f72107c SHA1 c89ce60f522fc46f5b989bc8b7e28564a3a506fa SHA256 b64e86af0109310a8f4c0ea188aeb9b3a1e732500b00deeb2ad0345b25e0d7f2
 AUX vpnc-3.init 2301 RMD160 c9f73eaf435fc80c53c71f53f31e02e23d2bacd4 SHA1 f8260a4e16b9f16184da33c08e085ecad758e40c SHA256 aa423cd0a52183e0bdec8b599d52555e4f5c22573cee68bd6b25ff42be129fa5
 AUX vpnc.confd 123 RMD160 91f85e5785342817caa9252eadc125c95ace5a30 SHA1 4eb5637e5c3d1ce5c78ad884e6c8b2b859156987 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350cfe728b4a88
@@ -8,18 +9,18 @@ DIST vpnc-0.5.3.tar.gz 98740 RMD160 6f3926901e75dc98762f6ef45782930f2fb76a2f SHA
 DIST vpnc-0.5.3_p451.tar.bz2 108492 RMD160 3e3eb6c0832487e526a236c7d20d9a86d722ba99 SHA1 92ec36e79ebbdd29c9de8210857fe7105736f5e8 SHA256 8a4371489e6802f9b0d18de916e05eb46b4b8b2cd150120180bd353955d83812
 DIST vpnc-0.5.3_p457-r2.tar.bz2 102506 RMD160 c80fe4634b034b1943542a0e006347e9e5b16f12 SHA1 3750dc379bbb1632ca3c456903ed983d2fd9cb40 SHA256 d303884c7d4f048457c21f9c506f2350ffe60b211652543194a735315f122be9
 DIST vpnc-0.5.3_p457.tar.bz2 102502 RMD160 cec6240e07a778f57f5bb8b82a92706024bf5756 SHA1 f145394e0985e256ce0d4af5c228843c422c440a SHA256 41c6886cb24a15db9c49dc09ee1c98f891ec6248cc2afc46e2b94729f15a776c
+DIST vpnc-0.5.3_p514.tar.xz 98324 RMD160 c0822f773f79de17de35a082365257aa339f543a SHA1 2374ffcb7ddf40c3e1ec4219a70e403e63da8750 SHA256 95f43e3cbbc6fa7205bab07a466a893ed771ebaa1d11702161b3083bbb042319
 EBUILD vpnc-0.5.3.ebuild 1842 RMD160 3500de75409ade3e401cca9debd5bd63b591dec8 SHA1 4928bddccb65cf69aff31859cbec48c15a06f0c4 SHA256 adbe7894474d4a3132f2e7fc157c9a95777d778a0c133fdbc256d5852ddab5d7
 EBUILD vpnc-0.5.3_p451.ebuild 2322 RMD160 98c61c27fcaca7c726d45545d21402b5007dc4bd SHA1 2ea39250cd237a52e7a06f42506f597035af75ce SHA256 fb2b101dd5c79b16c4ba856837c79bdd1c968456bfbbe42b5dcfc17128af5631
 EBUILD vpnc-0.5.3_p457-r1.ebuild 2325 RMD160 4ebe8215afd94087c04658189cf74511d3779cd6 SHA1 5b85984c7a3eb7205c3b66bc601e14fbedc6ab22 SHA256 58ef6e63c1776c24fdf01bc4ecb325bfb23f72b32dc718c1ddcf34f3367b6b68
-EBUILD vpnc-0.5.3_p457-r2.ebuild 2375 RMD160 bd1c75b16e78244a50009aedee53743f996ee2ef SHA1 3209c1dd788e3edf71a73f16783bbb882991701a SHA256 47fbd0a01cf1188d302c9daf79daccf669a03b1afe90a8939c043651f33731c2
-MISC ChangeLog 15772 RMD160 e94f92884abc68b6620142acca564a604e3d3b57 SHA1 7a3d0c4b360099263372ed0d63d52d6c4f7213db SHA256 4a5ebc94428c97ec78e2ebe247a5b2c45bfb55df151470fa7e0f82d9daed2914
-MISC metadata.xml 868 RMD160 c50e34d62d9d2d42f8437379ae1abf7652bd37d4 SHA1 df24c8fd07a87acf3c8ec94800d19f62d178311e SHA256 09e47a42324012c138bdb9f449588c5ca687265ac8e68d3b76bd1c99d1114521
+EBUILD vpnc-0.5.3_p457-r2.ebuild 2406 RMD160 ee3853b9bc6ee7ae6eb952f9c61803fa9be0a698 SHA1 585f95b6cd03b88fa48981999f03916df9d0f16d SHA256 646ed2195fb162e2e20af24f829ab74899904207a6460e4de893b7435459f82a
+EBUILD vpnc-0.5.3_p514.ebuild 2465 RMD160 130411e725182e1187047420960b349f54b099d5 SHA1 fc76d0e5e9341f9bec1a4f77f9839da9828e402b SHA256 bbe2d6bafbf809cd90daaf6be7cf2896741dfcf8f90ad11e637072c225f05ced
+MISC ChangeLog 16065 RMD160 88ebd1131bfbcd12ec33bfa857283227e5721728 SHA1 a1e266e83ee14657e23dfd8890320b429ea7b5a9 SHA256 66cbc57550361e9c541b96ff14e4c91d9e5ae5ae14c1fe6621fe17a584d89235
+MISC metadata.xml 842 RMD160 ac840b5e48ccad2481a479bbf0ef2656656e7feb SHA1 f91034237a7b3f6de26cf1731ef0fc03f1d40cee SHA256 30727c06e7363580513069159649bd3a5300347cc025225e7796c80fd7ffda6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rQ4ACgkQfXuS5UK5QB3ZkgP/bB6umzJ9dzQtqXEEqFKz1fmV
-nt0fuubCVQUSZoU976NP/ImdRo0e8lnCSz23sEpAwZRd0/qRiMTP6/uOD5j3oEt5
-Qn5MFzxldFA2OHaZb6c3If9FTiQGw38UAbkKRjj6JTi7wPvgWa1hxtB+A3EK4yrF
-4vkTmYKyJToYrZCF9Co=
-=Liiz
+iEYEAREKAAYFAk86sokACgkQgAnW8HDreRaGBQCfceKKdZJNyl7vqgwY4xdbN38U
+cGwAmwWTaHRznEuYh5kP+TeKrmJXhzhe
+=mj9v
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch b/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch
new file mode 100644
index 000000000000..18bc90a99587
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-0.5.3_p514-as-needed.patch
@@ -0,0 +1,47 @@
+ Makefile |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 270d7e1..578884e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,16 +60,16 @@ BINSRCS = $(addsuffix .c,$(BINS))
+ VERSION := $(shell sh mk-version)
+ RELEASE_VERSION := $(shell cat VERSION)
+ 
+-CC=gcc
++CC?=gcc
+ CFLAGS ?= -O3 -g
+ CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
+ CFLAGS +=  $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
+ LDFLAGS ?= -g
+-LDFLAGS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
++LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
+ 
+ ifeq ($(shell uname -s), SunOS)
+-LDFLAGS += -lnsl -lresolv -lsocket
++LIBS += -lnsl -lresolv -lsocket
+ endif
+ ifneq (,$(findstring Apple,$(shell $(CC) --version)))
+ # enabled in FSF GCC, disabled by default in Apple GCC
+@@ -79,16 +79,16 @@ endif
+ all : $(BINS) vpnc.8
+ 
+ vpnc : $(OBJS) vpnc.o
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ vpnc.8 : vpnc.8.template makeman.pl vpnc
+ 	./makeman.pl
+ 
+ cisco-decrypt : cisco-decrypt.o decrypt-utils.o
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ test-crypto : sysdep.o test-crypto.o crypto.o $(CRYPTO_OBJS)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ .depend: $(SRCS) $(BINSRCS)
+ 	$(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@
diff --git a/net-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index e5dbbff438b0..5e6fc5290abe 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ljakab@ac.upc.edu</email>
-    <name>Loránd Jakab</name>
-  </maintainer>
-  <maintainer>
-    <email>mmokrejs@fold.natur.cuni.cz</email>
-    <name>Martin Mokrejs</name>
-  </maintainer>
-  <maintainer>
-    <email>fauli@gentoo.org</email>
-    <name>Christian Faulhammer</name>
-  </maintainer>
-  <use>
-    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hybrid-auth instead of <pkg>net-libs/gnutls, may cause license issues when redistributing</pkg>.</flag>
-    <flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
-    <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
-  </use>
+	<maintainer>
+		<email>ljakab@ac.upc.edu</email>
+		<name>Loránd Jakab</name>
+	</maintainer>
+	<maintainer>
+		<email>mmokrejs@fold.natur.cuni.cz</email>
+		<name>Martin Mokrejs</name>
+	</maintainer>
+	<maintainer>
+		<email>fauli@gentoo.org</email>
+		<name>Christian Faulhammer</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hybrid-auth instead of <pkg>net-libs/gnutls, may cause license issues when redistributing</pkg>.</flag>
+		<flag name="hybrid-auth">Enable hybrid authentication (certificates), only if not redistributed as compiled binary</flag>
+		<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
index 37c4e6b1869d..db7c51f4f877 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v 1.1 2011/07/03 17:30:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild,v 1.2 2012/02/14 19:14:11 jlec Exp $
 
 EAPI=3
 
@@ -21,8 +21,9 @@ IUSE="resolvconf openssl bindist"
 DEPEND=">=dev-libs/libgcrypt-1.1.91
 	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
 	bindist? ( net-libs/gnutls )
-	openssl? (
-		!bindist? ( dev-libs/openssl )
+	!bindist? (
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
 	)"
 
 RDEPEND="${DEPEND}
diff --git a/net-misc/vpnc/vpnc-0.5.3_p514.ebuild b/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
new file mode 100644
index 000000000000..369ef34409b1
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.3_p514.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p514.ebuild,v 1.1 2012/02/14 19:14:11 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+# Modified vpnc-script taken from
+# http://git.infradead.org/users/dwmw2/vpnc-scripts.git, supports Solaris and IP v6, as reported in bug
+# Additionally added patches to fix some dead lock problems taken from
+# http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2010-March/003445.html
+# TODO: Create proper patchset!
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${PF}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="resolvconf openssl bindist"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	bindist? ( net-libs/gnutls )
+	!bindist? (
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
+	)"
+RDEPEND="${DEPEND}
+	resolvconf? ( net-dns/openresolv )"
+
+src_prepare() {
+	if use openssl && ! use bindist; then
+		sed -i -e '/^#OPENSSL_GPL_VIOLATION/s:#::g' "${S}"/Makefile	|| die
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS.  This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	tc-export CC
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+	dodoc README TODO VERSION
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" vpnc
+	sed -e "s:/usr/local:/usr:" -i "${D}"/etc/vpnc/vpnc-script || die
+	# COPYING file resides here, should not be installed
+	rm -rf "${D}"/usr/share/doc/vpnc/ || die
+}
+
+pkg_postinst() {
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available in http://www.gentoo.org/doc/en/vpnc-howto.xml"
+	echo
+	elog "Don't forget to turn on TUN support in the kernel."
+}