added an impoved init file, provided by James Wells <james_wells@users.sourceforge.net> in bug 167913; added a check for CONFIG_TUN in the Kernel config

Package-Manager: portage-2.1.2-r9

5 files changed, 122 insertions, 8 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index e526420377b4..cb25111bac0e 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.29 2007/02/22 06:42:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.30 2007/02/22 07:26:09 opfer Exp $
+
+*vpnc-0.4.0-r1 (22 Feb 2007)
+
+  22 Feb 2007; Christian Faulhammer <opfer@gentoo.org> +files/vpnc.init,
+  +vpnc-0.4.0-r1.ebuild:
+  added an impoved init file, provided by James Wells
+  <james_wells@users.sourceforge.net> in bug 167913; added a check for
+  CONFIG_TUN in the Kernel config
 
   22 Feb 2007; Christian Faulhammer <opfer@gentoo.org> files/vpnc:
   correct init file entry
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index bc6a8ff1d9e8..322e4e6b8fce 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -9,6 +9,10 @@ AUX vpnc-iproute-fix-2.diff 331 RMD160 38541f070339a35f04f73c496e65a6dac728144b
 MD5 4e1396bc9dfd19b437f5c69af75ca290 files/vpnc-iproute-fix-2.diff 331
 RMD160 38541f070339a35f04f73c496e65a6dac728144b files/vpnc-iproute-fix-2.diff 331
 SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4 files/vpnc-iproute-fix-2.diff 331
+AUX vpnc.init 1169 RMD160 8b36394bc74c465f499de9ca465e57b46dfa2f97 SHA1 375093424c98116e045ba7091b8d94f876b714f0 SHA256 cd5c89f54b7e2f9fad6cad199d44746f133395f6759bc663f85f331b49d10e94
+MD5 0f5a60ffcc17081627b3d329a1ac788f files/vpnc.init 1169
+RMD160 8b36394bc74c465f499de9ca465e57b46dfa2f97 files/vpnc.init 1169
+SHA256 cd5c89f54b7e2f9fad6cad199d44746f133395f6759bc663f85f331b49d10e94 files/vpnc.init 1169
 DIST vpnc-0.3.3.tar.gz 59939 RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da SHA1 95559e1c5b1f4bc78dc1a0b9f95e1a2d65a84c0a SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
 DIST vpnc-0.3.4_pre20061029.tar.bz2 54644 RMD160 22d7f75251b2eca85c7fd915d26295a64a07b411 SHA1 700812e7a358f67b4b6c4a00a69a2a82c83771df SHA256 957277c5c61b5aa0c00578438f3b561f8d1d4fcfe1939a14ec320b6f7a795299
 DIST vpnc-0.3.4_pre20061219.tar.bz2 54731 RMD160 1da17b0aa07cf23876e7659b54cbac95bd8f59c6 SHA1 7fa8099ec5ebd93abc504c592fc14814cfea2b16 SHA256 16d0379b9f95acfcac2a0758b614d501043ddb1b1309b7188cc6d990b2903b78
@@ -25,14 +29,18 @@ EBUILD vpnc-0.3.4_pre20061219.ebuild 781 RMD160 d2d905c08269d81a30aac765594f322a
 MD5 b7980571764060b257ff7a65f84787a8 vpnc-0.3.4_pre20061219.ebuild 781
 RMD160 d2d905c08269d81a30aac765594f322a4efc73eb vpnc-0.3.4_pre20061219.ebuild 781
 SHA256 f13ee9fd1d2f6c60a81a79e832fdb452b1f3850658f157db8eea881bc99a1a27 vpnc-0.3.4_pre20061219.ebuild 781
+EBUILD vpnc-0.4.0-r1.ebuild 867 RMD160 f3371df8b69bec80bc6754a9d7e20fb96b802d02 SHA1 2d9b650b7c86713cb3eddaf31f79284c031a42dd SHA256 8ae17b36926f8bb33748d4269ffe6a0c0cd22a53fa1a58423cb63a6eb5e82a02
+MD5 da6c1fc8245bcdc08fd2cf6d614d0d37 vpnc-0.4.0-r1.ebuild 867
+RMD160 f3371df8b69bec80bc6754a9d7e20fb96b802d02 vpnc-0.4.0-r1.ebuild 867
+SHA256 8ae17b36926f8bb33748d4269ffe6a0c0cd22a53fa1a58423cb63a6eb5e82a02 vpnc-0.4.0-r1.ebuild 867
 EBUILD vpnc-0.4.0.ebuild 765 RMD160 4652c11e48cd52c02ec4d2c87a700df1f0d24d4f SHA1 d66770109dc3e91407d5e140833f687963e1f3ce SHA256 fd1af830ee89bdfa291d532083cb441424d3b2ef05ed680d53e2473e7afa8283
 MD5 3a1458e234d9ec0420c945b7f39802ac vpnc-0.4.0.ebuild 765
 RMD160 4652c11e48cd52c02ec4d2c87a700df1f0d24d4f vpnc-0.4.0.ebuild 765
 SHA256 fd1af830ee89bdfa291d532083cb441424d3b2ef05ed680d53e2473e7afa8283 vpnc-0.4.0.ebuild 765
-MISC ChangeLog 3565 RMD160 1a4220b8d0f4060f72c7b19d61d20af95262487b SHA1 00b4fa3cab1a84a4ff39d4e744f49ba6be19197b SHA256 37a7a47c247b8fb992f0d386387976543926076558b933e3cf8cd35b3b616d62
-MD5 e8c028e9c1bb0f60edf31f6f63b3d7ce ChangeLog 3565
-RMD160 1a4220b8d0f4060f72c7b19d61d20af95262487b ChangeLog 3565
-SHA256 37a7a47c247b8fb992f0d386387976543926076558b933e3cf8cd35b3b616d62 ChangeLog 3565
+MISC ChangeLog 3853 RMD160 d1fe4836a530895b57ff72dd60fa6bdeaf06b653 SHA1 6eb7264d38c7365e50010c6b9d19983d02422488 SHA256 ada854f9b8d3944326ad69a42026c42b3f9b16ae04f4d33225c8e2f07690c2b7
+MD5 17e9901be384b8fd73625390d2c379b8 ChangeLog 3853
+RMD160 d1fe4836a530895b57ff72dd60fa6bdeaf06b653 ChangeLog 3853
+SHA256 ada854f9b8d3944326ad69a42026c42b3f9b16ae04f4d33225c8e2f07690c2b7 ChangeLog 3853
 MISC metadata.xml 318 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 SHA1 822bfa896902a43039ce449fbe983a9167ca1d28 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892
 MD5 d39e3ffd56e4e35cc45d0d2ca177384b metadata.xml 318
 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 metadata.xml 318
@@ -49,10 +57,13 @@ SHA256 4f3584a78bb6e2c168a437a41c71fd05bf2645a19001cae78cbd2624afc06d25 files/di
 MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0 229
 RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0 229
 SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0 229
+MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r1 229
+RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r1 229
+SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3Tt1NQqtfCuFneMRAqbIAJ9yft4yfepoBPy0DiS738piXwjVTACgg7bs
-H7c/7CwwPfoL0lYX8gwqidY=
-=Fem6
+iD8DBQFF3UVhNQqtfCuFneMRAtz8AJ48InP12PPhnSbcS12DpjsV0BnN/gCffqnS
+Tquexi1Yn+67+m2z+NZQ72s=
+=3d9N
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/digest-vpnc-0.4.0-r1 b/net-misc/vpnc/files/digest-vpnc-0.4.0-r1
new file mode 100644
index 000000000000..7945ee2ab04e
--- /dev/null
+++ b/net-misc/vpnc/files/digest-vpnc-0.4.0-r1
@@ -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.init b/net-misc/vpnc/files/vpnc.init
new file mode 100644
index 000000000000..1f18348db3b6
--- /dev/null
+++ b/net-misc/vpnc/files/vpnc.init
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+}
+
+start() {
+	ebegin "Starting VPNC: ${VPN}"
+
+	checktundevice || return 1
+
+	if [[ ! -e "${VPNCONF}" ]]; then
+		eend 1 "${VPNCONF} does not exist"
+		return 1
+	fi
+
+	local args=""
+
+	start-stop-daemon --start --exec /usr/sbin/vpnc --pidfile "${VPNPID}" \
+		-- "${VPNCONF}"
+	eend $? "Check your logs to see why startup failed"
+}
+
+stop() {
+	ebegin "Stopping VPNC: ${VPN}"
+	start-stop-daemon --stop --exec /usr/sbin/vpnc --pidfile "${VPNPID}"
+	eend $?
+}
+
+# vim: ts=4
diff --git a/net-misc/vpnc/vpnc-0.4.0-r1.ebuild b/net-misc/vpnc/vpnc-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..9406a8e77cef
--- /dev/null
+++ b/net-misc/vpnc/vpnc-0.4.0-r1.ebuild
@@ -0,0 +1,35 @@
+# 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-r1.ebuild,v 1.1 2007/02/22 07:26:09 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=""
+S=${WORKDIR}/${P}
+
+DEPEND=">=dev-libs/libgcrypt-1.1.91
+	>=sys-apps/iproute2-2.6.19.20061214"
+
+pkg_setup()	 {
+	local CONFIG_CHECK="TUN"
+	check_extra_config
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die
+	dodoc ChangeLog README TODO VERSION
+	keepdir /var/run/vpnc
+	dobin pcf2vpnc
+	newinitd "${FILESDIR}/vpnc.init" vpnc
+}