Version bump openvpn to 2.3.6 (fixes bug 531308)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 157 insertions, 8 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index ec4eb9aa2ed0..95fcaac6c75d 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.305 2014/11/21 12:45:00 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.306 2014/12/01 21:37:42 djc Exp $
+
+*openvpn-2.3.6 (01 Dec 2014)
+
+  01 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.3.6.ebuild:
+  Version bump openvpn to 2.3.6 (fixes bug 531308)
 
   21 Nov 2014; Tobias Klausmann <klausman@gentoo.org> openvpn-2.3.4-r1.ebuild:
   Stable on alpha, bug 522168
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index c8d9cefecf51..75641e240f79 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -13,19 +13,29 @@ DIST openvpn-2.3.2.tar.gz 1145108 SHA256 20bda3f9debb9a52db262aecddfa4e814050a94
 DIST openvpn-2.3.3.tar.gz 1161137 SHA256 f025d14631105a66e501ca897830cd4d26a1438530cd9174dc6169536ae4b113 SHA512 05d6eff0db7137772a90c3d04ebd109eeb5f149b57f05edab211052754032cac3132f0a6f6e689dcab65db89cfed6065f82ac4fcf7f18b230900f6108570263f WHIRLPOOL f4bf6c5e5b8266c9cdc2d89003300a720423fd296d281ebd2a52d70b6aaeaee57b5506042a807771c0a271aaff8772f3794eef9124270d3fc9d0b1cd3fe40657
 DIST openvpn-2.3.4.tar.gz 1191101 SHA256 af506d5f48568fa8d2f2435cb3fad35f9a9a8f263999ea6df3ba296960cec85a SHA512 6837e9ff48181ffd7cb36fe7f6943b580f68df7e840a5bd3c7ab01845592627275c6bfcc929cfa1570aef1af54b49df320ae4d7999968969ac23f1b244a37ec8 WHIRLPOOL 8b7b949f3f61f7b85f400d197bcc92ed4991ef1cc979f8b7f5a9e64740e3260ed23668775fbbd2404c751e4163d255cebfd4c1da176e959d0c80e90eef659a58
 DIST openvpn-2.3.5.tar.gz 1196464 SHA256 d93b447b014a41ec1550c3b760871aa72d7c09f1b5c6fc1e013d3073ac29ca21 SHA512 937a3846a7638e3eb1e452d01c1e78a43c5b29adf4ba5f169508c40488e32e4ee317661dfbd1396c9103a8cf9101c4f02ed586dc3fd91b89b5afb35e4e5291dd WHIRLPOOL 335c737662be7b7179b503b99376c7902fe1141bcac496de4b0a54a82dd0dca3aa5c2c49f66622be2163dbc6fa89bc79940b81ffdd419d27c004f53e6c92b0e7
+DIST openvpn-2.3.6.tar.gz 1213272 SHA256 7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26 SHA512 70e0045ea41f6588769ab8b98d8f550b69148adbf7fedcdc36900e25950df43379950492652e243ec6e7965bf9c7dcc86a56ba5dfdc44523aaa81cfc508b1c6e WHIRLPOOL 737f2d1d69ee1c7700d5cd5a4e7d5d1b2f55d8b2229f7c2565fcb8c731ebb719ec8d6bad3b76f763f36e5c70c6e40a666db3508f3024f8e4637c0659061dba48
 EBUILD openvpn-2.3.2.ebuild 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
 EBUILD openvpn-2.3.3.ebuild 4199 SHA256 da464758cfef3297d9dfa80846d4ab830120c1b77cd7fe745eadd3f89f873819 SHA512 6ac487774770bf22a4054bc39a51274949ea63500a12719c6de91afb4a37500a0155897c0866202df85f5998466bf3dc2de0d2f1a52c7208288c9c60ea7ded62 WHIRLPOOL 82a59b5227872e6aacb681c04e157c590dc3c0daeb233d4dde31dd142b022d9115bf0b1fbc179255d4c7d5eb25efc8c6057f95921194020e620495cbde59d962
 EBUILD openvpn-2.3.4-r1.ebuild 4377 SHA256 6c4b83878700be83469baae149f12359ad48dea8d1445b6ea5d3a45956184d07 SHA512 995f73502fb101b946ad1a83852166e949cd53fba8f7b69d7ede7028933b4afdef444b3527fac6fbc6af051b05410bf390daf00a65ea3585f8b9e99d9ed8fce7 WHIRLPOOL 5da8ce5ca94b4711c361a1e1cb8427bc2c4aabe8bb9e086ef03ef08173d9f8fbfe56d6e199d56fb65cd7a5db11aea6d9206a3f4cc10ebf67336eb0b3fc0f330c
 EBUILD openvpn-2.3.5.ebuild 4373 SHA256 b4081ba2ea699be52cfad0514ab14c884504f0190705fa096902d8132a83d2e8 SHA512 145d220fdfd456023a419c9330b261f7302f92644535decc26c7070f851159518e19a83506c6c7e8e428718675fd779edcc752e71351eccc248c22c8550bedd1 WHIRLPOOL b818a4561e26533593a006c40cbf2ef56ec5ef2a1575d17f38e5559c0a824fd49c0846519ad1c1dc27aed115c1af8701ccd2ddd1717c8125d6aef3cf70d148ed
+EBUILD openvpn-2.3.6.ebuild 4373 SHA256 f6ac15d9d36ba8ee13bc86833055ff83e6f0b04447ab8f20f24aca8e7c94c252 SHA512 fc0147118f963e425811af7c874bacfc60d2ba86fa2eee42236ada89ce8e3512d40dcaab1da5cb8692a64630c3a6e70219b5fa03503ca6be369bca00870e6992 WHIRLPOOL 250db830911638f6b4e0b8e3a5c797dee889ecaabe41fba0403aa6f062c309e5fd85edcace42133517920b4dca72ad9c3f995d474b83ad786f73b5efa0bb3c35
 EBUILD openvpn-9999.ebuild 3941 SHA256 ef975ee9157e25b16aa4c59144b1fc0814c67def458a71e5166c70e7c41e5081 SHA512 7030ee666c7372b86a198f3780797a4253baed6e61e4bbb3f1bb166b95268b4ee00992c770c689ab6bb9326eb2d66a6c52cec65739e887ef39e6da1da6ce49b6 WHIRLPOOL 174bee3dc113263b7ebc24048613cc3039cd49f52cee4c9eff55d80d9436cead408d3c09cb6dad1318a4812fb00f7eb22b286f329499346240db2f38a066b2ff
-MISC ChangeLog 42667 SHA256 587d478d3e4a175ba232ab1c13d910babdbee1f614c1eec5fdb6492f14c9e2fe SHA512 80d4f6d6a66cc80e5d8c2db0267dd08b91b7352f6439c31429e964582e37d6530ab041d3e6e9cc0ded931df0a4042106b58075f1ee88868b6a77d1087c042e04 WHIRLPOOL 1c5b1f868b505d5a6bec095e692a14d1842f948aa908bc6a379d1d0d970b98de14c62be746af2634fa0cc8a4519c997236b26e2416d6273a65c2a847c4a9db9b
+MISC ChangeLog 42815 SHA256 0b977d7d79d1f4cb132880545ca684825bbcf6353a57d079c3275c0a3494c939 SHA512 784614cb228cecdccb8a31407160ac97c1e228cf74edafd74b556f120bd40a48a4825abb690dd4c57ceb64518bce053a36104333a6616be36f621833f1488efc WHIRLPOOL 71f8bc1503143b123221091fba6e982dee2d9add70d9d81d51f661501c8939aa9958e837ed351970c62148229780a727477e57fc689d4fd6f021ac44553c4689
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlRvM81fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjrwwCdH//UF4HN/8S85gyBjQupHSw/
-AJoAnRzoidLD6+G59UhrK1/4HuxR8FjS
-=znZs
+iQIcBAEBCAAGBQJUfOEHAAoJEJ+WuSkwOAOBRZ4QAIy1WBiTIt9YJb9GggmEMIzZ
+CjRcb+OU9l4/MyyfCqSGMlfkOv0QRd5RsZYZMbo8JRXAe2/Y1KI/f/dCWlklfMTe
+K3WkBhZ5f3L9DQ3t8KbGK+CRpA1l7PFZjjQqOhiG8dkMcjyAN4Lcus/tcoLa7lho
+FeIrR4JGKlIs408bqPpWjfGe35HgbuFkf7bPrtYw+0/XJyjkTq6/p0SBjxyIPNuS
+jDEKRwexuyKYSIxaabavIwAhMJzGiQKwmIjmJ0b51WNZ4ceFCeGejIH9KXoXOzcE
+lvSlNFVEMaCSiAu3LTqDn1tPqgk9FP0clJjGiba5pIu2ihLOndbVRQ9TP7tN6SWQ
+Gh5VXKtk1khNkAfjb8fJ304h1ueS6iRpqjA/60SElWO16JtuOQSA7GKaVg4JOIeP
+sa4U9oLCme2thEJIVprz5w89qBUL7jyULpEnNH+CS5o+ybmp2N2F9Zo7TkOxL3ms
+om1pDsElmpzH8W2SoDENXif3sNNFfYD7Y13ew9QiST+1VBO7MtA+0ooxzk4cPX5d
+i0z6dYj9I00+Hia9mpAO/tTliKFnfMrgT8Ai/fn+iUScuQ1K9DZKUCeyltF/WZoX
+7Uvu6UKXgKLzHddsZSX4SnXwmVB0dKIXGF0LUwpLZY4IRqhJsqnVw+ouAv+uh1CK
+kbUh8GhyRM9hJnx6Lzb/
+=By8f
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.6.ebuild b/net-misc/openvpn/openvpn-2.3.6.ebuild
new file mode 100644
index 000000000000..018e1057aef0
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6.ebuild,v 1.1 2014/12/01 21:37:42 djc Exp $
+
+EAPI=4
+
+inherit multilib autotools flag-o-matic user systemd
+
+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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl )
+			pkcs11? ( ssl )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	ssl? (
+		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
+	)
+	lzo? ( >=dev-libs/lzo-1.07 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+src_prepare() {
+	# Set correct pass to systemd-ask-password binary
+	sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
+	eautoreconf
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	local myconf
+	echo "DROPPY"
+	use polarssl && echo "FLOZZY"
+	use polarssl && myconf="--with-crypto-library=polarssl"
+	econf \
+		${myconf} \
+		--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) \
+		$(use_enable systemd)
+}
+
+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
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
+}
+
+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
+
+	einfo ""
+	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}