updating to fix asking for the password at init

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 151 insertions, 12 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 80217c1d4e90..93cb5341ae81 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.326 2015/08/07 10:12:17 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.327 2015/08/08 05:13:53 prometheanfire Exp $
+
+*openvpn-2.3.8 (08 Aug 2015)
+
+  08 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> +openvpn-2.3.8.ebuild:
+  updating to fix asking for the password at init
 
   07 Aug 2015; Tobias Klausmann <klausman@gentoo.org> openvpn-2.3.7.ebuild:
   Stable on alpha, bug 556874
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0b52a3328ee3..3403018449ef 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -13,23 +13,28 @@ AUX openvpn.tmpfile 39 SHA256 ef3453056a26487d27908d5ced124285403d8e88deb843fccd
 AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f787dd840 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd WHIRLPOOL 8d25a66d192a6710466d149aec7a1719dfe91558205e8ba7e25b93e58869c8fedc96ba4ce2aedb0595b7e0b63299e6e41be1ba82c6b93ae6bbbb26d409c9bf51
 DIST openvpn-2.3.6.tar.gz 1213272 SHA256 7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26 SHA512 70e0045ea41f6588769ab8b98d8f550b69148adbf7fedcdc36900e25950df43379950492652e243ec6e7965bf9c7dcc86a56ba5dfdc44523aaa81cfc508b1c6e WHIRLPOOL 737f2d1d69ee1c7700d5cd5a4e7d5d1b2f55d8b2229f7c2565fcb8c731ebb719ec8d6bad3b76f763f36e5c70c6e40a666db3508f3024f8e4637c0659061dba48
 DIST openvpn-2.3.7.tar.gz 1199706 SHA256 1f02a4cd6aeb6250ca9311560875b10ce8957a3c9101a8005bd1e17e5b03146e SHA512 35030eb432568e954d7d9543565c3c7d1268ff323e1a2da81047c497f3eeb6f4061d9cfc360aa98fe7c413282ee6d0eb70957d6d4a38d928348c706f20cb66df WHIRLPOOL 31b1cbdde3db8060f81b4b3fdc604dd357ad413ad18fcb7dae07c6bb4939f92d02271e6ecb677b5f3d80e305676c769232e9d114c667b85fab45125be10f49a4
+DIST openvpn-2.3.8.tar.gz 1214843 SHA256 532435eff61c14b44a583f27b72f93e7864e96c95fe51134ec0ad4b1b1107c51 SHA512 b619283d87eea2e47a2f0dfdbf0ffd1d10388fbdaadb33b43c7a2743748a4814f869fad6215d32fab156664d554ae94af456e7bf496890c68e6729b153d76db9 WHIRLPOOL 4868c735ca5e65b34f477457ea38eb6db45fae80563490d1e39ece9bf29b13976dd82d50d054da70c4ee146cb2e88e847bafc3f7ff47112d4494fa0f408d65d0
 EBUILD openvpn-2.3.6-r1.ebuild 4382 SHA256 9126cdf47630017ecfc4db06a85e0814d9b96c28d36306f7122171e6f1507402 SHA512 702931edf06a6f7aea5b1f84da30524c321506a9b52322297ce7858a886dcdd2118361df2a120c6c4a8508990faba3589ec7f23ebfbf95470762c3f0c42378e8 WHIRLPOOL 3a81d7e81b9181c812ab6b8532b2389f09d48826ff3c528baf46c23c7d7a474e32fb098dcb999b53eaaaad58af70e968a8ca881c4823556f680ee72708075b5c
 EBUILD openvpn-2.3.6-r2.ebuild 4443 SHA256 62df34a6f39af9106692b653ca37d04b8119b44335d218af5eebcdaf38bea8dd SHA512 6b35f80fc70c5b1ef5fca20e76d5f6209e40aa0a5fbadf54288237718a03a9853fa4442c8c1deb98b34b88cb6072c35fdf9c06c080fd1216df96bb566efb4e08 WHIRLPOOL 7f86cb8900e1a7ce1b2384d5445d807daf4ba1ab411ff3a1e74ec3bb4a7dad26062e3ad200305c6bed101c9c3e8f708cfc6b3052b8a617b09902775c581ffd23
 EBUILD openvpn-2.3.6.ebuild 4318 SHA256 1d9e25b29f9bd58df530ee9efb7bc23de17cda083eaf97547536c7871ff7eb5e SHA512 72ef385a427de32a38fb0e3f143e4da9111fe9c1e6e096f30be7a09f6e454efa28defd1af98f85a9136c376a3af5cc80b9aba023eb4ff5022186cd1a17330d68 WHIRLPOOL 43f41ae69e16c45528c805fd025c62a594cd980046ae4d11ae23d6c16f7bb2621ab0d719bcd6e638f636f1884b5173fcaca75d509d3eabec4d37e6de19819d4f
 EBUILD openvpn-2.3.7.ebuild 4312 SHA256 f4dc5317ddb488ad54c281223d07e070d842a085eb4c943e31860bb28796b442 SHA512 2dbfdbb71b7d969a2da165720e884db7d278762818f47cc02b2f7207f22a63781bdace2355913af5081ea07bef782d5795a52c661967badc8b7388c416021efa WHIRLPOOL d60c7a9098f2cd34d7b0a58e138f06dabf981dbf6a96c32df6dd1d057c24650e987473bc66de770d944715ffd8aaa2d85d154954d53c1cf4fe8d2a3c90c4740c
+EBUILD openvpn-2.3.8.ebuild 4320 SHA256 ea34267a4bae914d485ead3bbecaa90fa16a10485403839e8691ef1766fb7b63 SHA512 edf77e965c0015a41f8d05b8ee20585f16852d1a2d83fe558c2501da4db7c75296ca8f254bdc5a591ec987e075884eeee556e08401108f9ad4f79a10a8651eb9 WHIRLPOOL ffd8389c0a25b5193c293bba2b1e73b1bf3b4b88852d82e3c5b53a673a6137168da0a5d913476bd5145987a6c437cdd75f1329a97dc3f2e63cfe1c6ca8c00789
 EBUILD openvpn-9999.ebuild 4258 SHA256 f1309ed565c572b2d247cce3a3b2a87aa535f68c2028fe4ed46f36ef547f30c3 SHA512 63c21bcbc3ab465db4831589e108158fc0e6114f1f0bf11200b47b5be7904cef492b3b2ba7c9618b25bed38be68bb84b86befeadf8505ba7a3c767282eb8883e WHIRLPOOL 6ba04c644ea0ddacff339eca7a2e8f2076b3fd8730e902e6331b22fdbe6fa99e106aa25580da0113c0754aea34a194d63f7471ccc2822ddaff5e9bf4452a8c6b
-MISC ChangeLog 45627 SHA256 184be0c9454435dba17af86ffdf2c2b4155132a518fbc9285d3124ea868a56f1 SHA512 ed72ccc1fcc199e78cc70c89ee790099d23df40df4b68afdc8e9959592def3305db5b2967af5485db4a9cb3e6f041a5f09bd7435082187ea844b4b6ccc365701 WHIRLPOOL 4ee791966a677603ecb997aad88e7ad3bd4eb0d97422b81dc4e7e5866dd36da01777d2197e59576483face35702d726ef7a63969d2a5969b7b519a7cbbb45ff6
+MISC ChangeLog 45794 SHA256 5934bd3b7fb69833e6a786bff437d0322694e126d2448b3a72c771aff9888052 SHA512 66728563ecab8aabb1dc5ae24fb141a59573bc6e3bf8baa3a78d40dc4d5dc083a70ad76eef883f6efd968850aeece364d2534512ea00dc7ea349ef9e0d128afc WHIRLPOOL 60cd7cdce8fa00c525ba5814bd151fe043692b70cbdac13cec36644c7c695db3b7c24d444cbf3f6f38246e52c9b2f7e9f766fb13ec07196c40d038c881e9e340
 MISC metadata.xml 988 SHA256 f8d77075b01a7250cfe43ecc06a635ffabe022b9c59eff660a236aff040d84dc SHA512 986f7a5de176f45aeed2e03770cc6b8ac0f1a55f410127c6c7b666255e742a483393db5c85e32f78c2f5e683e8124c3d907acb151245c2a982e587a59e1a4f2c WHIRLPOOL 10e57141519cfeefb7bfa89f0c3a1f4fea64067f8245c123545c85a48934294f694e5d3e888959f215aeccfa97fb54e500b31d4163e76942d80c5d3a6aebdc5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
 
-iQF8BAEBCABmBQJVxISCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFQ0MxMDlFRTJGQzJGRUFENTYzQjg4OUJG
-RjEwQ0RDNjIwNjc1NDc4AAoJEP8QzcYgZ1R4e6sIAJ67FH1+Du8+AUqd8Nq/ubKZ
-vYyG1fGZdfDmTjGWB7tQJo5EbatP1TCe9ZYPEz4ijTYTe8VJsEP/OkdjCnM1LtJ3
-Mdk6eK4+AnFsXZTHkRLDn1xOquLbPqSrSSc/G4/XpMeMUKm2eiZaEuiPgNwkD+dS
-7CBtB7UX0lNZaW7QsGFg7n3wM++KE/E569Tj39YJBcRCazS0DwHToCwTXadnW8HT
-y+dtsLISkGCCvNJC0f3tCCauT4Tb/r3POQ02zaelTXc6Ja6mwsMgCjzfzv7VmZiK
-k+WuUUM9ttKw6bu5peMaMXk8ANlOHL1AFqDTcdUMhOfEHVfY/IrZqqYWSAzLVEA=
-=oee9
+iQIcBAEBCAAGBQJVxZBfAAoJEGSje+quGaTohoMQAMFicKmOtna+QTojQdkqG918
+YuuBrgnZLq8pUDW/sSGLwvo4ALCKhz0a8yJl7C1oaAFDLlEOvEHyYfaFxtcmSZAE
+x/kIBv36OR1qwwjiNtifYtQZSbm9/h8QNefBqx5OaPdpB7GOX/uN/HtVpvXp/ikq
+OWs/PcGmY9STX6q+v7jzmA5B6S4dh+HFBG8F0nJ3v6d7DinM5B3YsJp0KuTxpahR
+7+TXOFZVAdFGoA7t18CigNHBhaKhtWDxV/4I/Z9oi0YKDlLnaeofNKMV8yuurrsW
++ZTSiuP20WRRgpyzp9na/O4sEIw5gCeCdgBW4YBuZHp2t7yiCy74ytPwiqvnE06e
+UR8nb/FqDHfa1kMQOl2cN3l6wrb75uhQYnbdgJrmW6Sr3j4W6EsBK48+f0UicPtN
+7sozE6f/DmhtI71UTXJzgW/d6mTHNHQuXYAvFbOd85n1RJ+6BKXxYyh/TkKZDaUp
+YMEe8DsoH6tZM1NPUMafA8VlDJkukRoqMZXBsOzztdZ+jOFDjrydcdh1qNEoe2U6
+budKiSH93aQrr7vwVwSOfxA2mRKm91JZLmkLtPrVYXTH0tVauC5eMg/PBsRejN/X
+Dksr2P+W9rE1Rc5mp9I+fYpCOtzlz4VonOffmf35jrvrbi3jyBhyNbL0c8XJHs2K
++1K6X7yiqvClkbj/M246
+=tq4R
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
new file mode 100644
index 000000000000..297d15ab671c
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.8.ebuild,v 1.1 2015/08/08 05:13:53 prometheanfire Exp $
+
+EAPI=4
+
+inherit multilib 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 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd 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.11 )
+	systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+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 socks) \
+		$(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 distro/systemd/openvpn-client@.service openvpn-client@.service
+	systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.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."
+}