gentoo resync : 25.04.2020

4 files changed, 112 insertions, 12 deletions

diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 35ae73dbfffd..9b51d096d7ad 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -1,7 +1,10 @@
+AUX vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
 AUX vpnc-3.init 2197 BLAKE2B 8f88a7f27207e1ab4f2e9b4f31ceb06668f26fcace00dd169237766775ff72d9db1df0827f2ddea76144085270a85c801d1ffc14bbeb175dbbecdb21bb50c69f SHA512 d05a362606f314c0c275b2354308431c9aa53d8c83172fa86d34c28573f0ea527b1aa9e2dcb8341f212600bd3a50ba8ea3038a05b494ac008297b03e528abd97
 AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32cbda995a1fd2e90cd6b93f6b9b749b28a4f34aea417001b330ca53ed5a3291de9d7b2d99965342f603f SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d
 AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
+DIST vpnc-0.5.3_p550-r1.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
 DIST vpnc-0.5.3_p550.tar.xz 101860 BLAKE2B 9800ab0704108cd70450dcfe314eba7c09ca1bb329fa6b9f2946dbb6ee6407e5f6bc3d17d8be782e9103d94a12895777125acdad070f39ea1b96a946ba7d2302 SHA512 95150c743c61a962c36591bb874c77f2c28f341c0a1290dba4e878a460d22d762dd88f7cfc0aa9d17ace71a8b826d9fd13554c23b5123dee6009e9fffcd2de55
+EBUILD vpnc-0.5.3_p550-r1.ebuild 2192 BLAKE2B b1c3788d1a970ac8bdec98de04583d181cd1beb4f4bdd4d731aae6646ddf7c4b5b2b2fcf9ea1691f2821d7960d0bc34e4574f2a5847d158e8fde10d4c3d9a86c SHA512 a66ac8a44ea9f1b94d850f9bd0e94ffe8f9668981feece54da94cc6c4e237116eec63c5df3b5f4be7eed7daf6472ffe8ae612ca17dd2661037aec4a525a25d03
 EBUILD vpnc-0.5.3_p550.ebuild 2206 BLAKE2B 73d66da98c0e2ed3c756e1409384915a471d817318b3f04765c4e488f2ceb75e92032ef4f4fea85b910d579ce63f818560eb53d716dc291957d690107108162a SHA512 a25a180d9a16507d2c490590f1f6f05dd59abcd2196d9673b0a88c659069c5fc9a2912ea816f6a90d5d20d2300a602df7417427413233be8a12e46cd0b30cadc
-MISC metadata.xml 501 BLAKE2B 31df31e209ccf8c590130748c6b8f800a143b81beba395b0ece4b73eefa5677928ca25dee2f3cba5eed014da2d9fb318b34407ebfd8138f383a035446b3e481d SHA512 68b6553d61bd272eee71187a3d3c547132b694b9258d20887a91b0429a50ea6b35644ec8305fbc67213a22bab10f18b4166dabaf9beef3088182facd461aea39
+MISC metadata.xml 364 BLAKE2B ad78bc77b84330fe5680966fa276e821746d7a950e326fde42fa8d330ed176fca5a7dc31831e9af97c28a243aabcb693ff0016d93fae1b702c10f968167b26fc SHA512 5d31b14522ea8c365ead3dd5bfa2370ed6347259f023b17bd19707628ce5e1d0141c340869846de508e3268f79ff298bb93026adc4a798e4774054ee06672174
diff --git a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
new file mode 100644
index 000000000000..e574b51fba63
--- /dev/null
+++ b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
@@ -0,0 +1,33 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -158,7 +158,7 @@
+      * treat passcode as password
+      * filter "metric10 64" and the like from ip route get output
+      * updated to libgcrypt-1.1.90
+-     * create /var/run/vpnc/ as necessary
++     * create /run/vpnc/ as necessary
+ 
+ * vpnc-0.2-rm+zomb-pre6.tar.gz Sun Nov 2 02:15:56 CET 2003
+ 
+--- a/src/config.c
++++ b/src/config.c
+@@ -390,7 +390,7 @@
+ 
+ static const char *config_def_pid_file(void)
+ {
+-	return "/var/run/vpnc.pid";
++	return "/run/vpnc.pid";
+ }
+ 
+ static const char *config_def_vendor(void)
+--- a/TODO
++++ b/TODO
+@@ -115,7 +115,7 @@
+ * DONE post link to http://www.liebchen-online.de/vpn-zaurus.html
+ * DONE passcode == password
+ * DONE support for new libgcrypt versions
+-* DONE make /var/run/vpnc as needed
++* DONE make /run/vpnc as needed
+ * DONE ignore "metric10 xx"
+ * DONE ignore attr 32136! (Cisco extension: XAUTH Vendor)
+ * DONE FreeBSD supported
diff --git a/net-vpn/vpnc/metadata.xml b/net-vpn/vpnc/metadata.xml
index 08b929631454..38a14e7a7e4e 100644
--- a/net-vpn/vpnc/metadata.xml
+++ b/net-vpn/vpnc/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mmokrejs@gmail.com</email>
-    <name>Martin Mokrejs</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
-  </use>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<use>
+		<flag name="resolvconf">Enable support for DNS managing framework <pkg>net-dns/openresolv</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
new file mode 100644
index 000000000000..4276d407ffab
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt:0=
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )
+"
+
+CONFIG_CHECK="~TUN"
+
+S="${WORKDIR}/${PF}"
+PATCHES=( "${FILESDIR}"/${PF}-var-run-fhs-3.0.patch )
+
+src_configure() {
+	tc-export CC
+	export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" install
+	dodoc README.md TODO VERSION
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+	sed -e "s:/usr/local:${EPREFIX}/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 -r "${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"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		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 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}