net-misc/openvpn version bump and bugfixes

5 files changed, 86 insertions, 17 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 8e522b5fa1d3..44838beae10e 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.9 2003/08/04 00:40:41 warpzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.10 2003/12/24 12:32:35 warpzero Exp $
+
+*openvpn-1.4.2 (03 Aug 2003)
+
+  03 Aug 2003; <warpzero@gentoo.org> metadata.xml, openvpn-1.5.0.ebuild:
+  version 1.5.0 added
+  fixed init script added. Closes several bugs.
 
 *openvpn-1.4.2 (03 Aug 2003)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 7c01854b61ae..079158825949 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,13 +1,15 @@
-MD5 ce1e53e3dd015f5836bbc5b74782f9de ChangeLog 1573
+MD5 dc3852a6008852fb7958f991dd483a96 openvpn-1.3.2.ebuild 822
+MD5 2de9da0d590892190e917353a143266e openvpn-1.4.2.ebuild 883
+MD5 6a30add01bd33b5587d7a5c114743c32 openvpn-1.5.0.ebuild 1191
 MD5 3f7e95773164d6e54c960cb4f216922a openvpn-1.1.0.ebuild 826
+MD5 031b7410ff18b1435b8346dd0019f9db ChangeLog 1748
 MD5 b6d5913240f443c12b8e9454c10d64c2 openvpn-1.3.1.ebuild 825
-MD5 dc3852a6008852fb7958f991dd483a96 openvpn-1.3.2.ebuild 822
-MD5 6c7080db0c0408fa3910c95f03048de3 openvpn-1.3.2-r1.ebuild 913
 MD5 232573506834f53e9038fe52ab3aba03 metadata.xml 532
-MD5 2de9da0d590892190e917353a143266e openvpn-1.4.2.ebuild 883
+MD5 6c7080db0c0408fa3910c95f03048de3 openvpn-1.3.2-r1.ebuild 913
 MD5 7a773fcca001e35d171b15d68d435d97 files/digest-openvpn-1.1.0 65
 MD5 45d5378d808bbb444fe4435d781b4329 files/digest-openvpn-1.3.1 65
 MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2 65
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 65
-MD5 13b6f9ae7f19da756c1b1fb22a6da994 files/openvpn 514
 MD5 e21b10320b90f5cb54d5e90d2d9ad8eb files/digest-openvpn-1.4.2 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0 65
+MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 65
+MD5 c3cd49d9c5c41850df1e6c6012ac1018 files/openvpn 1018
diff --git a/net-misc/openvpn/files/digest-openvpn-1.5.0 b/net-misc/openvpn/files/digest-openvpn-1.5.0
new file mode 100644
index 000000000000..381ed4f7391a
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-1.5.0
@@ -0,0 +1 @@
+MD5 55d7ce958bb2ccf3d3204d1350c27179 openvpn-1.5.0.tar.gz 403792
diff --git a/net-misc/openvpn/files/openvpn b/net-misc/openvpn/files/openvpn
index b025eae0e103..75168cd4ee1a 100644
--- a/net-misc/openvpn/files/openvpn
+++ b/net-misc/openvpn/files/openvpn
@@ -6,17 +6,28 @@ depend() {
 	need net
 }
 
+checktundevice() {
+	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
+		ebegin Detected broken /dev/net/tun symlink, fixing...
+			rm /dev/net/tun
+			ln -s /dev/misc/net/tun /dev/net/tun
+		eend $?
+	fi
+}
+
 start() {
+	checktundevice || return 1
+	
 	cd $VPNDIR
 	for VPN in *
 	do
-		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
+			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
+			ewarn "Expected $VPNDIR/$VPN to be a directory containing a local.conf."
+		fi
 	done
 }
 
@@ -24,8 +35,14 @@ stop() {
 	cd $VPNDIR
 	for VPN in *
 	do
-		ebegin "Stoping openvpn for $VPN"
-		start-stop-daemon --stop --pidfile /var/run/openvpn-$VPN.pid
-		eend $?
+		if [ -e /var/run/openvpn-$VPN.pid ]; then
+			ebegin "Stoping 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!"
+		fi
 	done
+	return 0
 }
diff --git a/net-misc/openvpn/openvpn-1.5.0.ebuild b/net-misc/openvpn/openvpn-1.5.0.ebuild
new file mode 100644
index 000000000000..bb8729923106
--- /dev/null
+++ b/net-misc/openvpn/openvpn-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0.ebuild,v 1.1 2003/12/24 12:32:36 warpzero Exp $
+
+IUSE="ssl"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
+SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/openvpn/${P}.tar.gz"
+HOMEPAGE="http://openvpn.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND=">=dev-libs/lzo-1.07
+	virtual/linux-sources
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+src_compile() {
+
+	local myconf
+
+	use ssl || myconf='--disable-ssl --disable-crypto'
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodoc COPYING CHANGES INSTALL PORTS README
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/openvpn
+}
+
+
+pkg_postinst() {
+	einfo "The init.d script that comes with OpenVPN expects directories /etc/openvpn/*/ with a local.conf and any supporting files, such as keys."
+	ewarn "This version of OpenVPN is NOT COMPATIBLE with 1.4.2!"
+	ewarn "If you need compatibility with 1.4.2 please emerge that version."
+}