Version bump openvpn to 2.3.3 (bug 507758).

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

3 files changed, 152 insertions, 18 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 34909d1c088b..bee5db61a179 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.285 2013/09/26 17:32:05 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.286 2014/04/22 07:45:57 djc Exp $
+
+*openvpn-2.3.3 (22 Apr 2014)
+
+  22 Apr 2014; Dirkjan Ochtman <djc@gentoo.org> +openvpn-2.3.3.ebuild:
+  Version bump openvpn to 2.3.3 (bug 507758).
 
   26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> openvpn-2.3.2.ebuild:
   Stable for arm, wrt bug #484726
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 01350f1d6907..2ae24c181d18 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 65openvpn 45 SHA256 d5758e39fdc75dcbb5a788b1afa743c3c1f08c63c535aa32c300b965474d765c SHA512 713345092b60d1322d3fa96fd72d69ed82dbfee5031a675114bc60acfdacaf0811f6bf4530cf937ca5a86b3f2665b28951b9087ec91c2c0faf75bdaf1e25bdbb WHIRLPOOL 534e7dcf2ac953e9ec5de05810022471cb26a16806cd036f25d02550e20f8aaa91410bd005bc7a5e4a549d8a40d01ae317be1d1e1e25d91ed989bbbea7ede9d2
 AUX down.sh 943 SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7 SHA512 5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997 WHIRLPOOL c66fd1e016656fe83d7f55b77bf232058397f9cd3054abe13ec006c227afe6746ee4ada310ff43761ec95510f736b8e542f136711d648642eecafe055975c57e
@@ -15,27 +15,29 @@ DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcf
 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
+DIST openvpn-2.3.3.tar.gz 1161137 SHA256 f025d14631105a66e501ca897830cd4d26a1438530cd9174dc6169536ae4b113 SHA512 05d6eff0db7137772a90c3d04ebd109eeb5f149b57f05edab211052754032cac3132f0a6f6e689dcab65db89cfed6065f82ac4fcf7f18b230900f6108570263f WHIRLPOOL f4bf6c5e5b8266c9cdc2d89003300a720423fd296d281ebd2a52d70b6aaeaee57b5506042a807771c0a271aaff8772f3794eef9124270d3fc9d0b1cd3fe40657
 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 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
+EBUILD openvpn-2.3.3.ebuild 4140 SHA256 916c58080781959e82740edef8ed4cbc4f52ea4bba14590cc6ea1a448843a393 SHA512 a216af44634f0de8156efcbde7ca5105fe64e2a42c2b10b5f3e488c914c25de0102f55cbba3835454b91e2433fef4b53fdd26c99347d61b8b9b35404ce71333c WHIRLPOOL 65a63f60dcbd22715a74144ada80713e2b897701e0fb6f2956fce61d41915d26093a9ccc91f9a85bd9bba642c8b568518f61af1fe2395fd74fd94d406bbc7fc6
 EBUILD openvpn-9999.ebuild 3938 SHA256 afcf2646c697ed990fc21546bdbac75ee9dc70fe125be4036fa294aee71e57db SHA512 ad23685991fd6398e795fb02b074be29d4abe9e008286a742caf0a3f37e51f85d6579a19f634cd2f8e42730e9226c2c0efe993dd85599c5efa19eb9a2c5c820f WHIRLPOOL 1dca3d38e7bbdc72567a253af0c12fdf6ff79eaaf1064bb874259e13507c52bdd4a4704e3da9d72eb6ce2afd8519b4acec3b757de996f21012c8e9df589f6b2e
-MISC ChangeLog 40036 SHA256 c1f98625a6f99e5f94f3a93baa1cafd3d836b557ce60725f1233016d95839f54 SHA512 a66d999c72f821decd6e478af92571baa2db26a603c75dddf1a6cd4e7a3029b157741bb096cd5cd0c1271e30aa9d3fba943a6c48c8432bcdc49f633fffea2511 WHIRLPOOL f975dd82edd24eda198141fea937c7d5f50ed2328933b2f3362f509bbae11bc1d9afb9f2d83ad97af7ce46e82e4d61aea0926a0d8fbb0b287851b8ea17af7999
+MISC ChangeLog 40184 SHA256 e5d1dd6824a950f524892e7dc355c1f21145f2fc9bbf063c3df06444077d8545 SHA512 0bc5e49cb8eebcdce47b2903f3cf2bb7eee3134e44bccecdb9e46eeda6948a768400a029165e0c275239ed8b7368a5823cc0ccb082ffb13ce61a5281b51710c6 WHIRLPOOL 3973eea36dc636e6408fe082b932fde42bdebf042addebcf9021ff06f1963dceb01921eeed43d8acff1b1527260d55bd6d53bb254abe2d77a0ddd430299d468a
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSRG7DAAoJELp701BxlEWfehAP/jge+7W0O169Qxm3zHGyd2+S
-s7XHsdptFvRHUaARnu1CNe3OZT0CqavOy8sMedmN/hlJ8Frw2/tEuvkBTWCUWgvc
-6F/Oz+0QBcPLyPSXhYlepKUAVmPEa7e6el9HhvU/CvP6TMlIHd36CkYpeEmeu0UN
-1wwn12lb8MAd0t78Sl4c71lx297aR48kiH01ya+4Wbvms7ld0clfK6xzD7xHZY43
-SVpqoVKbwTynqZ3A/0lqpSu7ry4Vv04Smi8CDLSx+Cmpa6UljVnmwY02psJlvsST
-bZBD6ozwsvC7iuAoXgtlNA0gSDqkPj6iwF9bmIWZrsG/+SGPqJXOAkjhqTe7E5s9
-AG6ik9eQvKSkJ9hLVp/vz6xxsZ+kXkjrHWDBcn54EGunBnLbUUus9vIGp+yHHmGe
-q0q/1LziTgGiM4ja8pneNS2nZyl+h+EcKnSkI9DLC89g0CljGl4W6nVo2nX4XC5t
-iVDMmyp8LbegzHYgetxu7HEDfU9VxXc48HwbousDIHCm3cBIwCeadiWtdfZaGMNW
-q7Sjz4ucgGtNFhgsNpFeBCCbROrYJu355KIZU5OOVGlDrCzRPlMSoWykh/7j2Ejq
-YTog5SuOcnrixOf0MTjP67DyUsryhyOzLeq8VgKhyutl18A+eU7rLVScCJ4XMyxP
-OXiZt5M9062gu7Ikz2mx
-=GTF0
+iQIcBAEBCAAGBQJTVh6eAAoJEJ+WuSkwOAOB7XIQAKDJzzc3O81j8SpQHwseAQty
+UdFPxrYEaocZ3+JtUq43bhGDrc0Pg4Ve93OIASnxvWCKET0joNlADtk3oLv8/0Y4
+oBso+vOicO1YQNvwmauL8Bgh2S9DoYXenfYaG7qFtyKqlVRAAART64gRtMBtdq5v
+XlldrPaQUUwZDz+9YmNQs1LBx9NJEqg9LKBHbFAIt6JfEVtdtUUyMD4BxUcrUl6R
+872aq/eh6mQFbZ0O/zazX4babxED51skzZRNvLvsA9xQdQ2JvCqPE2lC4Q39PAWa
+cSxjlR+dvllrAFkBa91WqDhUmBI61zVdqsKchcIZ0qmaWhIULwR4ZDFAgHNYdCVV
+mVHlGyXcA/IBGemN3z5OqlN12LONkX7sOti2bIXNViQIGxczHiWMfEOQ1b+rBGUX
+/BziWfc4oBSWvgSKmrm5DV8JPxtRiEMjEY+ZNs0HOxV0VS+JE4CCFmF0PYStzB5D
+XvM96DEhTFxD/bnkjF6CfkVwZGbjR6GcSkAhnwoyajEmk/Y8/oiGJwAtHB3TMkHL
+Y+AQ9fuftVKb9PdNtXSPcg8ST3uqtd9bVsoI8ocuLqo88jbbtcqSVB2bE13jENXW
+QK1DJCLp431w0GL6JbfZmIx7W4O9yzi6CgOsRfKEDPXjAgbD9CA1/tJ/YVIG9bKN
+wnP3i7ajFT9X9FjF7jpG
+=atFI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.3.ebuild b/net-misc/openvpn/openvpn-2.3.3.ebuild
new file mode 100644
index 000000000000..349c63644908
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.3.ebuild
@@ -0,0 +1,127 @@
+# 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 $
+
+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
+	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."
+}