summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2016-12-16 13:28:02 -0800
committerPatrick McLean <chutzpah@gentoo.org>2016-12-16 13:29:56 -0800
commitb92c046899367013031722ba5e8061d873cb65a5 (patch)
tree370728166f46620f28e8b112514d6c11f3689210 /net-misc/openvpn
parentdev-db/mariadb: Remove revision with bad configure options (diff)
downloadgentoo-b92c046899367013031722ba5e8061d873cb65a5.tar.gz
gentoo-b92c046899367013031722ba5e8061d873cb65a5.tar.bz2
gentoo-b92c046899367013031722ba5e8061d873cb65a5.zip
net-misc/openvpn: Version bump to 2.4_rc2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-misc/openvpn')
-rw-r--r--net-misc/openvpn/Manifest2
-rw-r--r--net-misc/openvpn/openvpn-2.4_rc2.ebuild (renamed from net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild)8
-rw-r--r--net-misc/openvpn/openvpn-9999.ebuild6
3 files changed, 5 insertions, 11 deletions
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index af321bcf0fef..e0a84d1fc20b 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,4 +1,4 @@
DIST mock_msg.h 1356 SHA256 d6c56a423753c0b938a5dc32c978984eebb97243a2671a1652440093f67d61fb SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea WHIRLPOOL 4cce848abc141e9d39cca1f8a0c9d11c0819d8a6e640c541968df491d2a6c3c0746233742418ee43c8bbc6ef19028a41159efae2922bcc719bd86442da05df86
DIST openvpn-2.3.12.tar.gz 1235262 SHA256 f5d39b8c55f75b0aab943059b20571452b494146d997b12d48ce9bd753c01cff SHA512 8de40e9177268cce64906915ddc0d23381b4040ed00e6eefe4784b04d48f50d5c5ce9e99886eb18fe45d22c5c047478b9aa942e4c4eeaf115cc443a1d3ebe631 WHIRLPOOL 4adeb0da83a4fbff27bc90a3941b593f97dfdc3f50c3ccf10c113293bb0e4f85ead680b53645a2a078f907026549c8dbf068dcc64c9f89b6a967b3eb919f2c8c
DIST openvpn-2.3.13.tar.gz 1237826 SHA256 0e017211bf2a0607b1dda5e8e3f710b4c54aa5a63e1f89a8b17054abee20fa86 SHA512 72e979f2e3e10d2aec6cb8a8bda97bc15bbf3a4e392ae13a5ebc7d0553c174801d2d93ccd2087e16ac0cbd6527a93dd66a4823be658d5730a9391c7a8bce2294 WHIRLPOOL f896e91341eee512a941efb58b2fa42b88181870f17d54ae08ad8fb848ab09e922e9678d0d6325fd57b54c5dd9848fda0cc820ec692dcbe58db96e14186b7641
-DIST openvpn-2.4_rc1.tar.gz 1360801 SHA256 97ba64983531f5e27771a338518f9084a218442f5463ad055f4ceae9f523eb91 SHA512 ae531ac7e6bb6fd3323a0a7f3cef57b94a3f120fd33385c6d4528f6b831fd6f0c567616d0e048dd45fbe20829bd1432483798d82382eaa99fe0f14f93448c0b0 WHIRLPOOL 4f8d4df0c614705f9d9f3030d28be88705ab3dafaf0a86b4fb27727b84409e3235f6c0cf44bc5985e7316a3307f20e1197df3208551a2b06db18d733251ec2b5
+DIST openvpn-2.4_rc2.tar.gz 1403262 SHA256 eb97153fe2f0b28be71904cabcaf9c7f9ec1c55871ba38d62066c8811274caf9 SHA512 351e42cbb6750e866fbac407f3f7b308cde5631d07d84fa4d4851d9828a334548de639add385a0fb3387d8e1ae3d2601d4d8a2eadc27b474c72dab04039f52fa WHIRLPOOL f366272ab6d7fc0989dff229d8c41945f58562d3398733d49609b57be0905addda08b553e05672493eac9e1e1f60599b6554b4b09d6c49f7b33db3a1f3b1758f
diff --git a/net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild b/net-misc/openvpn/openvpn-2.4_rc2.ebuild
index 2b6db91b8408..431f14233bde 100644
--- a/net-misc/openvpn/openvpn-2.4_rc1-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.4_rc2.ebuild
@@ -23,10 +23,8 @@ REQUIRED_USE="static? ( !plugins !pkcs11 )
pkcs11? ( ssl )
mbedtls? ( ssl !libressl )
pkcs11? ( ssl )
- !plugins? ( !pam !down-root )"
-
-# bug #601524
-REQUIRED_USE+=" inotify? ( plugins )"
+ !plugins? ( !pam !down-root )
+ inotify? ( plugins )"
CDEPEND="
kernel_linux? (
@@ -54,8 +52,6 @@ CONFIG_CHECK="~TUN"
PATCHES=(
"${FILESDIR}/${PN}-external-cmocka.patch"
- "${FILESDIR}/${P}-arm-inotify-only-in-server-mode.patch"
- "${FILESDIR}/${P}-fix-async-push.patch"
)
pkg_setup() {
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index 8e2e85fc66be..dcbc1b5794c9 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -23,10 +23,8 @@ REQUIRED_USE="static? ( !plugins !pkcs11 )
pkcs11? ( ssl )
mbedtls? ( ssl !libressl )
pkcs11? ( ssl )
- !plugins? ( !pam !down-root )"
-
-# bug #601524
-REQUIRED_USE+=" inotify? ( plugins )"
+ !plugins? ( !pam !down-root )
+ inotify? ( plugins )"
CDEPEND="
kernel_linux? (