From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1078935-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AE06E138334
for <garchives@archives.gentoo.org>; Fri, 22 Mar 2019 19:39:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 82BA4E0872;
Fri, 22 Mar 2019 19:39:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 476A6E0872
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Mar 2019 19:39:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 937C1335D17
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Mar 2019 19:39:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BA83571
for <gentoo-commits@lists.gentoo.org>; Fri, 22 Mar 2019 19:39:10 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1553283546.ef2b4ea4fa229f9b1c92b34ee9dba111a927a7ea.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
X-VCS-Directories: net-wireless/wpa_supplicant/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: ef2b4ea4fa229f9b1c92b34ee9dba111a927a7ea
X-VCS-Branch: master
Date: Fri, 22 Mar 2019 19:39:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 37f0b074-0d8b-4724-88f9-472a170f24af
X-Archives-Hash: c702dd50b53639927c676ffcaf69610f
commit: ef2b4ea4fa229f9b1c92b34ee9dba111a927a7ea
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 19:38:50 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 19:39:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2b4ea4
net-wireless/wpa_supplicant: simplify ebuild
remove broken gnutls and internal tls implementations. they were never
equivilent to openssl and users don't need broken implementations
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../wpa_supplicant/wpa_supplicant-9999.ebuild | 90 ++++++----------------
1 file changed, 25 insertions(+), 65 deletions(-)
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 8a81bc1b5d4..487ffc5b611 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -18,8 +18,7 @@ else
fi
SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
CDEPEND="dbus? ( sys-apps/dbus )
kernel_linux? (
@@ -38,17 +37,8 @@ CDEPEND="dbus? ( sys-apps/dbus )
sys-libs/ncurses:0=
sys-libs/readline:0=
)
- ssl? (
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls:=
- )
- !gnutls? (
- !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- !ssl? ( dev-libs/libtommath )
+ !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+ libressl? ( dev-libs/libressl:0= )
"
DEPEND="${CDEPEND}
virtual/pkgconfig
@@ -87,16 +77,6 @@ Kconfig_style_config() {
fi
}
-pkg_setup() {
- if use ssl ; then
- if use gnutls && use libressl ; then
- elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"libressl\""
- fi
- else
- elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
- fi
-}
-
src_prepare() {
default
@@ -182,13 +162,6 @@ src_configure() {
Kconfig_style_config BGSCAN_SIMPLE
Kconfig_style_config BGSCAN_LEARN
- if use macsec ; then
- #requires something, no idea what
- #Kconfig_style_config DRIVER_MACSEC_QCA
- Kconfig_style_config DRIVER_MACSEC_LINUX
- Kconfig_style_config MACSEC
- fi
-
if use dbus ; then
Kconfig_style_config CTRL_IFACE_DBUS
Kconfig_style_config CTRL_IFACE_DBUS_NEW
@@ -240,39 +213,19 @@ src_configure() {
Kconfig_style_config SUITEB
fi
- # SSL authentication methods
- if use ssl ; then
- if use gnutls ; then
- Kconfig_style_config TLS gnutls
- Kconfig_style_config GNUTLS_EXTRA
- Kconfig_style_config EAP_PWD n
- Kconfig_style_config SAE n
- Kconfig_style_config DPP n
- else
- #this fails for gnutls
- Kconfig_style_config SUITEB192
- Kconfig_style_config TLS openssl
- Kconfig_style_config FST
- if ! use bindist; then
- #this fails for gnutls
- Kconfig_style_config EAP_PWD
- Kconfig_style_config FILS
- Kconfig_style_config FILS_SK_PFS
- # SAE fails on gnutls and everything below here needs SAE
- # Enabling mesh networks.
- Kconfig_style_config MESH
- #WPA3
- Kconfig_style_config OWE
- Kconfig_style_config SAE
- Kconfig_style_config DPP
- fi
-
- fi
- else
- Kconfig_style_config TLS internal
- Kconfig_style_config EAP_PWD n
- Kconfig_style_config SAE n
- Kconfig_style_config DPP n
+ Kconfig_style_config SUITEB192
+ Kconfig_style_config TLS openssl
+ Kconfig_style_config FST
+ if ! use bindist; then
+ Kconfig_style_config EAP_PWD
+ Kconfig_style_config FILS
+ Kconfig_style_config FILS_SK_PFS
+ # Enabling mesh networks.
+ Kconfig_style_config MESH
+ #WPA3
+ Kconfig_style_config OWE
+ Kconfig_style_config SAE
+ Kconfig_style_config DPP
fi
if use smartcard ; then
@@ -293,6 +246,13 @@ src_configure() {
Kconfig_style_config DRIVER_WEXT
Kconfig_style_config DRIVER_WIRED
+ if use macsec ; then
+ #requires something, no idea what
+ #Kconfig_style_config DRIVER_MACSEC_QCA
+ Kconfig_style_config DRIVER_MACSEC_LINUX
+ Kconfig_style_config MACSEC
+ fi
+
if use ps3 ; then
Kconfig_style_config DRIVER_PS3
fi
@@ -449,9 +409,9 @@ pkg_postinst() {
ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
fi
- if use bindist || use gnutls; then
+ if use bindist; then
if ! use libressl; then
- ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
+ ewarn "Using bindist use flags presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
ewarn "This is incredibly undesirable"
fi
fi