Added myself as a maintainer until luckyduck comes back online

  Version bump, wrt bug #111116

  Examples flag really now works, #100943

  init script now appends the --cd option only when the same option
  is not specified in the config file, #109363

(Portage version: 2.0.51.22-r3)

6 files changed, 166 insertions, 13 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index fb08ea0caa79..5bb8b8afef0c 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,19 @@
 # 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.47 2005/10/15 08:05:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.48 2005/11/02 12:17:55 uberlord Exp $
+
+*openvpn-2.0.4 (02 Nov 2005)
+
+  02 Nov 2005; Roy Marples <uberlord@gentoo.org> metadata.xml,
+  +openvpn-2.0.4.ebuild:
+  Added myself as a maintainer until luckyduck comes back online
+  
+  Version bump, wrt bug #111116
+
+  Examples flag really now works, #100943
+
+  init script now appends the --cd option only when the same option
+  is not specified in the config file, #109363
 
   15 Oct 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.2-r3.ebuild:
   plugins now really install to /usr/lib/openvpn
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0d8c22953ae7..a68faaf9e161 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,14 +1,16 @@
-MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
-MD5 31347c727a5f65178bba691daa667343 ChangeLog 7446
-MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
 MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
+MD5 9b4d6fe93d02bf935016c85fb0b6b5d4 openvpn-2.0.4.ebuild 3689
+MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
+MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
+MD5 a049bd1f5d27c77c801b28ba680c5a71 ChangeLog 7824
 MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
+MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
 MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
-MD5 41623f5bd4f728bd9018e69514149bc5 metadata.xml 452
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
-MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
+MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
 MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
-MD5 9a4a53360a88a0c7d9b9c020921e48a8 files/openvpn.init 1116
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.4 b/net-misc/openvpn/files/digest-openvpn-2.0.4
new file mode 100644
index 000000000000..433162d53832
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0.4
@@ -0,0 +1 @@
+MD5 de32775b88e6bcd737ae93b9a365494c openvpn-2.0.4.tar.gz 653156
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
index 6933efc4d529..c0a17383b5e5 100644
--- a/net-misc/openvpn/files/openvpn.init
+++ b/net-misc/openvpn/files/openvpn.init
@@ -1,4 +1,6 @@
 #!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 VPNDIR="/etc/openvpn"
 VPN="${myservice##*.}"
@@ -37,10 +39,16 @@ start() {
 		eend 1 "${VPNCONF} does not exist"
 		return 1
 	fi
-		
+
+	local args=""
+	# If the config file does not specify the cd option, we do
+	# But if we specify it, we override the config option which we do not want
+	if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then
+		args="${args} --cd ${VPNDIR}"
+	fi
+
 	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}"	\
-		--daemon --cd "${VPNDIR}"
+		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
 	eend $? "Check your logs to see why startup failed"
 }
 
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
index 3b311232b985..2881c6500df2 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-misc/openvpn/metadata.xml
@@ -6,6 +6,10 @@
   <email>luckyduck@gentoo.org</email>
   <name>Jan Brinkmann</name>
 </maintainer>
+<maintainer>
+  <email>uberlord@gentoo.org</email>
+  <name>Roy Marples</name>
+</maintainer>
 <longdescription>OpenVPN is an easy-to-use, robust and highly 
 configurable VPN daemon which can be used to securely link two or more 
 networks using an encrypted tunnel.</longdescription>
diff --git a/net-misc/openvpn/openvpn-2.0.4.ebuild b/net-misc/openvpn/openvpn-2.0.4.ebuild
new file mode 100644
index 000000000000..c84e7bd3871d
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0.4.ebuild
@@ -0,0 +1,125 @@
+# 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.4.ebuild,v 1.1 2005/11/02 12:17:55 uberlord Exp $
+
+inherit eutils gnuconfig multilib
+
+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="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="examples iproute2 minimal passwordsave selinux ssl static threads"
+
+RDEPEND=">=dev-libs/lzo-1.07
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
+	)
+	selinux? ( sec-policy/selinux-openvpn )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack "${A}"
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf=""
+	# We cannot use use_enable with iproute2 as the Makefile stupidly
+	# enables it with --disable-iproute2
+	use iproute2 && myconf="${myconf} --enable-iproute2"
+	use minimal && myconf="${myconf} --disable-plugins"
+
+	econf ${myconf} \
+		$(use_enable passwordsave password-save) \
+		$(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
+		cd plugin
+		for i in $( ls 2>/dev/null ); do
+			[[ ${i} == "README" || ${i} == "examples" ]] && continue
+			einfo "Building ${i} plugin"
+			cd "${i}"
+			emake || die "make failed"
+			cd ..
+		done
+		cd ..
+	fi
+}
+
+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.init" openvpn
+
+	# Install easy-rsa stuffs
+	dodir "/usr/share/${PN}/easy-rsa"
+	exeinto "/usr/share/${PN}/easy-rsa"
+	doexe easy-rsa/2.0/*
+	exeopts -m0644
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample-{config-files,keys,scripts} contrib
+		prepalldocs
+	fi
+
+	# Install plugins
+	if ! use minimal ; then
+		dodir "/usr/$(get_libdir)/${PN}"
+		exeinto "/usr/$(get_libdir)/${PN}"
+		doexe plugin/*/*.so
+	fi
+}
+
+pkg_postinst() {
+	ewarn "WARNING: The openvpn init script has changed"
+	ewarn ""
+	einfo "The openvpn init script expects to find the configuration file"
+	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	einfo ""
+	einfo "To create more VPNs, simply create a new .conf file for it and"
+	einfo "then create a symlink to the openvpn init script from a link called"
+	einfo "openvpn.newconfname - like so"
+	einfo "   cd /etc/openvpn"
+	einfo "   ${EDITOR##*/} foo.conf"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s openvpn openvpn.foo"
+	einfo ""
+	einfo "You can then treat openvpn.foo as any other service, so you can"
+	einfo "stop one vpn and start another if you need to."
+	if ! use minimal ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+	einfo ""
+	einfo "It is recommended that you create your tun/tap interfaces using"
+	einfo "the net.tun0/net.tap0 scripts provided by baselayout instead of"
+	einfo "using the 'server' directive in openvpn configuration files."
+	einfo "This will insure that the interface really is up after openvpn"
+	einfo "starts."
+	einfo "Note that you cannot use net.tun0/net.tap0 and the server option,"
+	einfo "otherwise openvpn will not start."
+	ebeep
+}