Version bump openvpn to 2.3.2 (bug 472542).

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

3 files changed, 139 insertions, 16 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index b2a420e7568c..bf272f551140 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # 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.274 2013/06/09 23:01:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.275 2013/06/10 12:29:33 djc Exp $
+
+*openvpn-2.3.2 (10 Jun 2013)
+
+  10 Jun 2013; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.3.2.ebuild:
+  Version bump openvpn to 2.3.2 (bug 472542).
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 50a3cde447d4..f515bdb92c4c 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -14,27 +14,18 @@ AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f78
 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
 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
 EBUILD openvpn-2.2.2.ebuild 4866 SHA256 280336add46c76deed96468d9f53ddb409a4db51c9e33b1b6fe8e4049802f948 SHA512 26a0756be18ae1c38875653f272a99a3c3a6502f7084171408eaa8685975e4b36478fca624a6b9253428bdc3249b21801f3c61cb4542d7c4f10aee8012ebd61b WHIRLPOOL 8d32af07d7dd99985346771c49688370a630b84c6c6041967da9394d107df7f47232da986f423d901f875041ec301a76c1437d3c8b3d6065f8159e3160c84145
 EBUILD openvpn-2.3.0.ebuild 3970 SHA256 8af57b75f4af00b09a4481c8496fa5db478e4b8d19936b775e56352d42ec32bb SHA512 95b1af0b23941657f6b662642ed64df1ed831f46389f2fb61f4f148c2a83cb17d8dfc3c9a327fa3d6749d8fee7b4aac2c5a7201a69ba8874ce0126f5a0ec089b WHIRLPOOL eaf9091beb17dac73aaf7c9a2fc575f20f20fc2c35dbb16923e9c849130d811fdca303caeb4f400d7e82e61f70622659f5dff4a31e1434c0d3df50e431633e2c
 EBUILD openvpn-2.3.1.ebuild 4143 SHA256 8dad20422d32628c0ee91b6d3ccb103e75c2c901ce9c1240ef95102f4c02dc53 SHA512 6792c68e8a5bbe43a93a3c9a128ae853edd21e0c918cf689d2db088b984aecdc570d5281bff263aca6078b07ddd0ba172c3c9b4ccace0fc690357d5fb13aff00 WHIRLPOOL 33cdd572f00952748a2ab05c39924495173e217df315a56f91036b45a268da1e8c687de381d8cdd5850a26ee6a6d3010053fee671db0901be55c664697900e6b
+EBUILD openvpn-2.3.2.ebuild 4153 SHA256 5e6a29ed8609f99d7f7e5471bc18fa07a3f21653ebe73e2e362e411bfc46fb2b SHA512 a29863e6fc571acf430248adde1e9cdee5ec078789a2c6ee83a22965b36034d2af6fb1ec389d79e418ebaed4a23dda2ff778f712a3359a4f7919c7c91a51dd6f WHIRLPOOL 35211999c4ab2459aa20d4cee84d0d284c39acd7f3a32a5b55a04a08295c3d1682474aefcc2cd221077b5003b5d90373636a0db874a30b654bab7b30949c4dc0
 EBUILD openvpn-9999.ebuild 3938 SHA256 afcf2646c697ed990fc21546bdbac75ee9dc70fe125be4036fa294aee71e57db SHA512 ad23685991fd6398e795fb02b074be29d4abe9e008286a742caf0a3f37e51f85d6579a19f634cd2f8e42730e9226c2c0efe993dd85599c5efa19eb9a2c5c820f WHIRLPOOL 1dca3d38e7bbdc72567a253af0c12fdf6ff79eaaf1064bb874259e13507c52bdd4a4704e3da9d72eb6ce2afd8519b4acec3b757de996f21012c8e9df589f6b2e
-MISC ChangeLog 38837 SHA256 e24bf859d59c7a29657adad64812bd45bad90469413b907cb0edc373154733c0 SHA512 107eab10c2dbc938e5ff964ddf1f66c86ec03417111843ab5ac4482a5543455781f6b1d605abb93f643c2c68d25e557901c758dd7ce694fc3fc1a7ba47cfc573 WHIRLPOOL 6991f61ed7a5006c18463e12aeda705c253282add6a699dfaac5ea9451f0f5b1154f11624f33df159f6e251bea051f41fbecb37dd7bcde19741e25f6009ca446
+MISC ChangeLog 38982 SHA256 4285e09bed1f67e0c2cffb6f8e7c60f18aef0d7afe92b221eb26bb95675d37d3 SHA512 19672800dafcd480d2b7e91a3c1ef76d46e738868184b4552be32eb8ba095d750be0e2ed97c07e7393dd38d71e7faa073ecc70221ff93c212270ab9e371f0754 WHIRLPOOL a6e03befa3c01cc6dbaf6be796610ad794a449ad410aa8db9291361c89b88a0e6bb89f06c37b5c2bfaceff1b4e54600a955babc12ad8529e92e815c8364aa506
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
-MISC metadata.xml.orig 849 SHA256 427834c2ac66d26593fa508a3d2747311dd74dc7dcaa8ada40807dc51632f622 SHA512 34815a54e2da2fbd268b33d6813223eb44b2e49ed63b1c40ae204fec9e357c9dd5360a38c4db549c5cb584cf8a54cfa9722d2924b740ab657323618b4b56c9fd WHIRLPOOL ecac439813f2408db1f43f7fd2f1482e7a9726fe86698f8a1e49a8a855ec24208ef350a85ae89806e5e7323bf7e54a7e768b50568aec9b3296f1f665b70bd77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQlmAAoJELEHsLL7fEFWkDMP/iqKJiE7BL+o3siQCZl9sRP8
-xlQhe9ekTzvWZH5yM67s1HZlm2GCheBDhtujJ/AqRHdLBfSInNAST+SBop57ELvH
-bqk8arP7nLJyN9otm21/O4xVl2iDkVvK/kpsZ9UYY4TYJ/ZGJAaTDa7kbeZSOjQh
-Crt95lvN5dFTCE7QdGzscRIh68SFPjgUdo1wfSHxd2W/SrHk9IGLDE16EDQ3Gv1m
-vj+WmkwsZ6SRp9Q4pgmdmJg+NSAIGgvPamNZV9EqWojQ0/aNb9phefm12pfJ8L3l
-VNOlPnSf7l9H3h9/E1S5dHjpCsRh/kJ7n7SgDttJjh3up3ezSplKvKnnvlz/NsMX
-QEoXZ0/luA0gaf73umZDCHUjfOTz4FQ85bU8XMje1ZWjB1OCL0pKxGS3Mc6/kHw+
-4O7RDuVNEW7EjRgkdTB2o3Jvje7+yLSLuV/3ET9AXCVucxG0D4zrhfsI0dv+2663
-aVY1e74x2r99CDK3KmO6PliIAN6/YnQYvHX08qnvtkAKL0xydWUJrAsupwzjmZEd
-1wQ9hJljeWsMvG0MlzqJSbneW+rfLZ71kt1RaN5+fov7c9edkqeJYf42BAr+IEAl
-fM1ambj6ECH70JClWHvbKFX1mz7iZyOGbJn7ernSfffpCrjpxMeK+4Co2U57FXu9
-SZ/20z3K4ZB8Xg1cIUv7
-=tSJU
+iEYEAREIAAYFAlG1xsIACgkQxeMuLWsGW/thJwCfUOBrd6+dCDSeBdGDLQRkJDpE
+HggAnjUUETUqOLJMyR8MnZqbhc7Ll7M5
+=CFBR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.2.ebuild b/net-misc/openvpn/openvpn-2.3.2.ebuild
new file mode 100644
index 000000000000..fb861bd80d26
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.2.ebuild
@@ -0,0 +1,127 @@
+# 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.2.ebuild,v 1.1 2013/06/10 12:29:33 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.1.0 )
+	)
+	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
+	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 || die
+	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service' || die
+}
+
+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.0 no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}