Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wpa_supplicant: fix wpa_dbus_property_changed
@ 2021-07-07 13:04 meator
  2021-07-20 19:22 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 1 reply; 2+ messages in thread
From: meator @ 2021-07-07 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]

There is a new pull request by meator against master on the void-packages repository

https://github.com/meator/void-packages wpa_supplicant
https://github.com/void-linux/void-packages/pull/31842

wpa_supplicant: fix wpa_dbus_property_changed
The current version of wpa_supplicant emits following error message on shutdown:

    dbus: wpa_dbus_property_changed: no property SessionLength in object /fi/w1/wpa_supplicant1/Interfaces/0
This pull reqest adds a patch [stolen from Archlinux](https://github.com/archlinux/svntogit-packages/commit/73ce2847aec510861a041ac369054a9aed5c3406) that fixes the issue.
@Gottox

---
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/31842.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wpa_supplicant-31842.patch --]
[-- Type: text/x-diff, Size: 3958 bytes --]

From ac0f612aa290c5c551d471b6058755f27581e118 Mon Sep 17 00:00:00 2001
From: meator <coder64@protonmail.com>
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 <matthewmwang@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@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
+
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 <gottox@voidlinux.org>"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: wpa_supplicant: fix wpa_dbus_property_changed
  2021-07-07 13:04 [PR PATCH] wpa_supplicant: fix wpa_dbus_property_changed meator
@ 2021-07-20 19:22 ` ericonr
  0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-07-20 19:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1828 bytes --]

There's a merged pull request on the void-packages repository

wpa_supplicant: fix wpa_dbus_property_changed
https://github.com/void-linux/void-packages/pull/31842

Description:
The current version of wpa_supplicant emits following error message on shutdown:

    dbus: wpa_dbus_property_changed: no property SessionLength in object /fi/w1/wpa_supplicant1/Interfaces/0
This pull reqest adds a patch [stolen from Archlinux](https://github.com/archlinux/svntogit-packages/commit/73ce2847aec510861a041ac369054a9aed5c3406) that fixes the issue.
@Gottox

---
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-20 19:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-07 13:04 [PR PATCH] wpa_supplicant: fix wpa_dbus_property_changed meator
2021-07-20 19:22 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).