public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/
Date: Fri,  3 Dec 2021 04:26:29 +0000 (UTC)	[thread overview]
Message-ID: <1638505578.f448b05c0c596479972d0fed25847fabd277f26b.sam@gentoo> (raw)

commit:     f448b05c0c596479972d0fed25847fabd277f26b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 04:06:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 04:26:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f448b05c

net-wireless/wpa_supplicant: drop OpenSSL bindist kludge

Not needed anymore now that (stable) OpenSSL now lacks USE=bindist;
see news item for more information.

Originally added in fed37693d6442a4ec65e121c80ad2f52b6d93335, the
changes were/are just to allow building wpa_supplicant against
openssl[bindist] rather than anything shipped within wpa_supplicant
that might have patent issues, etc.

Bug: https://bugs.gentoo.org/762850
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-2.9-r6.ebuild => wpa_supplicant-2.9-r7.ebuild} | 40 ++++++++----------
 .../wpa_supplicant/wpa_supplicant-9999.ebuild      | 49 ++++++++++++----------
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
similarity index 94%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
index 5e770398c338..2935a7227ab1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist +crda 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"
+IUSE="ap +crda 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
@@ -264,24 +264,23 @@ src_configure() {
 
 	Kconfig_style_config TLS openssl
 	Kconfig_style_config FST
-	if ! use bindist ; then
-		Kconfig_style_config EAP_PWD
-		if use fils; then
-			Kconfig_style_config FILS
-			Kconfig_style_config FILS_SK_PFS
-		fi
-		if use mesh; then
-			Kconfig_style_config MESH
-		else
-			Kconfig_style_config MESH n
-		fi
-		#WPA3
-		Kconfig_style_config OWE
-		Kconfig_style_config SAE
-		Kconfig_style_config DPP
-		Kconfig_style_config SUITEB192
-		Kconfig_style_config SUITEB
+
+	Kconfig_style_config EAP_PWD
+	if use fils; then
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
 	fi
+	if use mesh; then
+		Kconfig_style_config MESH
+	else
+		Kconfig_style_config MESH n
+	fi
+	# WPA3
+	Kconfig_style_config OWE
+	Kconfig_style_config SAE
+	Kconfig_style_config DPP
+	Kconfig_style_config SUITEB192
+	Kconfig_style_config SUITEB
 
 	if use smartcard ; then
 		Kconfig_style_config SMARTCARD
@@ -478,11 +477,6 @@ pkg_postinst() {
 		ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
 	fi
 
-	if use bindist; then
-		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.
 	local fn
 	for fn in wpa_supplicant{,@wlan0}.service; do

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index 0420a22e8dc9..2935a7227ab1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -15,10 +15,11 @@ if [ "${PV}" = "9999" ]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2"
 fi
 
 SLOT="0"
-IUSE="ap bindist +crda 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"
+IUSE="ap +crda 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
@@ -150,6 +151,14 @@ src_prepare() {
 
 	# bug (640492)
 	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+
+	## Security patches
+	# CVE-2019-16275 (bug #696030)
+	eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	# 2020-2, 2021-1 security advisories (bug #768759)
+	eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch
+	# CVE-2021-30004 (bug #780138)
+	eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch
 }
 
 src_configure() {
@@ -255,24 +264,23 @@ src_configure() {
 
 	Kconfig_style_config TLS openssl
 	Kconfig_style_config FST
-	if ! use bindist ; then
-		Kconfig_style_config EAP_PWD
-		if use fils; then
-			Kconfig_style_config FILS
-			Kconfig_style_config FILS_SK_PFS
-		fi
-		if use mesh; then
-			Kconfig_style_config MESH
-		else
-			Kconfig_style_config MESH n
-		fi
-		#WPA3
-		Kconfig_style_config OWE
-		Kconfig_style_config SAE
-		Kconfig_style_config DPP
-		Kconfig_style_config SUITEB192
-		Kconfig_style_config SUITEB
+
+	Kconfig_style_config EAP_PWD
+	if use fils; then
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
 	fi
+	if use mesh; then
+		Kconfig_style_config MESH
+	else
+		Kconfig_style_config MESH n
+	fi
+	# WPA3
+	Kconfig_style_config OWE
+	Kconfig_style_config SAE
+	Kconfig_style_config DPP
+	Kconfig_style_config SUITEB192
+	Kconfig_style_config SUITEB
 
 	if use smartcard ; then
 		Kconfig_style_config SMARTCARD
@@ -469,11 +477,6 @@ pkg_postinst() {
 		ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
 	fi
 
-	if use bindist; then
-		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.
 	local fn
 	for fn in wpa_supplicant{,@wlan0}.service; do


             reply	other threads:[~2021-12-03  4:26 UTC|newest]

Thread overview: 147+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03  4:26 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-01 11:51 [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/ Sam James
2024-10-04 17:37 Andreas Sturmlechner
2024-09-28 13:56 Arthur Zamarin
2024-09-28 10:51 Arthur Zamarin
2024-09-26 10:36 Jakov Smolić
2024-09-26 10:36 Jakov Smolić
2024-09-26 10:36 Jakov Smolić
2024-09-26  8:26 Arthur Zamarin
2024-08-08 16:04 Mike Gilbert
2024-05-08  1:26 Mike Gilbert
2024-03-09 21:24 Sam James
2024-03-09 21:24 Sam James
2024-01-21  9:42 David Seifert
2023-09-22 17:31 Sam James
2023-09-19  9:47 Sam James
2023-09-19  9:37 Sam James
2023-09-19  9:37 Sam James
2023-09-19  9:30 Sam James
2023-08-19 17:55 Rick Farina
2023-08-19 17:29 Rick Farina
2022-09-02 17:41 Rick Farina
2022-08-26 16:32 Rick Farina
2022-08-25 21:34 Rick Farina
2022-05-05 23:48 WANG Xuerui
2022-05-05 23:48 WANG Xuerui
2022-03-17  2:15 Rick Farina
2022-03-17  2:15 Rick Farina
2022-03-17  2:15 Rick Farina
2022-03-12 15:48 Arthur Zamarin
2022-03-12 10:37 Arthur Zamarin
2022-03-06  8:54 Agostino Sarubbo
2022-03-06  8:51 Agostino Sarubbo
2022-03-06  8:50 Agostino Sarubbo
2022-03-06  8:05 Sam James
2022-03-02  3:26 Sam James
2022-01-17  2:20 Sam James
2022-01-04 10:30 David Seifert
2022-01-04  3:29 Sam James
2021-12-16  0:09 Sam James
2021-12-03  4:39 Sam James
2021-11-21 13:38 Sam James
2021-11-21 12:32 Sam James
2021-11-21 12:31 Sam James
2021-07-24 23:02 Marek Szuba
2021-06-23 14:23 Sam James
2021-06-22 19:45 Sam James
2021-06-21  6:19 Agostino Sarubbo
2021-06-21  6:18 Agostino Sarubbo
2021-06-19 23:51 Sam James
2021-06-17 22:18 Thomas Deutschmann
2021-06-17 20:32 Thomas Deutschmann
2021-06-17 20:23 Sam James
2021-06-08  5:41 Sam James
2021-04-02 19:29 Rick Farina
2020-02-18 14:49 Rick Farina
2020-02-18  1:42 Rick Farina
2020-02-14 21:08 Rick Farina
2020-02-14 21:08 Rick Farina
2020-02-13 18:55 Rick Farina
2020-01-10 20:44 Rick Farina
2019-11-25 20:08 Rick Farina
2019-11-25 18:03 Aaron Bauman
2019-11-25 16:24 Rick Farina
2019-11-22  9:39 Mikle Kolyada
2019-11-12 18:07 Agostino Sarubbo
2019-11-12 10:38 Agostino Sarubbo
2019-11-04 16:35 Rick Farina
2019-09-01 18:05 Mikle Kolyada
2019-08-18 21:51 Agostino Sarubbo
2019-08-17 20:41 Sergei Trofimovich
2019-08-17 20:33 Sergei Trofimovich
2019-08-16 22:38 Thomas Deutschmann
2019-08-16 18:47 Aaron Bauman
2019-08-16 15:56 Rick Farina
2019-06-11  1:18 Rick Farina
2019-06-11  1:18 Rick Farina
2019-06-07 19:54 Rick Farina
2019-06-07 19:54 Rick Farina
2019-06-07 19:48 Rick Farina
2019-05-23  6:39 Aaron Bauman
2019-05-19  0:59 Rick Farina
2019-04-24  3:15 Rick Farina
2019-04-24  2:39 Rick Farina
2019-03-25 19:26 Rick Farina
2019-03-22 19:55 Rick Farina
2019-03-22 19:55 Rick Farina
2019-03-22 19:39 Rick Farina
2019-03-22 19:39 Rick Farina
2019-03-21 23:06 Rick Farina
2018-12-08 12:11 Mikle Kolyada
2018-12-07 23:27 Matt Turner
2018-12-07 23:27 Matt Turner
2018-12-07 12:31 Mikle Kolyada
2018-12-07  2:41 Thomas Deutschmann
2018-12-05 22:08 Rick Farina
2018-12-05 20:47 Rick Farina
2018-12-04  1:40 Rick Farina
2018-08-05 16:04 Richard Farina
2018-06-09 19:22 Sergei Trofimovich
2018-05-20 14:42 Sergei Trofimovich
2018-05-18 20:07 Richard Farina
2018-05-17  2:50 Richard Farina
2018-04-23 21:46 Mikle Kolyada
2018-04-23 16:31 Richard Farina
2018-04-22  1:35 Thomas Deutschmann
2018-04-19 19:29 Aaron Bauman
2018-04-16 20:37 Richard Farina
2018-04-16 20:37 Richard Farina
2018-03-13 11:59 Pacho Ramos
2018-01-06 19:51 Lars Wendler
2017-12-17  1:45 Craig Andrews
2017-12-08 17:11 Richard Farina
2017-12-08 17:11 Richard Farina
2017-12-03 10:39 Pacho Ramos
2017-10-28 21:06 Andreas Sturmlechner
2017-10-26 20:54 Richard Farina
2017-10-24 17:38 Markus Meier
2017-10-21 10:46 Sergei Trofimovich
2017-10-16 14:46 Richard Farina
2017-10-16 14:07 Richard Farina
2017-09-03  1:46 Mike Gilbert
2017-08-01 15:47 Richard Farina
2017-06-20  5:17 Agostino Sarubbo
2017-06-19 17:03 Agostino Sarubbo
2017-04-10 16:00 Patrice Clement
2017-02-02  7:32 Aaron Bauman
2016-12-04  0:54 Patrice Clement
2016-12-04  0:54 Patrice Clement
2016-10-18 19:48 Markus Meier
2016-10-07  9:01 Agostino Sarubbo
2016-10-07  8:59 Agostino Sarubbo
2016-10-06  5:20 Jeroen Roovers
2016-09-19 13:17 Lars Wendler
2016-08-14 19:29 Markus Meier
2016-03-17 10:50 Agostino Sarubbo
2016-03-16 11:51 Agostino Sarubbo
2016-03-15 21:13 Bjarke Istrup Pedersen
2016-03-15 16:39 Agostino Sarubbo
2016-03-15 11:08 Agostino Sarubbo
2016-02-14 10:11 Agostino Sarubbo
2016-02-13 15:33 Agostino Sarubbo
2016-02-10 20:47 Markus Meier
2015-12-22 15:30 Richard Farina
2015-12-22 15:15 Richard Farina
2015-11-14 13:30 Bjarke Istrup Pedersen
2015-10-07 20:10 Jason Donenfeld

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1638505578.f448b05c0c596479972d0fed25847fabd277f26b.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox