From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 82F091382C5 for ; Fri, 2 Apr 2021 19:29:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98956E083D; Fri, 2 Apr 2021 19:29:37 +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 6832AE083D for ; Fri, 2 Apr 2021 19:29:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A4B7734076D for ; Fri, 2 Apr 2021 19:29:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0E68CC for ; Fri, 2 Apr 2021 19:29:33 +0000 (UTC) From: "Rick Farina" 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" Message-ID: <1617391771.92dac892940defc0627d8155910f4c13014b939c.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-2.9-r2.ebuild 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: 92dac892940defc0627d8155910f4c13014b939c X-VCS-Branch: master Date: Fri, 2 Apr 2021 19:29:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0b4d811-625f-47bc-943b-ff24506fdfe9 X-Archives-Hash: dec06c8f81f475a6c3087635d3250e7e commit: 92dac892940defc0627d8155910f4c13014b939c Author: David Michael gmail com> AuthorDate: Fri Mar 26 18:31:47 2021 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Apr 2 19:29:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dac892 net-wireless/wpa_supplicant: fix pkg-config, drop libressl Closes: https://bugs.gentoo.org/734790 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: Rick Farina gentoo.org> .../wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 35 ++++++++-------------- .../wpa_supplicant/wpa_supplicant-9999.ebuild | 35 ++++++++-------------- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild index 3705130f557..95e04bf7986 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop +inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" HOMEPAGE="https://w1.fi/wpa_supplicant/" @@ -18,7 +18,7 @@ else fi SLOT="0" -IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" # CONFIG_PRIVSEP=y does not have sufficient support for the new driver # interface functions used for MACsec, so this combination cannot be used @@ -29,7 +29,9 @@ REQUIRED_USE=" broadcom-sta? ( !fils !mesh !mbo ) " -CDEPEND="dbus? ( sys-apps/dbus ) +DEPEND=" + >=dev-libs/openssl-1.0.2k:0=[bindist=] + dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda @@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus ) sys-libs/ncurses:0= sys-libs/readline:0= ) - !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) " -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-networkmanager ) " +BDEPEND="virtual/pkgconfig" DOC_CONTENTS=" If this is a clean installation of wpa_supplicant, you @@ -134,7 +132,7 @@ src_prepare() { src_configure() { # Toolchain setup - tc-export CC + tc-export CC PKG_CONFIG cp defconfig .config || die @@ -235,7 +233,7 @@ src_configure() { Kconfig_style_config TLS openssl Kconfig_style_config FST - if ! use bindist || use libressl; then + if ! use bindist ; then Kconfig_style_config EAP_PWD if use fils; then Kconfig_style_config FILS @@ -251,8 +249,6 @@ src_configure() { Kconfig_style_config SAE Kconfig_style_config DPP Kconfig_style_config SUITEB192 - fi - if ! use bindist && ! use libressl; then Kconfig_style_config SUITEB fi @@ -452,15 +448,8 @@ pkg_postinst() { fi if use bindist; then - if ! use libressl; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." - ewarn "This is incredibly undesirable" - fi - fi - if use libressl; then - ewarn "Libressl doesn't support SUITEB (part of WPA3)" - ewarn "but it does support SUITEB192 (the upgraded strength version of the same)" - ewarn "You probably don't care. Patches welcome" + ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." + ewarn "This is incredibly undesirable" fi # Mea culpa, feel free to remove that after some time --mgorny. diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index c91b6d2f562..f4d4302d5ee 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop +inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" HOMEPAGE="https://w1.fi/wpa_supplicant/" @@ -18,7 +18,7 @@ else fi SLOT="0" -IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" # CONFIG_PRIVSEP=y does not have sufficient support for the new driver # interface functions used for MACsec, so this combination cannot be used @@ -29,7 +29,9 @@ REQUIRED_USE=" broadcom-sta? ( !fils !mesh !mbo ) " -CDEPEND="dbus? ( sys-apps/dbus ) +DEPEND=" + >=dev-libs/openssl-1.0.2k:0=[bindist=] + dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda @@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus ) sys-libs/ncurses:0= sys-libs/readline:0= ) - !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) " -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-networkmanager ) " +BDEPEND="virtual/pkgconfig" DOC_CONTENTS=" If this is a clean installation of wpa_supplicant, you @@ -131,7 +129,7 @@ src_prepare() { src_configure() { # Toolchain setup - tc-export CC + tc-export CC PKG_CONFIG cp defconfig .config || die @@ -232,7 +230,7 @@ src_configure() { Kconfig_style_config TLS openssl Kconfig_style_config FST - if ! use bindist || use libressl; then + if ! use bindist ; then Kconfig_style_config EAP_PWD if use fils; then Kconfig_style_config FILS @@ -248,8 +246,6 @@ src_configure() { Kconfig_style_config SAE Kconfig_style_config DPP Kconfig_style_config SUITEB192 - fi - if ! use bindist && ! use libressl; then Kconfig_style_config SUITEB fi @@ -449,15 +445,8 @@ pkg_postinst() { fi if use bindist; then - if ! use libressl; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." - ewarn "This is incredibly undesirable" - fi - fi - if use libressl; then - ewarn "Libressl doesn't support SUITEB (part of WPA3)" - ewarn "but it does support SUITEB192 (the upgraded strength version of the same)" - ewarn "You probably don't care. Patches welcome" + ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." + ewarn "This is incredibly undesirable" fi # Mea culpa, feel free to remove that after some time --mgorny.