net-misc/openvpn version bump and bugfixes

2 files changed, 28 insertions, 10 deletions

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
 }