revision bump to make vpnc work with Kernel >=2.6.39 (bug 372441 by maxb <max-braeu AT gmx DOT de>), fix a dependency on iproute2 (bug 372861 by Frank Steinmetzger >Warp_7 AT gmx DOT de>) and fix tests for bug 367577 with a patch from Lori <ljakab AT ac DOT upc DOT Dedu>. The tarball has been updated, we need to create a proper patchset at some point

3 files changed, 75 insertions, 22 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index e56df58edbe8..f79231c48221 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,16 @@
 # 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.97 2011/02/12 23:57:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.98 2011/07/03 17:30:21 fauli Exp $
+
+*vpnc-0.5.3_p457-r2 (03 Jul 2011)
+
+  03 Jul 2011; Christian Faulhammer <fauli@gentoo.org>
+  +vpnc-0.5.3_p457-r2.ebuild:
+  revision bump to make vpnc work with Kernel >=2.6.39 (bug 372441 by maxb
+  <max-braeu AT gmx DOT de>), fix a dependency on iproute2 (bug 372861 by Frank
+  Steinmetzger >Warp_7 AT gmx DOT de>) and fix tests for bug 367577 with a
+  patch from Lori <ljakab AT ac DOT upc DOT Dedu>. The tarball has been
+  updated, we need to create a proper patchset at some point
 
 *vpnc-0.5.3_p457-r1 (12 Feb 2011)
 
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index a80255e46bc8..10bc04a3160f 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -1,31 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
 DIST vpnc-0.5.3.tar.gz 98740 RMD160 6f3926901e75dc98762f6ef45782930f2fb76a2f SHA1 321527194e937371c83b5e7c38e46fca4f109304 SHA256 46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884
 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
 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
-MISC ChangeLog 15288 RMD160 9047d1020d03633731602ceb678185f6ed44b80d SHA1 e4a8b5371053bb696604501ce0b335f09b8691f7 SHA256 99d960d049eb80fc5881d790b17b1c26fbfd532a78670c435e78f6d87fe95aaa
+EBUILD vpnc-0.5.3_p457-r2.ebuild 2375 RMD160 b39a994637700aad1bbd92fb68cb5ebdf1b3716f SHA1 66dd192573d6b93ef69615c83bbfbf73ea1f78d8 SHA256 65b6fefcfe95d6ebc5ed5e4c45d9839c880d1e8472a9acee81af5fe529f22494
+MISC ChangeLog 15772 RMD160 563694f944865a1e87dbf65ac0ecd398f0c46fa4 SHA1 4a1950ed65821e60cc22d0511c4f821f5806854f SHA256 0853c49533cb3b79581fcfc75da821ed7a26e12c26bdc4953ed73613989f6dd9
 MISC metadata.xml 891 RMD160 ab736897fdf000cb6833e7b8de209d89a0980e2b SHA1 fdee32a15fd8789ed5eb158481a4b261c1f7b10a SHA256 ddf94f541cf902c769a224867868e719d8a9d114df358d4cefb54959d5974859
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNV8X+AAoJEPqDWhW0r/LCcgAQAJK95uMr6be/7hTEf81LmHWb
-qXDiKHqHKVewP1mR7dq5M4B/LwWIqfPw2PwkyuYwZLGLJYd3xqaAx/tY1uHdFTKh
-resxmtvtM8Hevy67mQkF/Ey66R6u2mLGrlxauM+JOjPv+3iKZBSDuobljnfBiTi/
-304vVWGgRq20Qiw1heZsQ6sp/8scPGarB/K3Zl0yof3gkwLGyA1fpSOJBIe3ggqd
-6a6YFv8l3fx7lNgD8FtDIn08RXRj9zaNQE5GwPeVZpSa/J4cfrLQHNiFfzRsL9fi
-LU+ZWkhbx3c4d9p3BhU2kUrQvhyWpTm2lvGv36a8VRfdyg+EMKLaPbjfAn1LpdDM
-p0ySVhQD3GPgCk0sl6+QY0aK9IziHoxH94d+sEaCsI1yiAY3AdwIT9HGHF6Ivl94
-y9wSFpEDJhBE0fdzVJNUUH/2HOeuWPh/7c8QZUAdWRh2Icc+pnoPpWRi4NAJHMpJ
-InAXwYxfawMGhbd/wbUm8RIsp+pTNypgvIdbvptIfpgNs0rhknvuLFt1j0q/9iyZ
-T24XdTm1a6ODnPNv9Vc9ugsBYHnKLPvuBtX2clVCKWU0LaZ3Im4MoufCFkNm05HM
-73VOc9rRUrixmToUgQ6fvFvYiZ0pn3NyrD16GqqjTigBf7oZzpUQKijkoPRDxKM0
-14EOQ+7+yVPPGe738r4W
-=OszR
------END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
new file mode 100644
index 000000000000..37c4e6b1869d
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.3_p457-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 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 $
+
+EAPI=3
+
+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="mirror://gentoo/${PN}-${PVR}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+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 )
+	)"
+
+RDEPEND="${DEPEND}
+	resolvconf? ( net-dns/openresolv )"
+
+src_prepare() {
+	if use openssl && ! use bindist; then
+		sed -i -e 's/#OPENSSL_GPL_VIOLATION=yes/OPENSSL_GPL_VIOLATION=yes/' "${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
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die
+	dodoc README TODO VERSION || die
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}/vpnc-3.init" vpnc || die
+	newconfd "${FILESDIR}/vpnc.confd" vpnc || die
+	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/
+}
+
+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."
+}