make use of our initscript again, fixes #94350. the initscript now supports checking if a connection is already online, see #92369 for details. thanks to Christian Hesse <mail@earthworm.de> for the suggestion.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 120 insertions, 18 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index d522005d0d42..171ee4e6b99f 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.30 2005/05/28 17:02:41 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.31 2005/05/30 13:17:50 luckyduck Exp $
+
+*openvpn-2.0-r1 (30 May 2005)
+
+  30 May 2005; Jan Brinkmann <luckyduck@gentoo.org> files/openvpn,
+  +openvpn-2.0-r1.ebuild:
+  make use of our initscript again, fixes #94350. the initscript now supports
+  checking if a connection is already online, see #92369 for details. thanks
+  to Christian Hesse <mail@earthworm.de> for the suggestion.
 
   28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> openvpn-2.0.ebuild:
   stable on amd64, ppc and x86
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 8d7a66fc0051..4cbaabb50857 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
 MD5 fe0caa79d6679de472051e70aea4a00e openvpn-2.0.ebuild 1916
-MD5 c997c417ba27908fdf49761b374c37f3 ChangeLog 4448
+MD5 0a330e44fbcb9f679ea73aae346b4a5e ChangeLog 4789
+MD5 4d8c85a4c029ee46f9c1896f6dc786fc openvpn-2.0-r1.ebuild 2099
 MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
 MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
 MD5 a455c11efdca8a3caadbac543345490e files/digest-openvpn-2.0 63
+MD5 a455c11efdca8a3caadbac543345490e files/digest-openvpn-2.0-r1 63
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 62150e7ee165ac0f0db05fbbfefe17bd files/openvpn 1019
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCmKRL06ebR+OMO78RAqOaAJwLNl4aY0vA8V0mNvYhxeTUoQiqrACdHtAg
-Bg9eSb1JrLG/s+s9branZig=
-=IsiZ
+iD8DBQFCmxKZ06ebR+OMO78RAucxAJkB58OywIDcT2oNdigpr53ZJH9wYwCdEOAh
+9CnwnjARREAtcS+Mv2VSCk4=
+=93v1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0-r1 b/net-misc/openvpn/files/digest-openvpn-2.0-r1
new file mode 100644
index 000000000000..04f9815947df
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0-r1
@@ -0,0 +1 @@
+MD5 7401faebc6baee9add32608709c54eec openvpn-2.0.tar.gz 639201
diff --git a/net-misc/openvpn/files/openvpn b/net-misc/openvpn/files/openvpn
index 4bf3f3d93c68..e0b7c14f36cf 100644
--- a/net-misc/openvpn/files/openvpn
+++ b/net-misc/openvpn/files/openvpn
@@ -18,30 +18,43 @@ checktundevice() {
 start() {
 	checktundevice || return 1
 	
-	cd $VPNDIR
+	cd ${VPNDIR}
 	for VPN in *
 	do
-		if [ -d $VPN ] && [ -e $VPN/local.conf ]; then
-			ebegin "Starting openvpn for $VPN"
-				start-stop-daemon --start --pidfile /var/run/openvpn-$VPN.pid --startas /usr/sbin/openvpn -- --config $VPN/local.conf --writepid /var/run/openvpn-$VPN.pid --daemon --cd $VPN
-			eend $?
+		if [ -d ${VPN} ] && [ -e ${VPN}/local.conf ]; then
+			if [ -f ${VPN}/onlinecheck ]; then
+				ping -c 3 `head -n 1 ${VPN}/onlinecheck` >& /dev/null
+			else
+				false
+			fi
+			
+			if [ $? -gt 0 ]; then
+				ebegin "Starting openvpn for ${VPN}"
+					start-stop-daemon --start --pidfile /var/run/openvpn-${VPN}.pid \
+						  	  --startas /usr/sbin/openvpn -- --config ${VPN}/local.conf \
+						  				 	--writepid /var/run/openvpn-${VPN}.pid \
+										 	--daemon --cd ${VPN}
+				eend $?
+			else
+				einfo "Connection ${VPN} already online. Skipping..."
+			fi
 		else
-			ewarn "Expected $VPNDIR/$VPN to be a directory containing a local.conf."
+			ewarn "Expected ${VPNDIR}/${VPN} to be a directory containing a local.conf."
 		fi
 	done
 }
 
 stop() {
-	cd $VPNDIR
+	cd ${VPNDIR}
 	for VPN in *
 	do
-		if [ -e /var/run/openvpn-$VPN.pid ]; then
-			ebegin "Stopping openvpn for $VPN"
-				start-stop-daemon --oknodo --stop --pidfile /var/run/openvpn-$VPN.pid
-				rm /var/run/openvpn-$VPN.pid
+		if [ -e /var/run/openvpn-${VPN}.pid ]; then
+			ebegin "Stopping openvpn for ${VPN}"
+				start-stop-daemon --oknodo --stop --pidfile /var/run/openvpn-${VPN}.pid
+				rm /var/run/openvpn-${VPN}.pid
 			eend 0
 		else
-			ewarn "$VPN has no pidfile!"
+			ewarn "${VPN} has no pidfile!"
 		fi
 	done
 	return 0
diff --git a/net-misc/openvpn/openvpn-2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.0-r1.ebuild
new file mode 100644
index 000000000000..411942dec61f
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0-r1.ebuild,v 1.1 2005/05/30 13:17:50 luckyduck Exp $
+
+inherit gnuconfig
+
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://openvpn.net/release/openvpn-${PV}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ppc-macos ~amd64"
+IUSE="examples ssl threads"
+
+RDEPEND=">=dev-libs/lzo-1.07
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack ${A}
+	gnuconfig_update
+}
+
+src_compile() {
+	econf \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable threads pthread) \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# install documentation
+	dodoc AUTHORS ChangeLog INSTALL PORTS README
+
+	# Empty dir
+	dodir /etc/openvpn
+	keepdir /etc/openvpn
+
+	# Install the init script
+	newinitd ${FILESDIR}/openvpn
+
+	# Install easy-rsa stuffs
+	dodir /usr/share/${PN}/easy-rsa
+	exeinto /usr/share/${PN}/easy-rsa
+	doexe easy-rsa/*
+	exeopts -m0644
+
+	# install examples, controlled by the respective useflag
+	if use examples; then
+		local sampledir="/usr/share/doc/${PN}/examples"
+		dodir ${sampledir}
+
+		cp -r sample-{config-files,keys,scripts} ${D}${sampledir}
+		cp -r contrib/ ${D}${sampledir}
+	fi
+}
+
+pkg_postinst() {
+	ewarn "This version of OpenVPN is NOT COMPATIBLE with older versions!"
+	ewarn "If you need compatibility with a version < 2 please emerge"
+	ewarn "that one."
+	einfo ""
+	einfo "The init.d script that comes with OpenVPN expects directories"
+	einfo "/etc/openvpn/*/ with a local.conf and any supporting files,"
+	einfo "such as keys."
+	einfo ""
+	ewarn "If you've used 2.0 already make sure to move your configuration"
+	ewarn "files into a subdirectory of /etc/openvpn, for example to:"
+	ewarn "/etc/openvpn/myconf and rename your configfile to local.conf"
+	ewarn ""
+	ebeep
+}