Restrict binary distribution with USE=-bindist, #541450; bump to latest svn snapshot

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 103 insertions, 18 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 68243a08dbe9..f18ef7a81117 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.132 2015/01/05 12:55:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.133 2015/02/27 08:05:58 jlec Exp $
+
+*vpnc-0.5.3_p550 (27 Feb 2015)
+
+  27 Feb 2015; Justin Lecher <jlec@gentoo.org> +vpnc-0.5.3_p550.ebuild,
+  vpnc-0.5.3_p527-r1.ebuild:
+  Restrict binary distribution with USE=-bindist, #541450; bump to latest svn
+  snapshot
 
   05 Jan 2015; Justin Lecher <jlec@gentoo.org> vpnc-0.5.3_p527-r1.ebuild:
   Fix documentation URL, #534490
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index cc618ef0703b..5ae85431609c 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -8,25 +8,27 @@ AUX vpnc-tmpfiles.conf 29 SHA256 6d235ab7174f9b4db4086e39bf7b2f273cfb55a736d20d2
 AUX vpnc.confd 123 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350cfe728b4a88 SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633 WHIRLPOOL 69844dee15865aa62d4bf67761be847fe9df8a48b0eefc29dbc204f43b2b000ceb69bc71a325f4dbebfcbff974bd29e49f88a27b1b964c2072d257588e29da95
 AUX vpnc.service 517 SHA256 51ee186919591f490a92aa16524317f775d7b0b0a794e58ff75f0f58f5179421 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5 WHIRLPOOL ba3c121e1bdc77c9d05f7bd6c56c6dc866e12b95ce90841ffd26d419d0759a15e2fc4855585d30b8fff8edc541cea9b52897bef3e1007ebe8a9c80d63a5eccff
 DIST vpnc-0.5.3_p527.tar.xz 98740 SHA256 4076e40b3be37ba95c393cc5e21cccf87540e994275bd336a4ec0c6b4c3d54de SHA512 6c657039c4f914b03214912ef3471fae755b4dcbf771c3653ed00d90bb044fa83dbca7a5cda9ac0c9389baae96c658566c8b3f3a4b94c078dda8387935532c9f WHIRLPOOL 61aaf00f63e531eebf3583492f288ee339c446b0a273f1ff5c008dc37ab9f74749ee3c74ea0f110018ef764448c838064de6140743941ff17039e4288cfe66e8
-EBUILD vpnc-0.5.3_p527-r1.ebuild 2396 SHA256 c336d34fb2d4e580f46c76a6cff389209508332b8d59c228ae2d809701d6ff9e SHA512 59aa7f2a006c49be03deb96d8e50c734603555beaf1a2c5efde9676d812d440ac199eb9aa84595974e426b40d6f3042465882de82417c3d626fe994503b3d8f4 WHIRLPOOL 15c8e580f7d80a754b39cd7e7a95403f4c5ab452f9a8fee38e6f87c082b1ce46879a6e8b0f28f7b4c9d9ca67325d5bfb0caeca2118d3ab548a93bdf27c90939a
-MISC ChangeLog 20416 SHA256 04c40f581c436f96c0bf5cc77a29dcad4cac30e3c9957e112f1a780347116e8b SHA512 c52faa8f6019a048a6b45a79bb88050a9e52a68b779a48fe74f000f9739f6201e95c7f4140ed77d976813ee4361969b74438b5a20c90e2a3e43131855a43278a WHIRLPOOL c243a1bbf1b5bcc3e997ac07cbe7c2fb5365557cf7eb4a2719e91cc11d59d7824e8134672a56ede570ab08e2b78adee5268ce945c0a8b8d2850b87e9b719b571
+DIST vpnc-0.5.3_p550.tar.xz 101860 SHA256 5d7582eb3d7ead3cb0732a404ce10f471a65c48d0bb4cb2dd5c525273bf0f4b5 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55 WHIRLPOOL 8194e0dcf2c0bd1910b4b110dd475024d5cc351d86dec58b33811c37f9bcbc2702c4fede861a6318c54dfb7d19ff2d2265da86d573181a02f433e131184b9bd3
+EBUILD vpnc-0.5.3_p527-r1.ebuild 2430 SHA256 138db0d630c81b595bbaf856e56ae2063be4530dfe8e4eaa3e3938addb19d812 SHA512 20b9af41dfa786a76d69403fff5e7d3ec84ca0ee8df3073e57c0b99f1db6f965e62bb66358cb7e92fed33cd0d672127468b3c8c80f7ee3984e64232105833d51 WHIRLPOOL ffa1675441c62c506e4c7c852564b3ff29991a9ea1e99be252a025315fe359fc7a6f62a4d34a7175fad2f1f8db5e231d55398aa4bd3e6eb7ae7a5a26d77a9b43
+EBUILD vpnc-0.5.3_p550.ebuild 2377 SHA256 9c7852f2a1ada2c0067b9ded6a2897437a24b92df3eb1b491a486e728d6acc6d SHA512 5b37d0a6e75373325027e120535b893b0306fdc5c82599ed390674468bb2c9fdeaa58329cbe55eb68cceb96e6ea3eec28d96787021faec8979ab34a528d668ed WHIRLPOOL d1b84ba9b9bf86801b37e026f39603264052045f919401cf03aed17065b76f2363694ab4162751dc4758c309239d9a4ed92c91a6fcc861a5202789d8be8002c4
+MISC ChangeLog 20639 SHA256 5a85fd09ae7f8c617c9f9a45c3d7eadb146c07d5e990b0f22ddc5d03ff25ecb9 SHA512 7c773e67152b9b51f8b502bd1d288dc0db1985127fd27d388a24d574f26949fba2eca2e8e15b8ce4d8edc784d16e778c9d2c8b7e6637ad00dd805bd41416208a WHIRLPOOL a729f57d5edfcd13f783fe64e3bb2e8161b05adaa67bd42ae264ab46702a4cd044d29ae23d999d71895c7dec3209194b256c9b13b78f415637aee53f3412ccb2
 MISC metadata.xml 710 SHA256 f99a506f58567481f5feb63a711d32dab22bb0d3cc0d703d827a0138c925b694 SHA512 5c2249239d3a575155c412b21bfcfa5503a9578dc2840118a80e55eac7a2457fb6adc4df29de8d37ff210557ee74ae6c943f591121af62df9a356089dd87c12b WHIRLPOOL a140a705f11f3b283254d6a6a297ab694e02148d558e8994ebbf44368906455928a3df80e48df8135d8f5a31dca095c15f3f920e6d262ae65c5afdf4fe45c476
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUqonHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU8CVnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtcUP/RkvILBOf1BCSXXtVeYkOdRi
-TRMDi5IVzEtbj/ghdHS8lUbO6veLocQUkZH6CPzoU9gOfIlbFVVBY+fY9+rCn8Y7
-gOpXmmbLqtLuTQ/ETBjlf76n2xpaFBmnQ38hzMDop2qXGBuBg240GUwIYlbGaoGb
-jCcDthBL1StYzGpbQRz/8hts19G6s+opnEb3tXz0hqRdlhm7Ruzxo8lSFwnfehKD
-Ft3lWwhh0XFNcccRTwgmTlwH4w+k0xWx83Mmn6AGFGDBPM//jaq3AEGsnRdff2LF
-3iuDY8PLG8FpyWRCGin4F/qpPhp/UqyvOJXtZD5fIsTxmhnbZmBpGmhVB4Fnxwn5
-/hQ2r+B9wa8cTRUlmeKJ13V5IKnXM/tH+QHjz/GuD9FBvdRjG1pyW+dTME1KFSqe
-dqdpJbjQ7XeaHZJ0jHHReO3jQh46KjltQynq50yiX126DzcL7EfKhxXK7THogDO0
-ioYCrC/icEsv5ty67GZjdpGygPoDhOTJfLNjfiOAkA56V+FOMK/OV+oQwArtE/c/
-zEYihHVUN0MaMOy2ltdZ8j4d/JoQpU2YFfkPyx6wr5Iu0eqrOhOEct0UCW/BYT+D
-c7MA0g9W0dgw6GtT+FCqLMek8U/WIoEGx+yCxEBDQaGfeIqRKsH09XFovyV+6b3d
-KNlLgRkLhuHGzN3NFE/N
-=LmPo
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/wYQAIGqQ1iq10aDC0dHtWKVBhK/
+/qxxECmq2kN5sq7udZUe3kXbB7VKQNz3niS/DJXcM50d2qv0uxFZTk8qlS3L29qh
+VgaUHyJqv8OCmkQSBVdjKX92j+Ww5W77JHTThaPFNcLbs1b6WcPaetx02hjVCfXJ
+64i5m5ykpu17Wi6fSKuSszeA3FUQQDCNhd98qF5OLYoxiTxQkFLAiBSycI9vRanu
+98GOFPbgx3SabMVS1zW5IYaOAkVPkywSmmDQGwlSBuZzpLtgtSnUOwM4OnUkqRRE
+6Cv4SZZXSn0P7D7fYfSBSe7wTwr/Yxp/GadYkcxO6yulTXyUl36qXGAfPQBUcJjn
+6iwI6lZlWddhhCdL44lfrcAAHevhEPsa5Tl/RMMIGOcqbAVSOhxH3LlcAyW5VOQn
+kvZ0vzmMtTtfpLtZxynHRV4ghHIhFQ5f4K6t+EID2VyPgXcAXxdGcuJqevAw8pnN
+UP73VrKpRB7cn7x4fFmrS8s6t5wURyNlS9lpvY46RKB4Wtd/iyFSJEoID59wC0Oc
+jBYA8KiVvftT4KEgTb/V9ST0+B52lPEF8/qMq0Omtgvl5oQSldHveCB5FUIqhFLk
+xxFGQMuQTSNRsY8y5BvZRlvWb6qlRKIqSNy/KRGVGvd3CpRBal925hnCagA92q3O
+yhB0hz5gwziVgOsPL4QQ
+=cu6L
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
index 1519ea3ee021..fb0ee7138001 100644
--- a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
+++ b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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_p527-r1.ebuild,v 1.13 2015/01/05 12:55:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild,v 1.14 2015/02/27 08:05:58 jlec Exp $
 
 EAPI=5
 
@@ -28,6 +28,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-vpn )
 "
 
+RESTRICT="!bindist? ( bindist )"
+
 CONFIG_CHECK="~TUN"
 
 src_prepare() {
diff --git a/net-misc/vpnc/vpnc-0.5.3_p550.ebuild b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
new file mode 100644
index 000000000000..6fc2443b92f7
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.3_p550.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 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_p550.ebuild,v 1.1 2015/02/27 08:05:58 jlec Exp $
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="resolvconf +gnutls bindist selinux"
+
+REQUIRED_USE="bindist? ( gnutls )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt:0=
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sec-policy/selinux-vpn )
+"
+
+RESTRICT="!bindist? ( bindist )"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+	if ! use gnutls && ! 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
+
+	sed -e 's:test/cert0.pem::g' -i Makefile || die
+
+	tc-export CC
+
+	sed \
+		-e 's:/var/run:/run:g' \
+		-i ChangeLog config.c TODO  || die
+}
+
+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 "${ED}"/etc/vpnc/vpnc-script || die
+
+	systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf
+	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
+
+	# COPYING file resides here, should not be installed
+	rm -rf "${ED}"/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 at https://wiki.gentoo.org/wiki/Vpnc"
+}