3 changed files with 39 additions and 93 deletions
--- a/SOURCES/wpa_supplicant-P2P-Remove-pending-p2p-listen-radio-work-on-stopping.patch
+++ b/SOURCES/wpa_supplicant-P2P-Remove-pending-p2p-listen-radio-work-on-stopping.patch
@ -1,42 +0,0 @@
-From 3242793cb8df65122a11d1a90914c308c936c52f Mon Sep 17 00:00:00 2001
-Message-ID: <3242793cb8df65122a11d1a90914c308c936c52f.1718814356.git.davide.caratti@gmail.com>
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 28 Oct 2023 17:23:25 +0300
-Subject: [PATCH] P2P: Remove pending p2p-listen radio work on stopping listen
-
-Some kind of race condition seemed to be hit at least in test sequence
-"p2p_ext_vendor_elem_invitation pasn_comeback_after_0_sae" where the P2P
-invitation response could have been received just after having scheduled
-a new p2p-listen radio work, but before that work had been started. In
-the case of accepted invitation, this could result in unnecessary extra
-delay when that p2p-listen work ended up getting started at the exact
-time that the local device was starting GO.
-
-Avoid this race condition by removing the pending p2p-listen radio work
-when P2P listen is stopped.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
---
- wpa_supplicant/p2p_supplicant.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
-index e60beda72..de597cbb0 100644
--- a/wpa_supplicant/p2p_supplicant.c
-+++ b/wpa_supplicant/p2p_supplicant.c
-@@ -2796,6 +2796,12 @@ static void wpas_stop_listen(void *ctx)
- 		wpa_drv_probe_req_report(wpa_s, 0);
- 
- 	wpas_p2p_listen_work_done(wpa_s);
-+
-+	if (radio_work_pending(wpa_s, "p2p-listen")) {
-+		wpa_printf(MSG_DEBUG,
-+			   "P2P: p2p-listen is still pending - remove it");
-+		radio_remove_works(wpa_s, "p2p-listen", 0);
-+	}
- }
- 
- 
-- 
-2.45.1
-
--- a/SOURCES/wpa_supplicant-config.patch
+++ b/SOURCES/wpa_supplicant-config.patch
@ -62,11 +62,10 @@ Subject: [PATCH] defconfig: Fedora configuration
 
 # Device Provisioning Protocol (DPP) (also known as Wi-Fi Easy Connect)
 CONFIG_DPP=y
-@@ -633,3 +634,7 @@ CONFIG_DPP2=y
+@@ -633,3 +634,6 @@ CONFIG_DPP2=y
 # design is still subject to change. As such, this should not yet be enabled in
 # production use.
 #CONFIG_PASN=y
 +#
 +CONFIG_SUITEB192=y
-+CONFIG_IPV6=y
 +
--- a/SPECS/wpa_supplicant.spec
+++ b/SPECS/wpa_supplicant.spec
@ -9,25 +9,25 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 2.10
-Release: 11%{?dist}
-License: BSD-3-Clause
+Release: 5%{?dist}
+License: BSD
 Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz
 Source1: wpa_supplicant.conf
 Source2: wpa_supplicant.service
 Source3: wpa_supplicant.sysconfig
 Source4: wpa_supplicant.logrotate

-# Distro specific customization and not suitable for upstream,
+# distro specific customization and not suitable for upstream,
 # Fedora-specific updates to defconfig
 Patch0: wpa_supplicant-config.patch
-# Works around busted drivers
+# works around busted drivers
 Patch1: wpa_supplicant-assoc-timeout.patch
-# Ensures that debug output gets flushed immediately to help diagnose driver
+# ensures that debug output gets flushed immediately to help diagnose driver
 # bugs, not suitable for upstream
 Patch2: wpa_supplicant-flush-debug-output.patch
-# Quiet an annoying and frequent syslog message
+# quiet an annoying and frequent syslog message
 Patch3: wpa_supplicant-quiet-scan-results-message.patch
-# Distro specific customization for Qt4 build tools, not suitable for upstream
+# distro specific customization for Qt4 build tools, not suitable for upstream
 Patch4: wpa_supplicant-gui-qt4.patch
 # backport fix for bz2063730
 Patch5: 0001-D-Bus-Add-wep_disabled-capability.patch
@ -39,10 +39,9 @@ Patch8: wpa_supplicant-MACsec-Support-GCM-AES-256-cipher-suite.patch
 Patch9: wpa_supplicant-macsec_linux-Support-cipher-suite-configuration.patch
 Patch10: wpa_supplicant-mka-Allow-configuration-of-MACsec-hardware-offload.patch
 Patch11: wpa_supplicant-macsec_linux-Add-support-for-MACsec-hardware-offload.patch
+
 # fix PEAP client to require successful Phase2 authentication when needed (CVE-2023-52160)
 Patch12: wpa_supplicant-PEAP-client-Update-Phase-2-authentication-requiremen.patch
-# backport P2P bugfix causing nmci failures
-Patch13: wpa_supplicant-P2P-Remove-pending-p2p-listen-radio-work-on-stopping.patch

 URL: http://w1.fi/wpa_supplicant/

@ -92,8 +91,8 @@ Graphical User Interface for wpa_supplicant written using QT
 %build
 pushd wpa_supplicant
  cp defconfig .config
-  export CFLAGS="${CFLAGS:-%optflags} -fPIE -DPIE -DOPENSSL_NO_ENGINE"
-  export CXXFLAGS="${CXXFLAGS:-%optflags} -fPIE -DOPENSSL_NO_ENGINE"
+  export CFLAGS="${CFLAGS:-%optflags} -fPIE -DPIE"
+  export CXXFLAGS="${CXXFLAGS:-%optflags} -fPIE -DPIE"
  export LDFLAGS="${LDFLAGS:-%optflags} -pie -Wl,-z,now"
  # yes, BINDIR=_sbindir
  export BINDIR="%{_sbindir}"
@ -203,54 +202,44 @@ chmod -R 0644 wpa_supplicant/examples/*.py


 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:2.10-11
- Bump release for June 2024 mass rebuild
-
-* Fri Jun 21 2024 Davide Caratti <dcaratti@redhat.com> - 1:2.10-10
- Fix package configuration/add missing patches to avoid regressions when
-  upgrading from rhel-9 (RHEL-43250)
- Backport P2P fixc causing nmci failures (RHEL-17701)
- Disable OpenSSL ENGINE API (RHEL-33750)
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 30 2023 Davide Cavalca <dcavalca@fedoraproject.org> - 1:2.10-8
- Backport WPA3 support for Broadcom devices. Fixes: rhbz#2226569
- Enable parsing of IPv6 addresses in RADIUS configuration (#2095296)
+* Thu Feb 22 2024 Davide Caratti <dcaratti@redhat.com> - 1:2.10-5
+- Support macsec HW offload.
+  Resolves: RHEL-22440
+- Backport fix for PEAP client (CVE-2023-52160)

-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+* Fri May 13 2022 Davide Caratti <dcaratti@redhat.com> - 1:2.10-4
+- Explicitly allow/disallow unsafe legacy renegotiation on configuration base.
+  Resolves: rhbz#2077973

-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+* Fri Apr 22 2022 Davide Caratti <dcaratti@redhat.com> - 1:2.10-3
+- Expose 'wep_disabled' capability via D-Bus. Resolves: rhbz#2063730

-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Fri Feb  4 2022 Davide Caratti <dcaratti@redhat.com> - 1:2.10-2
+- Disable CONFIG_IEEE80211R. Resolves: rhbz#2032539

-* Mon May 02 2022 Adam Williamson <awilliam@redhat.com> - 1:2.10-4
- Allow legacy renegotiation for bad PEAP servers (James Ralston) (#2072070)
+* Thu Jan 20 2022 Davide Caratti <dcaratti@redhat.com> - 1:2.10-1
+- Update to version 2.10. Resolves: rhbz#2042540

-* Wed Jan 26 2022 Michael Yartys <michael.yartys@protonmail.com> - 1:2.10-3
- Enable Operating Channel Validation (OCV) support
+* Mon Nov 22 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.9-17.20211112gitc8b94bc7b347
+- Update to latest upstream tree to include support for H2E
+  Resolves: rhbz#2007334

-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 17 2022 Davide Caratti <dcaratti@redhat.com> - 1:2.10-1
- Update to version 2.10 (keeping CONFIG_WEP enabled). Related: rhbz#2041269
+* Thu Aug 19 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.9-17
+- Fix NetworkManager-CI failures with OpenSSL 3.0

-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1:2.9-16
- Rebuilt with OpenSSL 3.0.0
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.9-16
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Fri Sep  3 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.9-15
- Fix NetworkManager-CI failures with OpenSSL 3.0
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.9-15
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065

-* Tue Jul 27 2021 Dave Olsthoorn <dave@bewaar.me> - 1:2.9-14
- Fix issues with FT a.k.a. 802.11r when not supported by adapter
+* Thu Jun  3 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.9-14
+- Disable 'badfuncs' test in rpminspect. Related: rhbz#1967579

-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.9-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.9-13
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Mon Mar  1 2021 Davide Caratti <dcaratti@redhat.com> - 1:2.9-12
 - Fix a corner case in peer addition based on PD Request (CVE-2021-27803)