easyrsa pkitool is now installed, #111635.

easyrsa no longer gets installed when minimum USE flag is set.
(Portage version: 2.0.51.22-r3)

5 files changed, 157 insertions, 18 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index b68aac0e3e80..c806822932e3 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2005/11/06 12:40:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.63 2005/11/06 14:04:35 uberlord Exp $
+
+*openvpn-2.0.5-r2 (06 Nov 2005)
+
+  06 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.5.ebuild,
+  +openvpn-2.0.5-r2.ebuild:
+  easyrsa pkitool is now installed, #111635.
+  easyrsa no longer gets installed when minimum USE flag is set.
 
   06 Nov 2005; Simon Stelling <blubb@gentoo.org> openvpn-2.0.5.ebuild:
   stable on amd64 wrt bug 111116
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 68ccee636e73..a3d1a80b4677 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,23 +1,25 @@
-MD5 d97d5a084fa52883723435686d2c610e ChangeLog 9858
-MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
-MD5 f4ad9b80efc3458ba2e30d5804c4642a openvpn-2.0.5.ebuild 3193
+MD5 c6d7833e05dd278f3192bd656d6697d5 openvpn-2.0.5.ebuild 3201
+MD5 c7972a16f833a3ac9bd624e365f200a8 openvpn-2.0.4-r1.ebuild 3175
+MD5 4ea9399739b319523acb8de014bf498d openvpn-2.0.4-r2.ebuild 3841
+MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
-MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
+MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
+MD5 ad44f18bcc0c6db4c6ba33ad8a6c9068 ChangeLog 10101
 MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
-MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
-MD5 c7972a16f833a3ac9bd624e365f200a8 openvpn-2.0.4-r1.ebuild 3175
-MD5 4ea9399739b319523acb8de014bf498d openvpn-2.0.4-r2.ebuild 3841
+MD5 9def6d063ec57730d34e4c777608c504 openvpn-2.0.5-r2.ebuild 3867
+MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
 MD5 330a395d3f9192768b5c3b61238994ae openvpn-2.0.5-r1.ebuild 3867
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
-MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
-MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
-MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
-MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r2 65
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
 MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
 MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5 65
-MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5-r1 65
+MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
+MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
 MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r2 65
+MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5-r2 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
+MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5-r1 65
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.5-r2 b/net-misc/openvpn/files/digest-openvpn-2.0.5-r2
new file mode 100644
index 000000000000..97d2580b08e9
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0.5-r2
@@ -0,0 +1 @@
+MD5 4bd7a42991c93db23842a0992debe53b openvpn-2.0.5.tar.gz 662647
diff --git a/net-misc/openvpn/openvpn-2.0.5-r2.ebuild b/net-misc/openvpn/openvpn-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..4a58d472f6b0
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0.5-r2.ebuild
@@ -0,0 +1,129 @@
+# 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.5-r2.ebuild,v 1.1 2005/11/06 14:04:35 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 pam passwordsave selinux ssl static threads"
+
+RDEPEND=">=dev-libs/lzo-1.07
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
+	)
+	!minimal? ( pam? ( virtual/pam ) )
+	selinux? ( sec-policy/selinux-openvpn )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+src_unpack() {
+	unpack "${A}"
+	gnuconfig_update
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
+}
+
+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
+			[[ ${i} == "auth-pam" ]] && ! use pam && 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 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 and easy-rsa
+	if ! use minimal ; then
+		cd easy-rsa/2.0
+		exeinto "/usr/share/${PN}/easy-rsa"
+		doexe *-* pkitool
+		insinto "/usr/share/${PN}/easy-rsa"
+		doins README openssl.cnf vars
+		cd ../..
+
+		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
+}
diff --git a/net-misc/openvpn/openvpn-2.0.5.ebuild b/net-misc/openvpn/openvpn-2.0.5.ebuild
index db297ea4ce9a..5e6969033f89 100644
--- a/net-misc/openvpn/openvpn-2.0.5.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.5.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.5.ebuild,v 1.7 2005/11/06 12:40:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.5.ebuild,v 1.8 2005/11/06 14:04:35 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -77,7 +77,7 @@ src_install() {
 
 	# Install easy-rsa stuff
 	exeinto "/usr/share/${PN}/easy-rsa"
-	doexe easy-rsa/2.0/*-*
+	doexe easy-rsa/2.0/*-* pkitool
 	insinto "/usr/share/${PN}/easy-rsa"
 	doins easy-rsa/2.0/{README,openssl.cnf,vars}