Version bump openvpn to 2.3.4 (bug 510372)

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

4 files changed, 157 insertions, 18 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 370434e4d391..5b7284f26d96 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # 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.287 2014/04/22 07:54:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.288 2014/05/15 07:12:52 djc Exp $
+
+*openvpn-2.3.4 (15 May 2014)
+
+  15 May 2014; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.3.4.ebuild,
+  openvpn-2.3.3.ebuild:
+  Version bump openvpn to 2.3.4 (bug 510372)
 
   22 Apr 2014; Dirkjan Ochtman <djc@gentoo.org>
   -files/openvpn-2.2.2-pkcs11.patch, -files/openvpn-9999-pkcs11.patch,
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 9037c3e4eaef..9b2ce64512e3 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -12,26 +12,28 @@ AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f78
 DIST openvpn-2.3.1.tar.gz 1145382 SHA256 bd2d7d85b39d4586bcdb74b36eb48d0ac4ab1e6812654c719b04826fdc70fb3c SHA512 1f74d86cae164c6807a30f70012462b9304a648765c49a79f390b8c054b9aaaeac535f53804cf5400d00cbe388a8a4aaf71b7c77d034b2b71d3dd374b8e11d75 WHIRLPOOL 227993e7fc38f1b0bf9008bf1bfcb31ef9dc37b78e66ac5be011b8f20696a4a567e6c48951ab16652e84879d719a5a925382e28ced22a6c1131c7554f98a19fb
 DIST openvpn-2.3.2.tar.gz 1145108 SHA256 20bda3f9debb9a52db262aecddfa4e814050a9404a9106136b7e3b6f7ef36ffc SHA512 9936a8b3a71073239ca25e0d3cf24862e95c29218b2bba9663369eca80b4c9f83ef12dd41eb9998165d4819f041335606eeb0257b6805e1cdd1ae4761bb9dddf WHIRLPOOL f2ef45c76e968e022483d15ec1e4ff2a4f495d05e3e355d46c6f74af8a96341252b56933391d211f8eec955ee31c0538de81dd300d4ba30353f3785469bd2dbc
 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
 EBUILD openvpn-2.3.1.ebuild 4143 SHA256 8dad20422d32628c0ee91b6d3ccb103e75c2c901ce9c1240ef95102f4c02dc53 SHA512 6792c68e8a5bbe43a93a3c9a128ae853edd21e0c918cf689d2db088b984aecdc570d5281bff263aca6078b07ddd0ba172c3c9b4ccace0fc690357d5fb13aff00 WHIRLPOOL 33cdd572f00952748a2ab05c39924495173e217df315a56f91036b45a268da1e8c687de381d8cdd5850a26ee6a6d3010053fee671db0901be55c664697900e6b
 EBUILD openvpn-2.3.2.ebuild 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
-EBUILD openvpn-2.3.3.ebuild 4140 SHA256 916c58080781959e82740edef8ed4cbc4f52ea4bba14590cc6ea1a448843a393 SHA512 a216af44634f0de8156efcbde7ca5105fe64e2a42c2b10b5f3e488c914c25de0102f55cbba3835454b91e2433fef4b53fdd26c99347d61b8b9b35404ce71333c WHIRLPOOL 65a63f60dcbd22715a74144ada80713e2b897701e0fb6f2956fce61d41915d26093a9ccc91f9a85bd9bba642c8b568518f61af1fe2395fd74fd94d406bbc7fc6
+EBUILD openvpn-2.3.3.ebuild 4187 SHA256 02aa295491e65e510f88a8352366f252c0aa05923200bfbe0fe3a7af7bf72464 SHA512 ef5381e84bd6e98017473dc0cbd23e20430852832929b4ebfaf42de0f2a016d05b760f3092e5a32963e6a579eb84817b5c7eec15268880c173e71a725d31e784 WHIRLPOOL 8dbe077c656f071830179006b5248d292c9daa00a7a3165d2e9d225353f447b8d1f734e6c4470e17461b239617ec4abe4b7379a669847cb8815f7508beb31b51
+EBUILD openvpn-2.3.4.ebuild 4187 SHA256 ff86a65a6eaf6cb32e93d8c4f48973755f90accccb74ab26906a293accc98acb SHA512 4963bc40ac192a489b8082dfcf8a2359fb28e668d63b47a092f2460baf90d788cc1877e91e5e48c6c76510f5f45971846ea94a3368febd42b1fea63ee458d0da WHIRLPOOL 9ea750a6f72a098e32b169d4adea289ceb26bd8eb72aab84d00a98b6ad139750136234fd43d2ddbb9ff724f8a20f370d84a351419d78a8bfe88308b1fc22c9d7
 EBUILD openvpn-9999.ebuild 3938 SHA256 afcf2646c697ed990fc21546bdbac75ee9dc70fe125be4036fa294aee71e57db SHA512 ad23685991fd6398e795fb02b074be29d4abe9e008286a742caf0a3f37e51f85d6579a19f634cd2f8e42730e9226c2c0efe993dd85599c5efa19eb9a2c5c820f WHIRLPOOL 1dca3d38e7bbdc72567a253af0c12fdf6ff79eaaf1064bb874259e13507c52bdd4a4704e3da9d72eb6ce2afd8519b4acec3b757de996f21012c8e9df589f6b2e
-MISC ChangeLog 40384 SHA256 8816bda39e29028c51a2d1fe3bda03abdadc03a12743f209376b6ec939e69be2 SHA512 04e9dea362557700d4f195fc01586bb41dd060d500ae79fa67d6436c428ccb1c16d97ebac5e71fa4bc22e8f36a12c252d59c75791d3a1ac75880dfd0a1305261 WHIRLPOOL 0b4e06976c09abe433b114f926f92f3c540919c6b139b54680de14282ece3361607ff941e0c540eb109d94e2961a2df9302ab796f43fbec15dac5f556222bace
+MISC ChangeLog 40555 SHA256 7d5b555b39dc22cfc1aa0e1e1290b1f2ac6e56e57460a0bd1679eee9b744b807 SHA512 5bb0e11ec8c83db89aa0a64459df68c8f3cc30aaef5fdb11025397a8bc890b4c21e81676e966a30176db5757a9c98d4f99835e716cc9cda6f85ddd14c82d75c7 WHIRLPOOL b697939eb663941a78d9de5bdca13c45f50097f8ac44e904497d2c048fa9b255f18474f1ef6126daf2ab8c714b685bb690b9356b6876047f0e8d0644656beb2f
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTViA+AAoJEJ+WuSkwOAOBum0QANCnsMxaTzZ0YlX+w3cKPaQ9
-wy693s4rhQV5J1pkZLIuHQp549hhvGd89puz1FMiSwiRSi6TKMoPjHqaX4DdWS+B
-qLf/OVAinDvH0pBx4w4dIDCLoXZVdSLyg56g+SIS/w3q2PWJeGyUfSES2XcIQIq/
-LAyQCREMhEYqK7chwiuEAc0Pnl4WBhLkVga6p889twWgMvRgAIRBEKV8mURIcm5/
-UvcvpWrPrnyQCzOGCW/6Gii9rEYjJ1o8Tez3mHC3wa+wiUsYweRilQj2pPqFXv/W
-MI26mZxquAaL8umBetVy5TVWRM9BwKj0v275oztKlqpZmtYVQPTJ1up6VXFYc6GW
-0qhhBiu2EOzW+Mjm85ff4d9ZqFBnRdABti+tAFcZU+2whWkzkl+jXqfifrqJApkD
-CNk8Jz4Mhyxr9NOhkDBlxN0L1GjLqKNESujYMi68vkbcdAheVIFtQHQTLgkzUNWH
-A6CIksCJpQn+Hj2KKwn4aArFjs3dv6CxAvJMruE7AQ7DFn/6J55l4qRYNyPJnphN
-Vpx+jyVglZh7Z5Qc2vueOY9VRQLnlk/tXDowA5kmZojMofX528dkoPAwzw+n6et8
-kYAzdDJ23rk3GTZaHvFU3qGWw6dNr9z+sWEluKYxL/3Wqbiw+QtWAwnMesyWDeH1
-ff85C4zeEZuFjMBdXkVN
-=EuoI
+iQIcBAEBCAAGBQJTdGkCAAoJEJ+WuSkwOAOBelIP/RZ5KCtDnYhcP5WVUpyqU05n
+qS0qQF6v3bt+ye8E0kryQBBLnsRKQ/gJdfvrh8w7IQx1JZrGPDoQVuVmeNR1WRQz
+zu7n83oDeNKQe4Qmyiq5dLyDNp1VzXONuSucSAXAyUExCwJP/W2OJXNHJc5L7h8x
+i8/uz/WthX0fiB6gT05xDUzfORa8/5DfSnOB/oYXPTl54eoCD8DapvZAgJ69vYwB
+kNdioiBHcKtqyvDPqUUWDe13eGejzGvwnIwENhos+xEYb2JrMj7ojuAehTW4SQYU
+z5mR9wOKeC7AhdjubhCdLkl0fbakJG8qksYdhy8wP3hpod/dAM69pD8qFfHE6ZQf
+w1/SSCHkUClxKiNIC1LmkaXOP4RCy8e5Pc+O1QgWJlOjPnc3VpM6ZnI1tuixYmNE
+oPF4ajYmNMO8EVyHUl12K7XwD37yyO21LHkZwjG3OhHuQRFLiVoJEPiIImBwuzhU
+9wpowK/Gl7y3riVGa8EfkLNOb7vWm1NlyxucCwYHFRLmhDZS/UE8DkS+8VsXCYme
+9oIx4JpsauyDGfxyajGARWdtEh0p+GVEvQAVzwSQyOBbThgCujTvkd1mQJwwdXfm
+opaBfDscYULV/wwT5sz/LYAs+hkvuaymiPb0tp6WuAUSyytIjeAMLjbS3iG0QOoq
+UWHMf222mABeOxDFM6ez
+=kESJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.3.ebuild b/net-misc/openvpn/openvpn-2.3.3.ebuild
index 349c63644908..14d8928f2ff4 100644
--- a/net-misc/openvpn/openvpn-2.3.3.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2014/04/22 07:45:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.3.ebuild,v 1.2 2014/05/15 07:12:52 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ 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 +lzo static userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl +lzo static userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
@@ -39,6 +39,8 @@ src_prepare() {
 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} \
diff --git a/net-misc/openvpn/openvpn-2.3.4.ebuild b/net-misc/openvpn/openvpn-2.3.4.ebuild
new file mode 100644
index 000000000000..f7a8315b4e44
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.4.ebuild
@@ -0,0 +1,129 @@
+# 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.4.ebuild,v 1.1 2014/05/15 07:12:52 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 +lzo static userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl )
+			!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? (
+		!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}"
+
+src_prepare() {
+	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)
+}
+
+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."
+}