| 1 |
commit: fa508597570deec743b18a1d5d0405c1c970c222 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 27 16:35:03 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 27 20:27:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa508597 |
| 7 |
|
| 8 |
net-vpn/openvpn: [QA] Fix USE=libressl semantics |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/683990 |
| 11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 3 +-- |
| 15 |
net-vpn/openvpn/openvpn-2.4.6.ebuild | 9 ++++----- |
| 16 |
net-vpn/openvpn/openvpn-2.4.7-r1.ebuild | 3 +-- |
| 17 |
net-vpn/openvpn/openvpn-9999.ebuild | 4 ++-- |
| 18 |
4 files changed, 8 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild |
| 21 |
index 81d3d655a38..d90a72c8b4e 100644 |
| 22 |
--- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild |
| 23 |
+++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild |
| 24 |
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" |
| 25 |
IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" |
| 26 |
|
| 27 |
REQUIRED_USE="static? ( !plugins !pkcs11 ) |
| 28 |
- mbedtls? ( ssl !libressl ) |
| 29 |
pkcs11? ( ssl ) |
| 30 |
!plugins? ( !pam !down-root ) |
| 31 |
inotify? ( plugins )" |
| 32 |
@@ -72,9 +71,9 @@ src_configure() { |
| 33 |
IFCONFIG=/bin/ifconfig \ |
| 34 |
ROUTE=/bin/route \ |
| 35 |
econf \ |
| 36 |
- $(usex mbedtls '--with-crypto-library=mbedtls' '') \ |
| 37 |
$(use_enable inotify async-push) \ |
| 38 |
$(use_enable ssl crypto) \ |
| 39 |
+ $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ |
| 40 |
$(use_enable lz4) \ |
| 41 |
$(use_enable lzo) \ |
| 42 |
$(use_enable pkcs11) \ |
| 43 |
|
| 44 |
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild |
| 45 |
index 09a11b23f04..41badc7b079 100644 |
| 46 |
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild |
| 47 |
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild |
| 48 |
@@ -1,4 +1,4 @@ |
| 49 |
-# Copyright 1999-2018 Gentoo Foundation |
| 50 |
+# Copyright 1999-2019 Gentoo Authors |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
EAPI=6 |
| 54 |
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" |
| 55 |
IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" |
| 56 |
|
| 57 |
REQUIRED_USE="static? ( !plugins !pkcs11 ) |
| 58 |
- mbedtls? ( ssl !libressl ) |
| 59 |
pkcs11? ( ssl ) |
| 60 |
!plugins? ( !pam !down-root ) |
| 61 |
inotify? ( plugins )" |
| 62 |
@@ -31,8 +30,8 @@ CDEPEND=" |
| 63 |
pam? ( virtual/pam ) |
| 64 |
ssl? ( |
| 65 |
!mbedtls? ( |
| 66 |
- !libressl? ( >=dev-libs/openssl-0.9.8:* ) |
| 67 |
- libressl? ( dev-libs/libressl ) |
| 68 |
+ !libressl? ( >=dev-libs/openssl-0.9.8:0= ) |
| 69 |
+ libressl? ( dev-libs/libressl:0= ) |
| 70 |
) |
| 71 |
mbedtls? ( net-libs/mbedtls ) |
| 72 |
) |
| 73 |
@@ -72,9 +71,9 @@ src_configure() { |
| 74 |
IFCONFIG=/bin/ifconfig \ |
| 75 |
ROUTE=/bin/route \ |
| 76 |
econf \ |
| 77 |
- $(usex mbedtls '--with-crypto-library=mbedtls' '') \ |
| 78 |
$(use_enable inotify async-push) \ |
| 79 |
$(use_enable ssl crypto) \ |
| 80 |
+ $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ |
| 81 |
$(use_enable lz4) \ |
| 82 |
$(use_enable lzo) \ |
| 83 |
$(use_enable pkcs11) \ |
| 84 |
|
| 85 |
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild |
| 86 |
index 0ae13d41d8c..47ecc313e5d 100644 |
| 87 |
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild |
| 88 |
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild |
| 89 |
@@ -18,7 +18,6 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" |
| 90 |
IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD" |
| 91 |
|
| 92 |
REQUIRED_USE="static? ( !plugins !pkcs11 ) |
| 93 |
- mbedtls? ( ssl !libressl ) |
| 94 |
pkcs11? ( ssl ) |
| 95 |
!plugins? ( !pam !down-root ) |
| 96 |
inotify? ( plugins )" |
| 97 |
@@ -73,9 +72,9 @@ src_configure() { |
| 98 |
IFCONFIG=/bin/ifconfig \ |
| 99 |
ROUTE=/bin/route \ |
| 100 |
econf \ |
| 101 |
- $(usex mbedtls '--with-crypto-library=mbedtls' '') \ |
| 102 |
$(use_enable inotify async-push) \ |
| 103 |
$(use_enable ssl crypto) \ |
| 104 |
+ $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ |
| 105 |
$(use_enable lz4) \ |
| 106 |
$(use_enable lzo) \ |
| 107 |
$(use_enable pkcs11) \ |
| 108 |
|
| 109 |
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild |
| 110 |
index 8ad3d42ffc3..8cf7c4dc809 100644 |
| 111 |
--- a/net-vpn/openvpn/openvpn-9999.ebuild |
| 112 |
+++ b/net-vpn/openvpn/openvpn-9999.ebuild |
| 113 |
@@ -64,10 +64,10 @@ src_configure() { |
| 114 |
SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ |
| 115 |
TMPFILES_DIR="/usr/lib/tmpfiles.d" \ |
| 116 |
econf \ |
| 117 |
- --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \ |
| 118 |
- $(usex mbedtls 'with-crypto-library' 'mbedtls' '' '') \ |
| 119 |
+ --with-plugindir="${EPREFIX}/usr/$(get_libdir)/$PN" \ |
| 120 |
$(use_enable inotify async-push) \ |
| 121 |
$(use_enable ssl crypto) \ |
| 122 |
+ $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ |
| 123 |
$(use_enable lz4) \ |
| 124 |
$(use_enable lzo) \ |
| 125 |
$(use_enable pkcs11) \ |
Archives