revision bump which installs a conf.d file to control whether output of vpnc's init script should be redirected to oblivion or not; requested by Gautam Iyer <gi1242@users.sourceforge.net> in bug 189867

Package-Manager: portage-2.1.2.12

6 files changed, 146 insertions, 5 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index 8ac596843a0a..c86757c8224b 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.43 2007/08/19 12:22:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.44 2007/08/25 15:29:00 opfer Exp $
+
+*vpnc-0.4.0-r4 (25 Aug 2007)
+
+  25 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +files/vpnc-1.init,
+  +files/vpnc.confd, +vpnc-0.4.0-r4.ebuild:
+  revision bump which installs a conf.d file to control whether output of
+  vpnc's init script should be redirected to oblivion or not; requested by
+  Gautam Iyer <gi1242@users.sourceforge.net> in bug 189867
 
   19 Aug 2007; nixnut <nixnut@gentoo.org> vpnc-0.4.0-r3.ebuild:
   Stable on ppc wrt bug 186577
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index c6407d228b02..f05377686f95 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -2,6 +2,14 @@ AUX vpnc-0.4.0-build.patch 515 RMD160 648ef884385ce5c288ed62fbd65b2e3143c35782 S
 MD5 47cabf7711b88d2f236e7caeb018e32c files/vpnc-0.4.0-build.patch 515
 RMD160 648ef884385ce5c288ed62fbd65b2e3143c35782 files/vpnc-0.4.0-build.patch 515
 SHA256 4663a5e9e13485a96997f46865a17fddbacffa5ba0fcb80704aab12a760b76de files/vpnc-0.4.0-build.patch 515
+AUX vpnc-1.init 1454 RMD160 81339200426fe1d02039c5d8a2737be3eabb7859 SHA1 62c04cb0e87cd7d5e76fcc18938c98d5fe7058bb SHA256 471471612ed82f7634d001dcf57f43981d222f7d5a8c773195ae0d91667760a3
+MD5 8165ac9ffa3a6f0468d43083298cb050 files/vpnc-1.init 1454
+RMD160 81339200426fe1d02039c5d8a2737be3eabb7859 files/vpnc-1.init 1454
+SHA256 471471612ed82f7634d001dcf57f43981d222f7d5a8c773195ae0d91667760a3 files/vpnc-1.init 1454
+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
 AUX vpnc.init 1249 RMD160 3091bcb60524c75c43e6ad1b564708dfe677c956 SHA1 9ddea28c3541b1aa9f74db738da820800c42ba6a SHA256 f057da2e6a94dd5127c188ae204bf1d60092014c8a5643253058d0107c84148f
 MD5 f4549a893a389bb20c2032e2e4f8997d files/vpnc.init 1249
 RMD160 3091bcb60524c75c43e6ad1b564708dfe677c956 files/vpnc.init 1249
@@ -11,14 +19,18 @@ EBUILD vpnc-0.4.0-r3.ebuild 1236 RMD160 899766ded98f63497bfa3976cbbee0188e689be8
 MD5 5a4ad13a9a0696a4fde33f9c41c55b04 vpnc-0.4.0-r3.ebuild 1236
 RMD160 899766ded98f63497bfa3976cbbee0188e689be8 vpnc-0.4.0-r3.ebuild 1236
 SHA256 e940aa00b2d052e1900deb9329f503deba8141879760719cc4dfb65e33a6376b vpnc-0.4.0-r3.ebuild 1236
+EBUILD vpnc-0.4.0-r4.ebuild 1279 RMD160 4d277f6e399db896e1494f1b26fc593dfe678813 SHA1 b6971e0d47c0eb51d3011056efe7d63b75ffc737 SHA256 6d22f8a290839ea7376d81b82ff4d9938ba25a5c06843e10831751f4cbd04c42
+MD5 907335989b2101bb0eb5e773dd5fca58 vpnc-0.4.0-r4.ebuild 1279
+RMD160 4d277f6e399db896e1494f1b26fc593dfe678813 vpnc-0.4.0-r4.ebuild 1279
+SHA256 6d22f8a290839ea7376d81b82ff4d9938ba25a5c06843e10831751f4cbd04c42 vpnc-0.4.0-r4.ebuild 1279
 EBUILD vpnc-0.4.0.ebuild 745 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 SHA1 49b4d3e121e93de8766413b3a112ff6730589f6d SHA256 6d6a1ab552b584caf4d70dc7bf8263ccf62bedeca61c89ee3da2f07164e8b36f
 MD5 ea30837254ca7f41d8a0c3d7fd7f2936 vpnc-0.4.0.ebuild 745
 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 vpnc-0.4.0.ebuild 745
 SHA256 6d6a1ab552b584caf4d70dc7bf8263ccf62bedeca61c89ee3da2f07164e8b36f vpnc-0.4.0.ebuild 745
-MISC ChangeLog 5719 RMD160 0ad3b001afabbe1ae0f0468cb716571a5f4138c9 SHA1 4103e86ee37220c8b61269b90e8c72e34a377c4d SHA256 49c55b96f07637a5a62affb9697c1daa4cbd2759334bc6bb1f1c53c8766ddf5d
-MD5 c873c97ca7f408812b3fef003ddf8548 ChangeLog 5719
-RMD160 0ad3b001afabbe1ae0f0468cb716571a5f4138c9 ChangeLog 5719
-SHA256 49c55b96f07637a5a62affb9697c1daa4cbd2759334bc6bb1f1c53c8766ddf5d ChangeLog 5719
+MISC ChangeLog 6076 RMD160 8d73896aec4c57768113e23d75d6d83879b0caec SHA1 2474e81ac5efdaa8eb9820067825d787f5dcc46f SHA256 f89c25a47e1ccafaff5de17d011ba5a2f6a4dd6968dea6e87950172b19e5d27f
+MD5 ec6e701f797c970db7b5ca5a6cf20a58 ChangeLog 6076
+RMD160 8d73896aec4c57768113e23d75d6d83879b0caec ChangeLog 6076
+SHA256 f89c25a47e1ccafaff5de17d011ba5a2f6a4dd6968dea6e87950172b19e5d27f ChangeLog 6076
 MISC metadata.xml 318 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 SHA1 822bfa896902a43039ce449fbe983a9167ca1d28 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892
 MD5 d39e3ffd56e4e35cc45d0d2ca177384b metadata.xml 318
 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 metadata.xml 318
@@ -29,3 +41,6 @@ SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/di
 MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r3 229
 RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r3 229
 SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r3 229
+MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r4 229
+RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r4 229
+SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r4 229
diff --git a/net-misc/vpnc/files/digest-vpnc-0.4.0-r4 b/net-misc/vpnc/files/digest-vpnc-0.4.0-r4
new file mode 100644
index 000000000000..7945ee2ab04e
--- /dev/null
+++ b/net-misc/vpnc/files/digest-vpnc-0.4.0-r4
@@ -0,0 +1,3 @@
+MD5 604807e7dd90fce00a4e2344ee29c76d vpnc-0.4.0.tar.gz 75491
+RMD160 1640481601074d4517746f6e3b147b12f24b06e3 vpnc-0.4.0.tar.gz 75491
+SHA256 f91c6bc2547cb503fde4f244ba82304553fec3954c65521482f8db2491700586 vpnc-0.4.0.tar.gz 75491
diff --git a/net-misc/vpnc/files/vpnc-1.init b/net-misc/vpnc/files/vpnc-1.init
new file mode 100644
index 000000000000..cd96eb5373ff
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc-1.init
@@ -0,0 +1,66 @@
+#!/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-1.init,v 1.1 2007/08/25 15:29:00 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"
+
+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"
+    elif [ "${VPNCOUTPUT}" = "no" ]; then
+	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=""
+
+	start-stop-daemon --start --pidfile "${VPNPID}" --exec /usr/sbin/vpnc \
+		-- --pid-file "${VPNPID}" "${VPNCONF}" > ${SCREEN_OUTPUT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping VPNC: ${VPN}"
+	start-stop-daemon --stop --exec /usr/sbin/vpnc --pidfile "${VPNPID}"
+	eend $?
+}
diff --git a/net-misc/vpnc/files/vpnc.confd b/net-misc/vpnc/files/vpnc.confd
new file mode 100644
index 000000000000..62789bd407ec
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc.confd
@@ -0,0 +1,4 @@
+# If you wish to see the output made by vpnc, for example the password
+# prompt, set this variable to yes
+
+VPNCOUTPUT="no"
diff --git a/net-misc/vpnc/vpnc-0.4.0-r4.ebuild b/net-misc/vpnc/vpnc-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..c1964e51e94d
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.4.0-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/vpnc-0.4.0-r4.ebuild,v 1.1 2007/08/25 15:29:00 opfer Exp $
+
+inherit eutils 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=""
+
+DEPEND=">=dev-libs/libgcrypt-1.1.91
+	>=sys-apps/iproute2-2.6.19.20061214"
+
+pkg_setup()	 {
+	local CONFIG_CHECK="TUN"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# not needed anymore with releases >0.4.0
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
+	dodoc README TODO VERSION
+	keepdir /var/run/vpnc
+	dobin pcf2vpnc
+	dobin cisco-decrypt
+	newinitd "${FILESDIR}/vpnc-1.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"
+}