From ac0f612aa290c5c551d471b6058755f27581e118 Mon Sep 17 00:00:00 2001 From: meator Date: Wed, 7 Jul 2021 13:25:47 +0200 Subject: [PATCH] wpa_supplicant: fix wpa_dbus_property_changed This commit fixes problems described in https://bugs.archlinux.org/task/65482. This patch is taken from https://github.com/archlinux/svntogit-packages/commit/73ce2847aec510861a041ac369054a9aed5c3406. --- .../patches/roam-properties.patch | 88 +++++++++++++++++++ srcpkgs/wpa_supplicant/template | 2 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wpa_supplicant/patches/roam-properties.patch diff --git a/srcpkgs/wpa_supplicant/patches/roam-properties.patch b/srcpkgs/wpa_supplicant/patches/roam-properties.patch new file mode 100644 index 000000000000..30cd2efbdc26 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/roam-properties.patch @@ -0,0 +1,88 @@ +From 23d87687c2428f3b94865580b0d33e05c03e6756 Mon Sep 17 00:00:00 2001 +From: Matthew Wang +Date: Fri, 11 Oct 2019 13:49:25 -0700 +Subject: dbus: Move roam metrics to the correct interface + +These properties were in the wpas_dbus_bss_properties array when they +should have been in the wpas_dbus_interface_properties array. Move them +to the right place. This is the logical location for these properties +and it matches both the other parts of the implementation (e.g., being +in enum wpas_dbus_prop, not in enum wpas_dbus_bss_prop) and what +was originally documented for the interface in dbus.doxygen. + +Fixes: 2bbad1c7c9cb ("dbus: Export roam time, roam complete, and session length") +Fixes: 80d06d0ca9f3 ("dbus: Export BSS Transition Management status") +Signed-off-by: Matthew Wang +--- + wpa_supplicant/dbus/dbus_new.c | 48 +++++++++++++++++++++--------------------- + 1 file changed, 24 insertions(+), 24 deletions(-) + +diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c +index 5e6b522..e9e77bd 100644 +--- a/wpa_supplicant/dbus/dbus_new.c ++++ b/wpa_supplicant/dbus/dbus_new.c +@@ -2855,30 +2855,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = { + NULL, + NULL + }, +- { +- "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", +- wpas_dbus_getter_roam_time, +- NULL, +- NULL +- }, +- { +- "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b", +- wpas_dbus_getter_roam_complete, +- NULL, +- NULL +- }, +- { +- "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", +- wpas_dbus_getter_session_length, +- NULL, +- NULL +- }, +- { +- "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", +- wpas_dbus_getter_bss_tm_status, +- NULL, +- NULL +- }, + { NULL, NULL, NULL, NULL, NULL, NULL } + }; + +@@ -3786,6 +3762,30 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { + NULL, + NULL + }, ++ { ++ "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", ++ wpas_dbus_getter_roam_time, ++ NULL, ++ NULL ++ }, ++ { ++ "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b", ++ wpas_dbus_getter_roam_complete, ++ NULL, ++ NULL ++ }, ++ { ++ "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", ++ wpas_dbus_getter_session_length, ++ NULL, ++ NULL ++ }, ++ { ++ "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", ++ wpas_dbus_getter_bss_tm_status, ++ NULL, ++ NULL ++ }, + #ifdef CONFIG_MESH + { "MeshPeers", WPAS_DBUS_NEW_IFACE_MESH, "aay", + wpas_dbus_getter_mesh_peers, +-- +cgit v0.12 + diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index d5f2a277cca8..3b4462f3b0f5 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.9 -revision=5 +revision=6 build_wrksrc="$pkgname" short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Enno Boland "