init script now modprobes tun if /dev/tun does not exist and errors

  if tun/tap support is not enabled in the kernel

  iproute2 USE flag fixed as --disable-iproute2 also enables it in the Makefile
Package-Manager: portage-2.0.51.22-r3

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index dbf36688de077aee460a6b253c00dad2956963ef..bfde44451277f66e8eb54c0e9dd00fd671040f18 100644 (file)
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,15 @@
 # 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.45 2005/10/14 11:37:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.46 2005/10/14 13:04:32 uberlord Exp $
+
+*openvpn-2.0.2-r3 (14 Oct 2005)
+
+  14 Oct 2005; Roy Marples <uberlord@gentoo.org> files/openvpn.init,
+  -openvpn-2.0.2-r2.ebuild, +openvpn-2.0.2-r3.ebuild:
+  init script now modprobes tun if /dev/tun does not exist and errors
+  if tun/tap support is not enabled in the kernel
+  
+  iproute2 USE flag fixed as --disable-iproute2 also enables it in the Makefile
 
 *openvpn-2.0.2-r2 (14 Oct 2005)
 

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 28a747bd308b85929d015fee36a82a8bbf3e77db..62acc312b9bcd013a0c4a66d92b02cb264a70121 100644 (file)
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,14 +1,14 @@
 MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
 MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
-MD5 0a0d7825c4b81baf467fac99c257ec49 openvpn-2.0.2-r2.ebuild 3316
-MD5 08f262baff75478abcdd394904973810 ChangeLog 6962
+MD5 3cfae6f24887b9f5ca3dca1951864cb4 ChangeLog 7322
+MD5 977cd32e522ad50962ec444274a6fa61 openvpn-2.0.2-r3.ebuild 3478
 MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
 MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
 MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
-MD5 e11cacd58f0b6b9900317d4d0d4edb8f files/openvpn.init 975
+MD5 9a4a53360a88a0c7d9b9c020921e48a8 files/openvpn.init 1116
 MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r2 65
 MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65

diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.2-r2 b/net-misc/openvpn/files/digest-openvpn-2.0.2-r3
similarity index 100%
rename from net-misc/openvpn/files/digest-openvpn-2.0.2-r2
rename to net-misc/openvpn/files/digest-openvpn-2.0.2-r3

diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
index 332a86f55f562aefc9940dbfaa37f8511163c8e4..6933efc4d5297473f597fb7a04e4166ebd403b7f 100644 (file)
--- a/net-misc/openvpn/files/openvpn.init
+++ b/net-misc/openvpn/files/openvpn.init
@@ -14,6 +14,12 @@ depend() {
 }
 
 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
@@ -23,10 +29,10 @@ checktundevice() {
 }
 
 start() {
+       ebegin "Starting ${myservice}"
+
        checktundevice || return 1
 
-       ebegin "Starting ${myservice}"
-       
        if [[ ! -e "${VPNCONF}" ]]; then
                eend 1 "${VPNCONF} does not exist"
                return 1

diff --git a/net-misc/openvpn/openvpn-2.0.2-r2.ebuild b/net-misc/openvpn/openvpn-2.0.2-r3.ebuild
similarity index 92%
rename from net-misc/openvpn/openvpn-2.0.2-r2.ebuild
rename to net-misc/openvpn/openvpn-2.0.2-r3.ebuild
index 84741fb5e21df6580bb54dcf17cc1bd6a20df49f..05a1679eac2d25bc6ba9a7421d3ee6fefa2dae86 100644 (file)
--- a/net-misc/openvpn/openvpn-2.0.2-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r2.ebuild,v 1.1 2005/10/14 11:37:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.2-r3.ebuild,v 1.1 2005/10/14 13:04:32 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -26,13 +26,19 @@ src_unpack() {
 }
 
 src_compile() {
-       econf \
-               $(use_enable iproute2) \
+       local myconf=""
+       # We cannot use use_enable with iproute2 as the Makefile stupidly
+       # enables it with --disable-iproute2
+       use iproute2 && myconf="${myconf} --enable-iproute2"
+
+       econf ${myconf} \
                $(use_enable ssl) \
                $(use_enable ssl crypto) \
                $(use_enable threads pthread) \
                || die "configure failed"
+
        use static && sed -e -i '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
+
        emake || die "make failed"
 
        if ! use minimal ; then