Bump

(Portage version: 2.1_pre7-r4)

4 files changed, 144 insertions, 11 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index f2d46fcf9816..603a476b2ea1 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.73 2006/02/08 11:18:52 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.74 2006/04/05 10:10:32 uberlord Exp $
+
+*openvpn-2.0.6 (05 Apr 2006)
+
+  05 Apr 2006; Roy Marples <uberlord@gentoo.org> +openvpn-2.0.6.ebuild:
+  New upstream release.
 
   08 Feb 2006; Roy Marples <uberlord@gentoo.org> openvpn-2.0.5-r2.ebuild:
   Marking stable on ppc-macos so I can punt older versions, #117111.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 595b2afbc89d..36a7d3ea71b4 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,12 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4ef7e8b5e35d1d98dfdcb3af0fc55c3f ChangeLog 11243
 RMD160 850dbfea2dade7e3c03af3ab598371b97fcf5ed9 ChangeLog 11243
 SHA256 c93211ad83927b0b1a52286d40fd3110feaa41f7e21addf1f679def9cc03c5d9 ChangeLog 11243
 MD5 2d68e6681e5a0b149462220ad10caf66 files/digest-openvpn-2.0.5-r2 65
 RMD160 d0e78e4f0a47796ec103f9a38f6040cae5a897e8 files/digest-openvpn-2.0.5-r2 65
 SHA256 3468b243cfcdfa3b3de259c138e29325b45aac5d6a783fcce82d0e3608cd9896 files/digest-openvpn-2.0.5-r2 65
+MD5 9b5501be21ae9235fea7d51ef84b644e files/digest-openvpn-2.0.6 241
+RMD160 3bca5f56e3526082debc843084ae21fe35e65f93 files/digest-openvpn-2.0.6 241
+SHA256 cc2c7e3423898778eb6f6b45bdd4ba18d2a20be748cfa8482eba4ca20c2f80bd files/digest-openvpn-2.0.6 241
 MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
 RMD160 66aa5ea349329cf3e6089aa75eb7c80e0d21063b files/openvpn-2.0.4-darwin.patch 717
 SHA256 ad70b77c10bb57a07af3d512e953fc8b5a07108df5bf9795e0cb12e1ba2b2136 files/openvpn-2.0.4-darwin.patch 717
@@ -19,10 +19,6 @@ SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6 metadata
 MD5 8533ac9753dad98c69bf979a98ac0641 openvpn-2.0.5-r2.ebuild 3866
 RMD160 af06b66ebaa4d5a87242968e552b90ee1f4b2cd9 openvpn-2.0.5-r2.ebuild 3866
 SHA256 92880feb5eee1bdf41a3b627fd84119384ffd5706c09850f642fe7f42eb286d0 openvpn-2.0.5-r2.ebuild 3866
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEEW7eEbVyYKaZ/NERAmMnAJ46jJBgOqcBXRLNIazEh8s6tlFAKgCfYcHG
-tPsJFZ8jMBdE+Spxyf5t2Ek=
-=OIKB
------END PGP SIGNATURE-----
+MD5 f09f357c6d87854505786a53dc974271 openvpn-2.0.6.ebuild 3873
+RMD160 f854204a8f60941a764ebf5bbcedf384d6a7c2ed openvpn-2.0.6.ebuild 3873
+SHA256 317c1f0dfcbddfc243d5bb3b183ffa60e8b9fd4aeed5f3c06728c8791b4ba811 openvpn-2.0.6.ebuild 3873
diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.6 b/net-misc/openvpn/files/digest-openvpn-2.0.6
new file mode 100644
index 000000000000..893045f454cf
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0.6
@@ -0,0 +1,3 @@
+MD5 8d2f95fa825e58363a676b25d4815aa7 openvpn-2.0.6.tar.gz 664816
+RMD160 cf3cd807bb657baf317e896b57900958cf442a63 openvpn-2.0.6.tar.gz 664816
+SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 openvpn-2.0.6.tar.gz 664816
diff --git a/net-misc/openvpn/openvpn-2.0.6.ebuild b/net-misc/openvpn/openvpn-2.0.6.ebuild
new file mode 100644
index 000000000000..e33b4441460e
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.0.6.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.6.ebuild,v 1.1 2006/04/05 10:10:32 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 ~hppa ~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
+}