Accepting request 986870 from hardware

OBS-URL: https://build.opensuse.org/request/show/986870
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wpa_supplicant?expand=0&rev=92

Revert-DBus-Add-sae-to-interface-key_mgmt-capabilities.patch

@@ -1,34 +0,0 @@
-From 7a9c36722511ce4df88b76cceceb241d6c6a151e Mon Sep 17 00:00:00 2001
-From: Brian Norris <briannorris@chromium.org>
-Date: Fri, 28 Feb 2020 15:50:47 -0800
-Subject: [PATCH] DBus: Add "sae" to interface key_mgmt capabilities
-
-This will be present when the driver supports SAE and it's included in
-the wpa_supplicant build.
-
-Signed-off-by: Brian Norris <briannorris@chromium.org>
----
- doc/dbus.doxygen                        | 2 +-
- wpa_supplicant/dbus/dbus_new_handlers.c | 6 ------
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git b/wpa_supplicant/dbus/dbus_new_handlers.c a/wpa_supplicant/dbus/dbus_new_handlers.c
-index c842c50e9..55c5dbc99 100644
---- b/wpa_supplicant/dbus/dbus_new_handlers.c
-+++ a/wpa_supplicant/dbus/dbus_new_handlers.c
-@@ -2798,12 +2798,6 @@ dbus_bool_t wpas_dbus_getter_capabilities(
- 			goto nomem;
- #endif /* CONFIG_WPS */
- 
--#ifdef CONFIG_SAE
--		if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_SAE) &&
--		    !wpa_dbus_dict_string_array_add_element(&iter_array, "sae"))
--			goto nomem;
--#endif /* CONFIG_SAE */
--
- #ifdef CONFIG_OWE
- 		if ((capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_OWE) &&
- 		    !wpa_dbus_dict_string_array_add_element(&iter_array, "owe"))
--- 
-2.34.1
-

dbus-Fix-property-DebugShowKeys-and-DebugTimestamp.patch

@@ -0,0 +1,46 @@
+From 903f0848ce7d67c99eb5a2569aa5c31bcd7adbc1 Mon Sep 17 00:00:00 2001
+From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
+Date: Tue, 5 Jul 2022 13:04:52 +0200
+Subject: [PATCH] dbus: Fix property DebugShowKeys and DebugTimestamp
+
+It is possible to specify -t or -K multiple times. With this the
+value isn't boolean anymore and we hit a assert in libdbus
+function `dbus_message_iter_append_basic()`, which expect 0 or 1
+for DBUS_TYPE_BOOLEAN.
+
+Signed-off-by: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
+---
+ wpa_supplicant/dbus/dbus_new_handlers.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
+index 0b1002bf1..de82930e8 100644
+--- a/wpa_supplicant/dbus/dbus_new_handlers.c
++++ b/wpa_supplicant/dbus/dbus_new_handlers.c
+@@ -908,8 +908,10 @@ dbus_bool_t wpas_dbus_getter_debug_timestamp(
+ 	const struct wpa_dbus_property_desc *property_desc,
+ 	DBusMessageIter *iter, DBusError *error, void *user_data)
+ {
++	dbus_bool_t b = wpa_debug_timestamp ? TRUE : FALSE;
++
+ 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
+-						&wpa_debug_timestamp, error);
++						&b, error);
+ 
+ }
+ 
+@@ -927,8 +929,10 @@ dbus_bool_t wpas_dbus_getter_debug_show_keys(
+ 	const struct wpa_dbus_property_desc *property_desc,
+ 	DBusMessageIter *iter, DBusError *error, void *user_data)
+ {
++	dbus_bool_t b = wpa_debug_timestamp ? TRUE : FALSE;
++
+ 	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BOOLEAN,
+-						&wpa_debug_show_keys, error);
++						&b, error);
+ 
+ }
+ 
+-- 
+2.35.3
+

wpa_supplicant.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Jul  5 11:29:50 UTC 2022 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Add dbus-Fix-property-DebugShowKeys-and-DebugTimestamp.patch
+  (bsc#1201219)
+
+-------------------------------------------------------------------
+Tue Jun 21 07:29:22 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Moved logrotate files from user specific directory /etc/logrotate.d
+  to vendor specific directory /usr/etc/logrotate.d.
+
+-------------------------------------------------------------------
+Mon Jun 20 09:22:26 UTC 2022 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Remove Revert-DBus-Add-sae-to-interface-key_mgmt-capabilities.patch
+  Fixed in NetworkManager (glfo#NetworkManager/NetworkManager#a0988868). 
+  Wifi cards, wich do not support PMF/BIP ciphers, should not use 
+  SAE as key management. (bsc#1195312)
+
+-------------------------------------------------------------------
+Wed Jun  8 14:18:27 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Move the dbus-1 system.d file to /usr (bsc#1200342)
+
 -------------------------------------------------------------------
 Sat Feb  5 09:28:52 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
 

wpa_supplicant.spec

@@ -38,7 +38,7 @@ Patch1:         wpa_supplicant-flush-debug-output.patch
 Patch2:         wpa_supplicant-sigusr1-changes-debuglevel.patch
 Patch3:         wpa_supplicant-alloc_size.patch
 Patch5:         wpa_supplicant-dump-certificate-as-PEM-in-debug-mode.diff
-Patch7:         Revert-DBus-Add-sae-to-interface-key_mgmt-capabilities.patch
+Patch6:         dbus-Fix-property-DebugShowKeys-and-DebugTimestamp.patch
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
 BuildRequires:  systemd-rpm-macros
@@ -83,15 +83,20 @@ install -m 0755 wpa_supplicant/wpa_cli %{buildroot}%{_sbindir}
 install -m 0755 wpa_supplicant/wpa_passphrase %{buildroot}%{_sbindir}
 install -m 0755 wpa_supplicant/wpa_supplicant %{buildroot}%{_sbindir}
 install -m 0755 wpa_supplicant/eapol_test %{buildroot}%{_sbindir}
-install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d
+install -d %{buildroot}%{_datadir}/dbus-1/system.d
-install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install -m 0644 wpa_supplicant/dbus/dbus-wpa_supplicant.conf %{buildroot}%{_datadir}/dbus-1/system.d/wpa_supplicant.conf
 install -d %{buildroot}/%{_sysconfdir}/%{name}
 install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
 install -d %{buildroot}/%{_datadir}/dbus-1/system-services
 install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services
 install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/dbus-1/system-services
+%if 0%{?suse_version} > 1500
+install -d %{buildroot}/%{_distconfdir}/logrotate.d/
+install -m 644 %{SOURCE4} %{buildroot}/%{_distconfdir}/logrotate.d/wpa_supplicant
+%else
 install -d %{buildroot}/%{_sysconfdir}/logrotate.d/
 install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/wpa_supplicant
+%endif
 install -d %{buildroot}/%{_rundir}/%{name}
 install -d %{buildroot}%{_mandir}/man{5,8}
 install -m 0644 wpa_supplicant/doc/docbook/*.8 %{buildroot}%{_mandir}/man8
@@ -129,10 +134,14 @@ ln -s wpa_supplicant.service %{buildroot}%{_unitdir}/dbus-fi.w1.wpa_supplicant1.
 %{_sbindir}/wpa_cli
 %{_sbindir}/wpa_passphrase
 %{_sbindir}/wpa_supplicant
-%config %{_sysconfdir}/dbus-1/system.d/%{name}.conf
+%{_datadir}/dbus-1/system.d/%{name}.conf
 %{_datadir}/dbus-1/system-services
 %config %{_sysconfdir}/%{name}/%{name}.conf
+%if 0%{?suse_version} > 1500
+%{_distconfdir}/logrotate.d/wpa_supplicant
+%else
 %config(noreplace) %{_sysconfdir}/logrotate.d/wpa_supplicant
+%endif
 %dir %{_rundir}/%{name}
 %ghost %{_rundir}/%{name}
 %{_unitdir}/wpa_supplicant.service