Bring openvpn-9999 in line with 2.3.7 (fix bug 554638)

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

3 files changed, 32 insertions, 22 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 61e8643f8481..d44ee3747664 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # 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.322 2015/07/12 19:17:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.323 2015/07/12 19:30:58 djc Exp $
+
+  12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
+  Bring openvpn-9999 in line with 2.3.7 (fix bug 554638)
 
   12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.6-r1.ebuild,
   openvpn-2.3.6-r2.ebuild, openvpn-2.3.6.ebuild, openvpn-2.3.7.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index ea70356595c3..0ac4e46a237b 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -17,23 +17,23 @@ EBUILD openvpn-2.3.6-r1.ebuild 4383 SHA256 f6027c4baafcb215c36298f136e0b37454a57
 EBUILD openvpn-2.3.6-r2.ebuild 4444 SHA256 b8c2d4836e480176ed761ac56798be4c78a05de68b6855e8f66a0835dd942a87 SHA512 5f75bc5bb9116ef01a1815344a11d47f8953792c6d1db31d9687068812a66ac5d979eed4c035bccad4de1385ad434ab10dae1b6cbd33bb6760ecaeda04a0998a WHIRLPOOL 0395ffa2692bf979c4515b85fd0615c2612726a4d6799a4885f1e8c8eb1ad213ae57315e997a4216350fc2fb13ae814e918ce00ed10884116c045a51466bb4c7
 EBUILD openvpn-2.3.6.ebuild 4319 SHA256 cf290bb44eefbfa5399be29a71b19a90cf98d1b702ccf9b7418ff21f8706e837 SHA512 c8651f49048a9097b971287bf6e61bffa2087d025d8070a44df06783c2381b7f95bcc88935adffb661e6efe5a5b5f2286606fa4718c8a0f3b3fcae0c9ec2c038 WHIRLPOOL 052dfe2bd3a130f6ddf4e0258ce16f55a45fa026bad36f8242406b549425c6536606a7ee1bddb8ab6059029d21501a48e0a9f848db6f419d74773f763533edc1
 EBUILD openvpn-2.3.7.ebuild 4310 SHA256 62c9171fd968f4996e2cfd93604583915bd9fc5e4eb1043de908d93ff3516070 SHA512 e7ad5c719ecbd13fe921289c39a677a39028ab2737bd894df92c8de64d6c681effe30d0948ee44bc086e6f628e442728e6c615c0094c71e8df8d9ee58131a101 WHIRLPOOL f7f30759329df68edc3b55e299860e3ffc4749c77eea4c30729e2d7bf000d80d8abaac607785e8595b8bb0a21615ff4719263c5fededb94170e986d4cddee964
-EBUILD openvpn-9999.ebuild 3941 SHA256 ef975ee9157e25b16aa4c59144b1fc0814c67def458a71e5166c70e7c41e5081 SHA512 7030ee666c7372b86a198f3780797a4253baed6e61e4bbb3f1bb166b95268b4ee00992c770c689ab6bb9326eb2d66a6c52cec65739e887ef39e6da1da6ce49b6 WHIRLPOOL 174bee3dc113263b7ebc24048613cc3039cd49f52cee4c9eff55d80d9436cead408d3c09cb6dad1318a4812fb00f7eb22b286f329499346240db2f38a066b2ff
-MISC ChangeLog 45054 SHA256 373f412e2570b50b8b60d68a60e9502d3eca7f13703cac0a31ac54fa3d78f3e8 SHA512 3c19f866fe7a396cc2267eb1cdfc5c8b47f2ec4578c5730e161182a144f2e30f75604a27ce61bc953f07b0a43bdd81f37c376583ae744422c7ccea8d9e421383 WHIRLPOOL d1de9919bb560f54b6a7971af8a2f133f3fc131cb79247f37c2e521fa19f0c03e7afeba9c446222906d4bb9d4d48d3f379d2286079399669c1b506cfb822de17
+EBUILD openvpn-9999.ebuild 4258 SHA256 c4bf688239341a277535b930c20d4b30240101905b052fc6e0d067d9e27f2975 SHA512 518560e571c7edcb246f360a523f432d8669f96b75c78aa2c0a42f614220813247476b133127337a4655c75147a26d12094c84d556c3c63bb740db849b3dff15 WHIRLPOOL 12056b7f733b6fd78461eaf44a0ddfa245aa7080847b3b300ddf4bb5d98f2c8d7d53c06e79edde5d9e80c19197ff87d93716bc845f15f87d3b6027eb16126dc1
+MISC ChangeLog 45181 SHA256 020ab220a08abe999010254b4237db457d79b8a553b3e69d010934d587948a3c SHA512 b9b0d2e498fb8d4aea4c2f1709b6f7f3da454fed9be942002f37517fd053ad0d8ec1129238e7382faa7305c00fc5568ce34fab8f06a48c5864f16fb06c280c15 WHIRLPOOL cf00a8b80f2d3bf2991ae9c9230cb1691ffc58c12011246c537be47919d40048ee6f88de1357bc9c9c28c87f8bf0079f731c9a737baa266b6f93076d87949a14
 MISC metadata.xml 988 SHA256 f8d77075b01a7250cfe43ecc06a635ffabe022b9c59eff660a236aff040d84dc SHA512 986f7a5de176f45aeed2e03770cc6b8ac0f1a55f410127c6c7b666255e742a483393db5c85e32f78c2f5e683e8124c3d907acb151245c2a982e587a59e1a4f2c WHIRLPOOL 10e57141519cfeefb7bfa89f0c3a1f4fea64067f8245c123545c85a48934294f694e5d3e888959f215aeccfa97fb54e500b31d4163e76942d80c5d3a6aebdc5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVor8NAAoJEJ+WuSkwOAOBG3wP/06aLHohNvmbynkiw9LVGEvl
-7MdrXqBky1NTKunaFBf2JhmDEzz8UAfPgk7WPuko8GlRmmnF7WYIcuDz/aKvMPi2
-UKg9OD+cCM2Zpnurx0mvNL+o6C9UFcpk2pviHlD+ZN/IyH9DI1tnICC/CFbqXsOW
-9grzMBj6OzdnWsXQOn1TiqeGV8UFTWqTkrjXYywrZoxYioPznAppdviNVNDakB9Z
-bPt0R98fDQhzhx074b7qZAaCz8Zej3Ss7hzmi4bbyxNla+LynSRpQX8bRucu1A+Y
-Oq60H1AHL54fCitgqja0/bRJRRRa4Hdhjwe/Ki0qlbY0urnHcJrx3hXfRF7+uDQ+
-fP/Ztj9YbpJyd7/a0vwB33rk1SuMq94+tFfRqcC4KN8x94NEdYO263mPU/z1EJ6K
-aNwPKd/FuNr+ihgg/4aF2ZT9mUprOo5MxbUqdNFI5Uvx2tpqMe08XPO6ajszcZLI
-GULX72FJTLm7Jz+p6lRo/JH1tiqNN82TtiaxhBx3lZxOQrOp4RgLhs6CvTIF65Cg
-Ian+/Rrnq0qVS+5seOZoXTF9GBAzC21dIP6I7eiC5JjgBfdlL1zqXqfq/0aZwgtc
-Q4y4FoCNmNidF9B0iVDpbRUY5BkMVJ174o/ZtptR9gZe7smvj5OtLOCTkPSKmT8s
-IwRv1pypxbb/QhU1UJ2m
-=SRrn
+iQIcBAEBCAAGBQJVosHRAAoJEJ+WuSkwOAOBsxIQAMdCWnCLiRCtc1gGnjRy1xjv
+CDnu8Hddd5cceCVeYZuqfua7iD+XyiUBQYFJewq5dKL1uqbDh8VrVjHlXhuj0Wdn
+rtKSI9XVjAoLC6+wUpqN34vTa/yXZXAsIg8IWN3XwF6xNEHvQp/w6acyG4Z3MVSJ
+7JKU/+BEYNpl6VGfTcN7qm1D1OytCeEKm5vVbnM/97jJh4zQE37JTAE6OThlaOpp
+7KkmPoHhc/tcX1hAszjC07vOI0PPg2TX/fUlV53YvWzneIHBFBukvUWb5gJmK37B
+/7x3WsJyaVmmUkDsriJEiWMqimj3OLBZpasmZWlrso1Vv/p8UA+nlXS8SuGQIB2u
+rphUTLhyIXoOfcsjUKPudLP0hPOoLoaJkj4Iq4/vUS83dzh81RrY3kQAXKposAIp
+iUX7Ko8jkyvkFkvSOjft8syVUYAeSlW/RVByV5/lHrWSEsWmEqBiqq9LBU81J4sl
+uy9oJvXvVwLvGeiviMMTN2UrSwP17yIJFwzCEmrlpA9SiBAlM9b3X7Vdxd3+w92l
+5GBM9bPFCgGChxlNJxw0bo0E6pf8DoadKtwRAMmjfq1t5b/9DSBrfmBpzF8e++Fa
+HIgwxzVzHUmALCD/fLgkgoPkBHxH9Z90dIrHB5PdrCDOfenNz6N+RTATGvs2Bvi8
+Zl2lFCa88CCNYrj/kK5O
+=LB1J
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index 408b3956954a..a60c6841c55f 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-9999.ebuild,v 1.8 2014/11/02 09:13:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.9 2015/07/12 19:30:58 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl +lzo static userland_BSD"
+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 )
@@ -25,10 +25,11 @@ DEPEND="
 	)
 	pam? ( virtual/pam )
 	ssl? (
-		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 )
+		!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 )"
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-openvpn )
 "
@@ -52,8 +53,10 @@ src_configure() {
 		$(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 down-root plugin-down-root) \
+		$(use_enable systemd)
 }
 
 src_install() {
@@ -78,6 +81,10 @@ src_install() {
 		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() {