| 1 |
commit: 9040d6c5be62a68a0cfc2a5fc824e9abc5f19951 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Nov 6 21:26:04 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 4 00:54:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9040d6c5 |
| 7 |
|
| 8 |
net-wireless/wpa_supplicant: Move USE=gnutls behind USE=ssl flag. |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/587238 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/2673 |
| 14 |
|
| 15 |
.../wpa_supplicant/wpa_supplicant-2.6-r1.ebuild | 34 +++++++++++++--------- |
| 16 |
1 file changed, 20 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r1.ebuild |
| 19 |
index 5db3238..18e0b3e 100644 |
| 20 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r1.ebuild |
| 21 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r1.ebuild |
| 22 |
@@ -14,7 +14,7 @@ LICENSE="|| ( GPL-2 BSD )" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 25 |
IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" |
| 26 |
-REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" |
| 27 |
+REQUIRED_USE="fasteap? ( !ssl ) smartcard? ( ssl )" |
| 28 |
|
| 29 |
CDEPEND="dbus? ( sys-apps/dbus ) |
| 30 |
kernel_linux? ( |
| 31 |
@@ -34,16 +34,16 @@ CDEPEND="dbus? ( sys-apps/dbus ) |
| 32 |
sys-libs/readline:0= |
| 33 |
) |
| 34 |
ssl? ( |
| 35 |
- !libressl? ( dev-libs/openssl:0= ) |
| 36 |
- libressl? ( dev-libs/libressl:0= ) |
| 37 |
- ) |
| 38 |
- !ssl? ( |
| 39 |
gnutls? ( |
| 40 |
- dev-libs/libgcrypt:* |
| 41 |
- net-libs/gnutls |
| 42 |
+ dev-libs/libgcrypt:0= |
| 43 |
+ net-libs/gnutls:= |
| 44 |
+ ) |
| 45 |
+ !gnutls? ( |
| 46 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 47 |
+ libressl? ( dev-libs/libressl:0= ) |
| 48 |
) |
| 49 |
- !gnutls? ( dev-libs/libtommath ) |
| 50 |
) |
| 51 |
+ !ssl? ( dev-libs/libtommath ) |
| 52 |
" |
| 53 |
DEPEND="${CDEPEND} |
| 54 |
virtual/pkgconfig |
| 55 |
@@ -72,8 +72,12 @@ Kconfig_style_config() { |
| 56 |
} |
| 57 |
|
| 58 |
pkg_setup() { |
| 59 |
- if use gnutls && use ssl ; then |
| 60 |
- elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" |
| 61 |
+ if use ssl ; then |
| 62 |
+ if use gnutls && use libressl ; then |
| 63 |
+ elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\"" |
| 64 |
+ fi |
| 65 |
+ else |
| 66 |
+ elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation" |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
@@ -204,10 +208,12 @@ src_configure() { |
| 71 |
|
| 72 |
# SSL authentication methods |
| 73 |
if use ssl ; then |
| 74 |
- Kconfig_style_config TLS openssl |
| 75 |
- elif use gnutls ; then |
| 76 |
- Kconfig_style_config TLS gnutls |
| 77 |
- Kconfig_style_config GNUTLS_EXTRA |
| 78 |
+ if use gnutls ; then |
| 79 |
+ Kconfig_style_config TLS gnutls |
| 80 |
+ Kconfig_style_config GNUTLS_EXTRA |
| 81 |
+ else |
| 82 |
+ Kconfig_style_config TLS openssl |
| 83 |
+ fi |
| 84 |
else |
| 85 |
Kconfig_style_config TLS internal |
| 86 |
fi |
Archives