[arch-commits] Commit in wpa_supplicant/trunk (PKGBUILD config roam-properties.patch)

[Jan Steffens]

    Date: Friday, February 21, 2020 @ 00:30:06
  Author: heftig
Revision: 375978

2.9-6: FS#65482 fix dbus errors, FS#65470 enable WNM

Added:
  wpa_supplicant/trunk/roam-properties.patch
Modified:
  wpa_supplicant/trunk/PKGBUILD
  wpa_supplicant/trunk/config

-----------------------+
 PKGBUILD              |   18 ++++++---
 config                |    1 
 roam-properties.patch |   88 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-21 00:04:19 UTC (rev 375977)
+++ PKGBUILD	2020-02-21 00:30:06 UTC (rev 375978)
@@ -3,7 +3,7 @@
 
 pkgname=wpa_supplicant
 pkgver=2.9
-pkgrel=5
+pkgrel=6
 epoch=2
 pkgdesc='A utility providing key negotiation for WPA wireless networks'
 url='http://hostap.epitest.fi/wpa_supplicant'
@@ -11,11 +11,14 @@
 license=(GPL)
 depends=(openssl libdbus readline libnl)
 install=wpa_supplicant.install
-source=(https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc}
-        CVE-2019-16275.patch
-        tls.patch     # More permissive TLS fallback
-        systemd.patch # Unit improvements from Ubuntu
-        config)
+source=(
+  https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc}
+  CVE-2019-16275.patch
+  tls.patch             # More permissive TLS fallback
+  systemd.patch         # Unit improvements from Ubuntu
+  roam-properties.patch # https://bugs.archlinux.org/task/65482
+  config
+)
 validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen
 sha256sums=('fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17'
             'SKIP'
@@ -22,7 +25,8 @@
             'bf91a135e717265969f1ab0319297c9d2e6f695928a17e3b3fa5accc8ef7b297'
             '449c7dad67b246b5b93e796f57c2f90c5c32cfc5b16f7aa4f17802dc260d3414'
             'dd14f99618bb4db40eadfaf4ced29d6139ccf319429a1eef54c2c08c80924742'
-            '6f71a04875465178992e78216603d3c4735ee717a31738a6e30702c7a81c6c4e')
+            '1ad3b61397c4a1dbafbf89059bccdda07cfe7eaff9f23ee25bed7bdd82c2bd87'
+            '176a863a8f9c784b109b69db14cb0eeb1fbe4a62e6583cd65e6855067803f443')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"

Modified: config
===================================================================
--- config	2020-02-21 00:04:19 UTC (rev 375977)
+++ config	2020-02-21 00:30:06 UTC (rev 375978)
@@ -74,6 +74,7 @@
 CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT at SECLEVEL=1"
 CONFIG_VHT_OVERRIDES=y
 CONFIG_WIFI_DISPLAY=y
+CONFIG_WNM=y
 CONFIG_WPS=y
 CONFIG_WPS_ER=y
 CONFIG_WPS_NFC=y

Added: roam-properties.patch
===================================================================
--- roam-properties.patch	                        (rev 0)
+++ roam-properties.patch	2020-02-21 00:30:06 UTC (rev 375978)
@@ -0,0 +1,88 @@
+From 23d87687c2428f3b94865580b0d33e05c03e6756 Mon Sep 17 00:00:00 2001
+From: Matthew Wang <matthewmwang at chromium.org>
+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 <matthewmwang at chromium.org>
+---
+ 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
+