net-misc/vpnc: Add systemD support, #479354

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

5 files changed, 118 insertions, 5 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index df3fde13a428..50d7789a27bc 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.116 2013/06/05 14:38:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.117 2013/08/07 20:20:46 jlec Exp $
+
+*vpnc-0.5.3_p527-r1 (07 Aug 2013)
+
+  07 Aug 2013; Justin Lecher <jlec@gentoo.org> +vpnc-0.5.3_p527-r1.ebuild,
+  +files/vpnc.service, +files/vpnc-tmpfiles.conf:
+  Add systemD support, #479354
 
   05 Jun 2013; Justin Lecher <jlec@gentoo.org> vpnc-0.5.3_p527.ebuild:
   Drop USE=-caps restriction for libgcrypt as it was removed, #472392; this
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 60e0b6be35ac..059667ea5de7 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -4,15 +4,28 @@ Hash: SHA512
 AUX vpnc-0.5.3_p514-as-needed.patch 1386 SHA256 d7fb90fe49d1758b334755542e84b679abd2aab3ce79b6ac4ccd5a909394fd8f SHA512 3a8caffffeb92b27c780ab5b0d20c5ad6a579cf68952608353b7c2cc945f6cb54f250b7f38276ab357d70e6fb03dabc79b353dfc9d931ec25b551dc7aef21c48 WHIRLPOOL c4cf25ade9afee0ff28f8cbf299fdd330457cbe5795ddc2501b1c18c5c14382a5a66657212c78101a70326817029d80346e33580c6795e131ac340f03f4de37f
 AUX vpnc-2.init 2323 SHA256 b64e86af0109310a8f4c0ea188aeb9b3a1e732500b00deeb2ad0345b25e0d7f2 SHA512 664905cc39ea32534264ac5ef53c7eaa49f436304d881527c42b3c75bb41dc1426d994c9d33a21481bc77ebad70afaeb2f3900b7985eedefd0d3160b940fd5d7 WHIRLPOOL 2fab18e1e4eb69189f0c5f171e0875818f95a3fe8bb914022131e6cd2ba75fb3b0e6cff7bb5d1574061379a5e1e23cbf7902131fd6dfc9ac077abbd71d891c15
 AUX vpnc-3.init 2301 SHA256 aa423cd0a52183e0bdec8b599d52555e4f5c22573cee68bd6b25ff42be129fa5 SHA512 5dbd83a06608714adf5ae5f021a7142c26cdd94fcd89591b029861cf87efdd4fcb783eb1365ad8fcc3edc915c3d2ddb32921662f9c2540994a54972847fa4781 WHIRLPOOL b39cb68f6a7bcd211e7d2c80eb5c3900f6e06b02bf143a70ebfcf30b0ee3cc0a896bff783e75c3fee737abba3a6336f6251cb7c466b1a6637bb8f5bc7e65f2c4
+AUX vpnc-tmpfiles.conf 29 SHA256 6d235ab7174f9b4db4086e39bf7b2f273cfb55a736d20d2ada5664a9be161c80 SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d WHIRLPOOL e6b08d375d8b35f4b8454cea018fa739cbd67b8392a19f1b23f18952b858ffa72a412c13e70079f8c75c02b943fd4623ee0a017a8fb80dd351d2fa2958877f97
 AUX vpnc.confd 123 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350cfe728b4a88 SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633 WHIRLPOOL 69844dee15865aa62d4bf67761be847fe9df8a48b0eefc29dbc204f43b2b000ceb69bc71a325f4dbebfcbff974bd29e49f88a27b1b964c2072d257588e29da95
+AUX vpnc.service 560 SHA256 f527177d9b9638cb7c25ddc479afd2734ace4631f63c53b2471d150f3af51afd SHA512 6c1514394ec230e2f3653124bddf0a42bf448c8369604520854c4f3397062fb28f89f77792b781d4502171e95de6766f110ece779471e90df08a25d4c02c2fcd WHIRLPOOL b816c2bc76ebaf5c834d3f9885d8fb5fdf883a021132ed7729ba02bf380e58c248f5773536dec320993d3978abc0952edbaa01a7cb4cbdd362dd02ea22ebd857
 DIST vpnc-0.5.3_p527.tar.xz 98740 SHA256 4076e40b3be37ba95c393cc5e21cccf87540e994275bd336a4ec0c6b4c3d54de SHA512 6c657039c4f914b03214912ef3471fae755b4dcbf771c3653ed00d90bb044fa83dbca7a5cda9ac0c9389baae96c658566c8b3f3a4b94c078dda8387935532c9f WHIRLPOOL 61aaf00f63e531eebf3583492f288ee339c446b0a273f1ff5c008dc37ab9f74749ee3c74ea0f110018ef764448c838064de6140743941ff17039e4288cfe66e8
+EBUILD vpnc-0.5.3_p527-r1.ebuild 2360 SHA256 c8fc542645b4f01de1eb010b57a5e61b96b9e520e23f084cc67a43b20fc46eff SHA512 3a57c507e3091205fb71e4f7a6afe626a76f7e151b7ed8ec94eebb502bd5f961d79b7bf7dd95f13613057464f04d779be2089d8eef1a2da2ab2bdf3dc34bb012 WHIRLPOOL 61272dda010fe4ffc87458ef3b4686216bdf6259e4dfbc6026cb44d1effbb4cbeb417c7ef5afe5ee426f85672900238e3a687d472e989ace199d2f9c6f0d0ad1
 EBUILD vpnc-0.5.3_p527.ebuild 2158 SHA256 931e62d4b6fd901634467e996b39b5be687b05fc812ba9cffc9b6655997bde5d SHA512 fa639cdb242932cda31b21b755e77530962fb60c4874f3adf490d68e78fd866e5f648b985f4702c32782e1fa8e0d604bc22ea27a4af59e3cd382b6a5bf14bd30 WHIRLPOOL 575a74bebc39b0b5c9256a677cf602c334ff8cfe223a8eed2de6820a723ed190f634021fa06ca64d7db5898e4053ab4d41d0078533da0e178b7f587f5a3a1424
-MISC ChangeLog 18507 SHA256 a8d6f44758283fbc920f46ec44dafd707ca9e4835a84bdba8b004e43bb861621 SHA512 3318c6746f47924ee1237ab5c405bfc5280f9d63e98756e4e62689679ab51cbe95d29b7a140e0586e60bc347e4b6a202f2fc666ad23f3f0724635be97a6960f3 WHIRLPOOL 7b9c44b6b35e5a15ae5b94ab37536aa11c23b2de183d1bc815747a8769bc2df8cb6b380d059706f46284ad4cf752e0bc91a1c9dccd50c8a47e6cff2a4bb71c23
+MISC ChangeLog 18699 SHA256 f7e1c10d92765d4c9962a9703725d5c8c24a335e42101b756a6d3e0950a8ad7a SHA512 b3f8f474bda2f01ae9ad4912d89bb53171f005cf2eb0d24413e287e2ad501a6763a7e048c9570a77759e03001e17127681a3204b05768b6f47c52ed6ee88eb54 WHIRLPOOL a6e8ae32274dcd8217f49e67f6c37038e14e525e774ea8942d5ac2c0f22773c6fce567982b124f693d6c96c2dfebf11a0920655c63f7ad0961751bea99caa098
 MISC metadata.xml 719 SHA256 cd3037228281f0fae45c4112dc093e94b55c0b270f2c4114bc2011bb2eeb690c SHA512 a56ead9978fcd959c28d14e3dd0d979fe6f65b30d4abf5fc3059ce89b8981a9747afdc8d88089f3f74167d2b9403c0c8a753b6d3246531d5d0bfee540fcd251f WHIRLPOOL 60471d9b08f831f9a348d368cc1241cb77cb95056bbce39a0b3dffef33fae93ed73a553d2f483a7afb6e1afc2153e1e8a15f016a1337ffd10fe7e0225e6df16c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGvTVUACgkQgAnW8HDreRaZUACdF79kWv72+vLaKGcvKJ3ThSNZ
-Qc8An2kNCEz2FwCPHrrZs0lv8Ffd4gcE
-=doie
+iQIcBAEBCgAGBQJSAqwfAAoJELnU8jG9FVirsbgP/0CLi5mZ5VzOX2H8VLdnyEmr
+QVPlyX7MxKV7UwBnhzx+HCOSqVErk4ZYYxNUNklCu/a2Wb3u4q8kz2yjgsvNHp+Q
+CkOVnsgUQ6ZC0p9C2szTF6FKHyV1/Irmd7vgZfNufJEQrc3xSZT5WW0Jxa90GrIa
+X/uJvE7YqWypZbWzDP3uLSu3HHaIrgat24D2T6QE9+/WGQJ/+P6lOgMbHChZ7F+S
+nxuDR7l9jsyugfRg7/zqn2PwVbRnO+fnsy3+hIpI8rlU6qY7TtclXNC8a9EIkH6a
+qW7mjdRcQQ0lBqy/kBUF7SpHtHu3bH7daS9y2Ub7jzuOmNtNOjbD60mvMtObOLtS
+++GiLy7cXmLJXL4J1sbibDZueHJKA3zypsHRXD9Y8cnjaZL5zr5aktH/J2FM7LpN
+FNwUtArTuAH6uTpHQALZSCO3Qwa5cN57cH7HB00jN1dvxkN+iavKHqOjASM1sKsQ
+ngQhNNpgK/9TXyjcvj+tW6RZSAYE4ZyqN/I/4bPOYnL3FZMg+T0mjIP69xbInjQW
+3TccV1H1RyqQGONxVqgIzd28K+FJXvICpQoyT9g2VSqPKTDSwoGW27pY6csNEsEr
+oTzFoRn1hKwcmjVFpEQjHVp5mIAq6fdAYCiPM7cHMTEAKY6MUxV+YFP0jeUjP+5F
+Q9c/HJ45W6DrmHVIZgbT
+=ruN1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/vpnc-tmpfiles.conf b/net-misc/vpnc/files/vpnc-tmpfiles.conf
new file mode 100644
index 000000000000..67224ac3ef2d
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-tmpfiles.conf
@@ -0,0 +1 @@
+D /run/vpnc 0755 root root -
diff --git a/net-misc/vpnc/files/vpnc.service b/net-misc/vpnc/files/vpnc.service
new file mode 100644
index 000000000000..afd6caae68f0
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Free Cisco VPN connection to %i
+Documentation=man:vpnc(8) http://www.unix-ag.uni-kl.de/~massar/vpnc/
+Requires=network.target
+After=network.target
+ConditionPathExists=/dev/net/tun
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/vpnc/%i.conf
+PIDFile=/run/vpnc/%i.pid
+
+ExecPreStart=/etc/vpnc/scripts.d/%i-preup.sh
+ExecStart=/usr/sbin/vpnc --pid-file /run/vpnc/%i.pid
+ExecPostStart=/etc/vpnc/scripts.d/%i-postup.sh
+
+ExecPreStop=/etc/vpnc/scripts.d/%i-predown.sh
+ExecPostStop=/etc/vpnc/scripts.d/%i-postdown.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
new file mode 100644
index 000000000000..d39174d060a9
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.3_p527-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 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.1 2013/08/07 20:20:46 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"
+
+REQUIRED_USE="bindist? ( gnutls )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	resolvconf? ( net-dns/openresolv )"
+
+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
+
+	epatch "${FILESDIR}"/${PN}-0.5.3_p514-as-needed.patch
+
+	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 "${D}"/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 in http://www.gentoo.org/doc/en/vpnc-howto.xml"
+}