An addition to the init script proposed by Thomas Fischer <fischer AT unix-ag DOT uni-kl DOT de> in bug 203775: execute a script before and after start and shutdown

Package-Manager: portage-2.1.3.19

5 files changed, 174 insertions, 8 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 86a788807830..5f11482ccd8b 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.59 2008/01/02 20:19:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.60 2008/01/07 07:26:22 opfer Exp $
+
+*vpnc-0.5.1-r1 (07 Jan 2008)
+
+  07 Jan 2008; Christian Faulhammer <opfer@gentoo.org> +files/vpnc-2.init,
+  +vpnc-0.5.1-r1.ebuild:
+  An addition to the init script proposed by Thomas Fischer <fischer AT
+  unix-ag DOT uni-kl DOT de> in bug 203775: execute a script before and after
+  start and shutdown
 
   02 Jan 2008; Christian Faulhammer <opfer@gentoo.org> vpnc-0.5.1.ebuild:
   added a missing letter, pointed out by ikelos via mail
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 5b122b0130ac..678e90cac0fc 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -5,19 +5,27 @@ AUX vpnc-1.init 1421 RMD160 6eaa845b4d2ecc5af494d733e15c16a3ae5c0551 SHA1 0fd1cd
 MD5 e9bf22b582978e0b896c72ccac0c38ca files/vpnc-1.init 1421
 RMD160 6eaa845b4d2ecc5af494d733e15c16a3ae5c0551 files/vpnc-1.init 1421
 SHA256 16a0608677e24e96339a86b33eb778b9bd578b9f642febfeaf6b36f0cd8aea8a files/vpnc-1.init 1421
+AUX vpnc-2.init 1993 RMD160 9156841dc5f48b9caed51a5762ddf4816693bc4d SHA1 fa2bf0bf8e028c5ac79a0c810d4dabed5f911f51 SHA256 7b250b0460395fe2223f57bb4800d99fe2a1722c5ad7a037e0871aea2704b0d8
+MD5 68f87dc635472e9ace4bf071e05e9468 files/vpnc-2.init 1993
+RMD160 9156841dc5f48b9caed51a5762ddf4816693bc4d files/vpnc-2.init 1993
+SHA256 7b250b0460395fe2223f57bb4800d99fe2a1722c5ad7a037e0871aea2704b0d8 files/vpnc-2.init 1993
 AUX vpnc.confd 123 RMD160 91f85e5785342817caa9252eadc125c95ace5a30 SHA1 4eb5637e5c3d1ce5c78ad884e6c8b2b859156987 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350cfe728b4a88
 MD5 5c9fe863f70cc5262c095012b4bcc163 files/vpnc.confd 123
 RMD160 91f85e5785342817caa9252eadc125c95ace5a30 files/vpnc.confd 123
 SHA256 89a14f4d11b7fb156dd823e5d2c15edd0d5ca649bd16460ef6350cfe728b4a88 files/vpnc.confd 123
 DIST vpnc-0.5.1.tar.gz 91496 RMD160 76dd5a3a38bd2109cf8e1fbad85e2762e8489832 SHA1 efc71dba03aa40945af35e4b074d99f922ff7ffd SHA256 f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed
+EBUILD vpnc-0.5.1-r1.ebuild 1851 RMD160 bfd2e420fa3d1840b4ed89f7428d94a318c07e7f SHA1 f5caecfaa2dc334a5775d3d03ad05c33f624cca3 SHA256 f4214a30c6d57d887177617ff7eb91a600d5ae3788d77053ceb4e4304beed329
+MD5 7d8e484a8fcaddb17f9b47d7171525cd vpnc-0.5.1-r1.ebuild 1851
+RMD160 bfd2e420fa3d1840b4ed89f7428d94a318c07e7f vpnc-0.5.1-r1.ebuild 1851
+SHA256 f4214a30c6d57d887177617ff7eb91a600d5ae3788d77053ceb4e4304beed329 vpnc-0.5.1-r1.ebuild 1851
 EBUILD vpnc-0.5.1.ebuild 1845 RMD160 698b3347a1171e5a09a9ea53f31573db1ee1fd84 SHA1 7d37b2d44d1b451d304fdf76c1665fb5fd307c6a SHA256 41ebc590474d23df3567bd879e70fb89ec39a834fd129ada3b4bd127c6f8ac4b
 MD5 703ccbb9ca2f7db709ad2e0a1b9c9736 vpnc-0.5.1.ebuild 1845
 RMD160 698b3347a1171e5a09a9ea53f31573db1ee1fd84 vpnc-0.5.1.ebuild 1845
 SHA256 41ebc590474d23df3567bd879e70fb89ec39a834fd129ada3b4bd127c6f8ac4b vpnc-0.5.1.ebuild 1845
-MISC ChangeLog 8596 RMD160 6833cfea4fb92638342e268f879c03e12cff4b9e SHA1 b6677ddaed5d43a4e3e92a5cf8185eb9a2487d2d SHA256 ee52e3e0e0fb701fce4b7ffd5b9d23d876c254ffac3f5cfa298e7ff6e90b921b
-MD5 c277017a282487cc750f88b9c8274631 ChangeLog 8596
-RMD160 6833cfea4fb92638342e268f879c03e12cff4b9e ChangeLog 8596
-SHA256 ee52e3e0e0fb701fce4b7ffd5b9d23d876c254ffac3f5cfa298e7ff6e90b921b ChangeLog 8596
+MISC ChangeLog 8898 RMD160 846efbd15898b3fdb16920c16c2af317eb2022a4 SHA1 8747aa80e90ed1af40f61f64f48b6197ab5ebdcd SHA256 867681630d42c2feb119f55c67a43a9009b07bea4ffadcf7a21a2645c21aa9a4
+MD5 3d91c8ba46d5463579fe61e497ed284d ChangeLog 8898
+RMD160 846efbd15898b3fdb16920c16c2af317eb2022a4 ChangeLog 8898
+SHA256 867681630d42c2feb119f55c67a43a9009b07bea4ffadcf7a21a2645c21aa9a4 ChangeLog 8898
 MISC metadata.xml 318 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 SHA1 822bfa896902a43039ce449fbe983a9167ca1d28 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892
 MD5 d39e3ffd56e4e35cc45d0d2ca177384b metadata.xml 318
 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 metadata.xml 318
@@ -25,10 +33,13 @@ SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892 metadata
 MD5 af9d91a5a204420dfe36f1b1e71d94a2 files/digest-vpnc-0.5.1 229
 RMD160 e2043557430983774c487165e1c03fc7e04544d9 files/digest-vpnc-0.5.1 229
 SHA256 6ee27b5d5c656ee5663e399243f8e16c879a4b98702a00ce4be13e27b4ae3ad2 files/digest-vpnc-0.5.1 229
+MD5 af9d91a5a204420dfe36f1b1e71d94a2 files/digest-vpnc-0.5.1-r1 229
+RMD160 e2043557430983774c487165e1c03fc7e04544d9 files/digest-vpnc-0.5.1-r1 229
+SHA256 6ee27b5d5c656ee5663e399243f8e16c879a4b98702a00ce4be13e27b4ae3ad2 files/digest-vpnc-0.5.1-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHe/H1NQqtfCuFneMRAt1ZAKCH7xBHYReE9nvwWMXsktLEHYl5fACgh2PJ
-0Ssu7mnWoKmmcujbRBp+1u0=
-=iXb7
+iD8DBQFHgdUINQqtfCuFneMRAneqAJwOSSSMkRfgNg+gA7lMKgdBJb5e8gCfVd5x
+F926pKZdJ12JqtxzKkatyaE=
+=PfTP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/digest-vpnc-0.5.1-r1 b/net-misc/vpnc/files/digest-vpnc-0.5.1-r1
new file mode 100644
index 000000000000..ac1fb53b1a03
--- /dev/null
+++ b/net-misc/vpnc/files/digest-vpnc-0.5.1-r1
@@ -0,0 +1,3 @@
+MD5 7a8e94dbe94f39a4fd89b72e0125f66f vpnc-0.5.1.tar.gz 91496
+RMD160 76dd5a3a38bd2109cf8e1fbad85e2762e8489832 vpnc-0.5.1.tar.gz 91496
+SHA256 f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed vpnc-0.5.1.tar.gz 91496
diff --git a/net-misc/vpnc/files/vpnc-2.init b/net-misc/vpnc/files/vpnc-2.init
new file mode 100644
index 000000000000..0beb63e81584
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-2.init
@@ -0,0 +1,87 @@
+#!/sbin/runscript
+
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/files/vpnc-2.init,v 1.1 2008/01/07 07:26:23 opfer Exp $
+
+VPNDIR="/etc/vpnc"
+VPN="${SVCNAME#*.}"
+if [ -n ${VPN} ] && [ ${SVCNAME} != "vpnc" ]; then
+	VPNPID="/var/run/vpnc/${VPN}.pid"
+else
+	VPNPID="/var/run/vpnc.pid"
+fi
+VPNCONF="${VPNDIR}/${VPN}.conf"
+VPNSCRIPTDIR="${VPNDIR}/scripts.d"
+PREUPSCRIPT="${VPNSCRIPTDIR}/${VPN}-preup.sh"
+PREDOWNSCRIPT="${VPNSCRIPTDIR}/${VPN}-predown.sh"
+POSTUPSCRIPT="${VPNSCRIPTDIR}/${VPN}-postup.sh"
+POSTDOWNSCRIPT="${VPNSCRIPTDIR}/${VPN}-postdown.sh"
+
+depend() {
+	need net
+	before netmount
+}
+
+checktundevice() {
+	if [ ! -e /dev/net/tun ]; then
+		if ! modprobe tun ; then
+			eerror "TUN/TAP support is not available in this kernel"
+			return 1
+		fi
+	fi
+	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
+		ebegin "Detected broken /dev/net/tun symlink, fixing..."
+		rm -f /dev/net/tun
+		ln -s /dev/misc/net/tun /dev/net/tun
+		eend $?
+	fi
+}
+
+screenoutput() {
+    if [ "${VPNCOUTPUT}" = "yes" ]; then
+	export SCREEN_OUTPUT="/dev/stdout"
+    else
+	export SCREEN_OUTPUT="/dev/null"
+    fi
+}
+
+start() {
+	ebegin "Starting VPNC: ${VPN}"
+
+	checktundevice || return 1
+	screenoutput
+
+	if [ ! -e "${VPNCONF}" ]; then
+		eend 1 "${VPNCONF} does not exist"
+		return 1
+	fi
+
+	local args=""
+
+	if [ -x "${PREUPSCRIPT}" ] ; then 
+		"${PREUPSCRIPT}" > ${SCREEN_OUTPUT}
+	fi
+
+	start-stop-daemon --start --pidfile "${VPNPID}" --exec /usr/sbin/vpnc \
+		-- --pid-file "${VPNPID}" "${VPNCONF}" > ${SCREEN_OUTPUT}
+	if [ -x "${POSTUPSCRIPT}" ] ; then 
+		"${POSTUPSCRIPT}" > ${SCREEN_OUTPUT}
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping VPNC: ${VPN}"
+	screenoutput
+	if [ -x "${PREDOWNSCRIPT}" ] ; then 
+		"${PREDOWNSCRIPT}" > ${SCREEN_OUTPUT}
+	fi
+
+	start-stop-daemon --stop --exec /usr/sbin/vpnc --pidfile "${VPNPID}"
+
+	if [ -x "${POSTDOWNSCRIPT}" ] ; then 
+		"${POSTDOWNSCRIPT}" > ${SCREEN_OUTPUT}
+	fi
+	eend $?
+}
diff --git a/net-misc/vpnc/vpnc-0.5.1-r1.ebuild b/net-misc/vpnc/vpnc-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..7e9fccdf18c7
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.5.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.5.1-r1.ebuild,v 1.1 2008/01/07 07:26:22 opfer Exp $
+
+inherit linux-info
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+SRC_URI="http://www.unix-ag.uni-kl.de/~massar/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hybrid-auth bindist resolvconf"
+
+DEPEND=">=dev-libs/libgcrypt-1.1.91
+	>=sys-apps/iproute2-2.6.19.20061214
+	!bindist? ( hybrid-auth? ( dev-libs/openssl ) )"
+
+RDEPEND="${DEPEND}
+	resolvconf? ( ||
+		( net-dns/resolvconf-gentoo net-dns/openresolv )
+	)"
+
+pkg_setup()	 {
+	if use hybrid-auth && use bindist; then
+		ewarn "Hybrid authentication will be disabled for this packages as you will"
+		ewarn "redistribute it in binary form.  This is not allowed due to linking"
+		ewarn "of OpenSSL."
+	fi
+	local CONFIG_CHECK="TUN"
+	check_extra_config
+}
+
+src_compile() {
+	# is reported upstream and fixed in next version
+	sed -e "s:/usr/local:/usr:" -i vpnc-script
+	# only allowed if not distributed in binary form!
+	if use hybrid-auth && ! use bindist; then
+		hybridauthopts="OPENSSL_GPL_VIOLATION=-DOPENSSL_GPL_VIOLATION OPENSSLLIBS=-lcrypto"
+	fi
+	emake ${hybridauthopts} || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
+	dodoc README TODO VERSION
+	keepdir /var/run/vpnc
+	newinitd "${FILESDIR}/vpnc-2.init" vpnc
+	newconfd "${FILESDIR}/vpnc.confd" 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 to be found in http://www.gentoo.org/doc/en/vpnc-howto.xml"
+}