Version bump openvpn to 2.3.0.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 130 insertions, 6 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 2d52253c9d32..8b9eb10b845f 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.240 2013/01/06 20:12:40 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.241 2013/01/12 14:28:30 djc Exp $
+
+*openvpn-2.3.0 (12 Jan 2013)
+
+  12 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.3.0.ebuild,
+  metadata.xml:
+  Version bump to 2.3.0 (bug 451376) with updated build system (bug 415995).
 
   06 Jan 2013; Torsten Veller <tove@gentoo.org> openvpn-2.2.2.ebuild:
   Drop duplicate arches from KEYWORDS
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 597492418a45..23a7d8a0ba1e 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -16,15 +16,17 @@ DIST openvpn-2.1.0_eurephia.patch 2774 SHA256 9604f1bcc8d60361795741fc74caa9f0fa
 DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d SHA512 939043e8e900f704ce4dfb56fb5113f7233726b435f4564df051784f3814c95abd88fab122262fb87f92f10cc73bd324c60bdd63c07999a1f2296c68084130c7 WHIRLPOOL 98d2a92695c464cec8254f26738573e63929356e27ace9d27cb045edb78bdf37a6539043783bedbc3e0f624d47f80d8dcf9df2f2ba3c0ac371f2ca0f42407977
 DIST openvpn-2.1.4.tar.gz 863726 SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5 SHA512 f3845da8de3d777d0aa92dc272c6824043fd1363bf3cb92e61ceedea93fa2d9f96f4910afa3823d19423357a574e4ea7db29ade73a09197cca0f8efb05cfaf3c WHIRLPOOL 0aaa9b3a77e387f65612c180b31b49aa36745e37ce7998bfa68841f841a06e19ac98a0b4ea9d4a2cb361180b7e15a9503fa29d7bd026df8be5f68ac657a9c499
 DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00 SHA512 69725652c95d779371ded032db7efeb51d1287cc270e7c6e47dc06ae4b22438e6d6dd7b6d9fc41b9c2315b83eebcd28ca83df47b3f0f3a2f3d7b1aeba9524802 WHIRLPOOL 1a04b5633df65ffb11fecc71c2dd25da2bd1f83114b3138b22b868b65cc7ac1cda5ca3b80c40e54cb32efc525a1c7458f4077b2c7965d646343b0a11cc6ecf91
+DIST openvpn-2.3.0.tar.gz 1130659 SHA256 4602a8d0f66dfa6ac10b7abfeba35260d7d4c570948f6eba5f8216ffa3a2c490 SHA512 ebac619dd746406d6751d84391480f7eae2b6c442bbacf1ce6e3d21952ee85bccc7ca2d526fe04cb7ecde749d2a5abb4e787c0e63c349818c7129f5747a2769a WHIRLPOOL 07dc500cb524db43dc75c0fdb67f01411e7831330229b71059c52e4df98afd2b665a016f594edded7652b23fbaa9671978c86f8eb87eb86844679332d3a3d042
 EBUILD openvpn-2.1.4.ebuild 5724 SHA256 89b83771d755d6a3bcd67db692f0341324fa1c13d7f5d75aad0c3cb4d0f65528 SHA512 893554cdccf4cc1f5ca8cc09f8f41586a28800f8fd65440363ebbf5e7a2df8d014cdc35cccf5fbc62e6c215b873893b7d4c4bdf17bfaee949a8a38f56a090c38 WHIRLPOOL a93ae3334673c9ab56afef411e93e26889751ea9b2d43546eb10ba201a3ef8ee5421d19524304c1a32748b5683d179717a03aa288b487e8f3685b45463dc0a12
 EBUILD openvpn-2.2.2.ebuild 4866 SHA256 280336add46c76deed96468d9f53ddb409a4db51c9e33b1b6fe8e4049802f948 SHA512 26a0756be18ae1c38875653f272a99a3c3a6502f7084171408eaa8685975e4b36478fca624a6b9253428bdc3249b21801f3c61cb4542d7c4f10aee8012ebd61b WHIRLPOOL 8d32af07d7dd99985346771c49688370a630b84c6c6041967da9394d107df7f47232da986f423d901f875041ec301a76c1437d3c8b3d6065f8159e3160c84145
+EBUILD openvpn-2.3.0.ebuild 3678 SHA256 060011efbc9172ff3ddb1a78189e2e964edadd6ba98f53b401f04b96d340cc5b SHA512 cd0c69aa588a2fe441af211d10d7bba36428759a3a60d940d076f8da6d16c6b8ca86679c41eaba4e53253b9be592ae6ed2f19fc17a9812a77b505e82947e18d0 WHIRLPOOL 35055446c6d4c97a37fd7a053d354b209ad51521d8bb0e4391fcbeeb3a738a66187c9db9928d3d5bc976e1a28c299f4222cea45dce54811f841fb7bf77e9e91b
 EBUILD openvpn-9999.ebuild 4151 SHA256 105b047772523ae82d5bd6e7faba4a28f240c954379c73384747aaeb0610e36d SHA512 68163da7bd10d6928ac83ea5423c7e90b2c06f471c4444cbcfcc8fb6fdbd52638ea365d6697992fbc32b0e21df69d72ee69ce8edd433a71826a8d56d55bb2d21 WHIRLPOOL 7abe75f4f7e7be3bf93b30b3c245cc334e740662d2d197ac612429beb9dba38d34aeb6f92584101b70a5fce63139606e8b495b21d8b53a889bd98eb262c544b8
-MISC ChangeLog 34755 SHA256 b78109407c1b44ff7cfd9dca8eba7410e99b5f8432e01f5163130612b51825f2 SHA512 0859d5ea3f0b0c6bac01998151833a498ba43dabb2070761045b5fa628ec3eed184728d7fe4b62766c8b83f6b527f7ea4f31ecb520c90f5de4b92e4b0d53261d WHIRLPOOL e88d01969aa7fe83c7d20244091483b4db0d572252af1f217a15aa064b32b32340bea5979cf49e3008f1b6dd06fcceb32543c8323837e4a8f3654ac662b98534
-MISC metadata.xml 808 SHA256 06fb4ae72a9389520966db3f497088b9d23de0ef0b1e74d5c2066980bef221a1 SHA512 993525c65dd0ddf810c7af08ea3ff5c70a097fbba1f2924cddd9d2f571cfe244fa2d279d322cb18d9fc034a41e3584883721031fa82d8398451be91a3b4d809a WHIRLPOOL 8646c347aa1b00e812e805a39135ad22c2dc945e2eb5448c5a1e3faffc1ce8e47867d6dca20a5c88d3c2ffbd57287d1fe10c440e0f5f6526ae35a581adeec0bb
+MISC ChangeLog 34949 SHA256 30188fb20f2ea86527a637bcae961e90ea0e7ba9f43f2c645109864e5dba4ccd SHA512 6e6636907d4f3b5094f8e25b65d8f5f16ac1e1ff6686efd9b908b04b9eba1b04db06892e0a44ec39b405cdfa6818a86240844344f52f2733b5b9a418fd37f021 WHIRLPOOL adbae863b71a971d9a40ebe6af5b5f9f17edcf6890ac359225c7a9fa390d8a427370eff52f58e9dd60b5bd7858a9d8f3330201472722a5ca55eec6fc4e7064be
+MISC metadata.xml 935 SHA256 22d43be061e962e3758e4124aedcfd23891273a12dfd6520f891f92d6cd271b6 SHA512 f8daef1a400cb98e63a213d0382c9b1c6b2bfc77dbeffcd7d53068af756c7432218fb72851c3c38a31d1f9891d1d6ced7742b00c6301ffcfd198fb46b84e285d WHIRLPOOL 69b7bc8c98b08578aab43eab4eb3b2b84a6e84d2e62735471f4c0e1e997ced5a1a375712ffaa68a8011b67c855b78953fe27992ca1846940373a361aeafb6e99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDp2rkACgkQV3J2n04Eauyg0QCg0viCVaOd7owQ0CKt0VrLaY0k
-kZoAn0FHgiifmGcTIxJikRdsnG82+tOm
-=1xqd
+iEYEAREIAAYFAlDxcz4ACgkQxeMuLWsGW/tacQCfd4fewO0uj9DfOXfDaehW2Xpq
+B2sAnjxZxonfDFKlwHw8D+5jAistteNL
+=6t0I
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
index 0a9288e7b61b..fa93873438f2 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-misc/openvpn/metadata.xml
@@ -14,8 +14,10 @@ configurable VPN daemon which can be used to securely link two or more
 networks using an encrypted tunnel.</longdescription>
   <use>
     <flag name="eurephia">Apply eurephia patch</flag>
+    <flag name="down-root">Enable the down-root plugin</flag>
     <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
     <flag name="passwordsave">Enables openvpn to save passwords</flag>
     <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
+    <flag name="plugins">Enable the OpenVPN plugin system</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/openvpn/openvpn-2.3.0.ebuild b/net-misc/openvpn/openvpn-2.3.0.ebuild
new file mode 100644
index 000000000000..8048d021f8e8
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.0.ebuild,v 1.1 2013/01/12 14:28:30 djc Exp $
+
+EAPI=4
+
+inherit multilib autotools flag-o-matic user
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-linux"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins selinux +ssl +lzo static userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-openvpn )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root)
+}
+
+src_install() {
+	default
+	find "${ED}/usr" -name '*.la' -delete
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" 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 contrib
+	fi
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	elog "The openvpn init script expects to find the configuration file"
+	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	elog ""
+	elog "To create more VPNs, simply create a new .conf file for it and"
+	elog "then create a symlink to the openvpn init script from a link called"
+	elog "openvpn.newconfname - like so"
+	elog "   cd /etc/openvpn"
+	elog "   ${EDITOR##*/} foo.conf"
+	elog "   cd /etc/init.d"
+	elog "   ln -s openvpn openvpn.foo"
+	elog ""
+	elog "You can then treat openvpn.foo as any other service, so you can"
+	elog "stop one vpn and start another if you need to."
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+}