mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-04 21:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update bluez

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-05-20 15:43:04 -07:00
parent c4f80a9749
commit 4562a07bee
7 changed files with 437 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spec_files/bluez/0001-valve-bluetooth-config.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/main.conf b/src/main.conf
index 2796f155e..f7b032b9f 100644
index d108934a8..ff0e98434 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -60,7 +60,7 @@
@@ -60,14 +60,14 @@
# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
# Devices (MPMD) configurations.
# Possible values: "off", "single", "multiple"
@ -11,7 +11,15 @@ index 2796f155e..f7b032b9f 100644
# Permanently enables the Fast Connectable setting for adapters that
# support it. When enabled other devices can connect faster to us,
@@ -182,8 +182,8 @@
# however the tradeoff is increased power consumptions. This feature
# will fully work only on kernel version 4.1 and newer. Defaults to
# 'false'.
-#FastConnectable = false
+FastConnectable = true
# Default privacy setting.
# Enables use of private address.
@@ -193,8 +193,8 @@
# LE scanning parameters used for passive scanning supporting wake from suspend
# scenarios

32
spec_files/bluez/0014-shared-gatt-Add-env-variable-to-prefer-indication-ov.patch Normal file
View File

@ -0,0 +1,32 @@
From 3cb5de4dc38e1f4e707e49e94f887ba6dceecae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Tue, 6 Feb 2024 11:19:55 +0100
Subject: [PATCH] shared/gatt: Add env variable to prefer indication over
notification
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
GAP/SEC/SEM/BV-56-C, GAP/SEC/SEM/BV-57-C and GAP/SEC/SEM/BV-58-C require
to be able to request indication for a characteristic
---
src/shared/gatt-client.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 6340bcd85..0f07ea7e8 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -1672,7 +1672,9 @@ static bool notify_data_write_ccc(struct notify_data *notify_data, bool enable,
/* Try to enable notifications or indications based on
* whatever the characteristic supports.
*/
- if (properties & BT_GATT_CHRC_PROP_NOTIFY)
+ if ((properties & BT_GATT_CHRC_PROP_INDICATE) && getenv("PREFER_INDICATION"))
+ value = cpu_to_le16(0x0002);
+ else if (properties & BT_GATT_CHRC_PROP_NOTIFY)
value = cpu_to_le16(0x0001);
else if (properties & BT_GATT_CHRC_PROP_INDICATE)
value = cpu_to_le16(0x0002);
--
2.34.1

44
spec_files/bluez/0018-disable-unreliable-vcp-tests.patch Normal file
View File

@ -0,0 +1,44 @@
--- a/unit/test-vcp.c 2024-04-12 14:32:20.876133589 +0000
+++ b/unit/test-vcp.c 2024-04-12 14:32:13.288115887 +0000
@@ -2627,9 +2627,13 @@
define_test("VOCS/SR/SPE/BI-01-C", test_server, NULL,
VOCS_SR_SPE_BI_01_C);
-
+#if 0
+ /* This test won't run properly if the bt_att it allocates
+ happens to have the same value as a previously used att pointer.
+ It's complicated. */
define_test("VOCS/SR/CP/BV-01-C", test_server, NULL,
VOCS_SR_CP_BV_01_C);
+#endif
}
static void test_aics_unit_testcases(void)
@@ -2679,10 +2683,11 @@
/* AICS/SR/SGGIT/CP/BI-04-C - TO-DO Need to give two times input
* from user during test case run
*/
-
+#if 0
+ /* This test doesn't run right either, possibly for similar reasons */
define_test("AICS/SR/CP/BV-01-C", test_server, NULL,
AICS_SR_CP_BV_01_C);
-
+#endif
/* AICS/SR/CP/BV-02-C:
* In function *aics_new(struct gatt_db *db)[src/shared/vcp.c]
* by default state of the 'aics_aud_ip_st->mute' is set to
@@ -2744,9 +2749,11 @@
/* define_test("AICS/SR/CP/BV-05-C", test_server, NULL,
* AICS_SR_CP_BV_05_C);
*/
+#if 0
+ /* This test doesn't run right either, possibly for similar reasons */
define_test("AICS/SR/SPE/BI-01-C", test_server, NULL,
AICS_SR_SPE_BI_01_C);
-
+#endif
}
int main(int argc, char *argv[])

284
spec_files/bluez/0019-plugins-Add-new-plugin-to-manage-wake-policy.patch Normal file
View File

@ -0,0 +1,284 @@
From 745f650bf949d1c5f86fdd85152bdd834c909edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Wed, 24 Apr 2024 15:36:23 +0200
Subject: [PATCH BlueZ 1/2] plugins: Add new plugin to manage wake policy
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
By default all class of devices providing the correct service (HID, HoG)
are allowed to wake up the host.
This plugin allows to choose which class of devices are allowed or not to
do it.
E.g. only the Peripheral class, or more specifically the Peripheral
Joystick and Gamepad devices, could be allowed but not the other type of
devices like e.g. the headsets.
For the first case, all Major classes in /etc/bluetooth/wake-policy.conf
except Peripheral should be uncommented and set to 'false', while for the
second case Peripheral should also be uncommented and set to '01;02'.
---
Makefile.plugins | 4 +
plugins/wake-policy.c | 180 +++++++++++++++++++++++++++++++++++++++
plugins/wake-policy.conf | 21 +++++
src/device.c | 2 +-
src/device.h | 1 +
5 files changed, 207 insertions(+), 1 deletion(-)
create mode 100644 plugins/wake-policy.c
create mode 100644 plugins/wake-policy.conf
diff --git a/Makefile.plugins b/Makefile.plugins
index 4aa2c9c92..fbd4e4155 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -11,6 +11,10 @@ builtin_sources += plugins/autopair.c
builtin_modules += policy
builtin_sources += plugins/policy.c
+builtin_modules += wake_policy
+builtin_sources += plugins/wake-policy.c
+EXTRA_DIST += plugins/wake-policy.conf
+
if ADMIN
builtin_modules += admin
builtin_sources += plugins/admin.c
diff --git a/plugins/wake-policy.c b/plugins/wake-policy.c
new file mode 100644
index 000000000..34e77c615
--- /dev/null
+++ b/plugins/wake-policy.c
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Frédéric Danis <frederic.danis@collabora.com>
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdbool.h>
+
+#include <glib.h>
+
+#include "bluetooth/bluetooth.h"
+
+#include "src/plugin.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/log.h"
+#include "src/textfile.h"
+
+static GKeyFile * key_file;
+
+static gboolean is_allowed_to_wake(const char *major, guint minor)
+{
+ guint *minor_list;
+ gsize length;
+ gboolean allowed = false;
+ GError *gerr = NULL;
+
+ if (!g_key_file_has_key(key_file, "WakeAllowed", major, NULL))
+ return true;
+
+ allowed = g_key_file_get_boolean(key_file, "WakeAllowed", major, &gerr);
+ if (!gerr)
+ return allowed;
+
+ g_error_free(gerr);
+ gerr = NULL;
+
+ minor_list = (guint *)g_key_file_get_integer_list(key_file,
+ "WakeAllowed",
+ major, &length, &gerr);
+ if (gerr) {
+ DBG("Failed to get allowed minor list for %s", major);
+ return false;
+ }
+
+ for (gsize i = 0; i < length; i++) {
+ if (minor_list[i] == minor) {
+ allowed = true;
+ break;
+ }
+ }
+
+ return allowed;
+}
+
+static const struct {
+ uint8_t val;
+ const char *str;
+} major_class_table[] = {
+ { 0x00, "Miscellaneous" },
+ { 0x01, "Computer" },
+ { 0x02, "Phone" },
+ { 0x03, "LAN/Network" },
+ { 0x04, "Audio/Video" },
+ { 0x05, "Peripheral" },
+ { 0x06, "Imaging" },
+ { 0x07, "Wearable" },
+ { 0x08, "Toy" },
+ { 0x09, "Health" },
+ { 0x1f, "Uncategorized" },
+ { }
+};
+
+static gboolean is_class_allowed_to_wake(uint32_t class)
+{
+ uint8_t major = (class & 0x1f00) >> 8;
+ uint8_t minor = (class & 0x00fc) >> 2;
+
+ if ((major >= 0x01 && major <= 0x09) || major == 0x1f)
+ return is_allowed_to_wake(major_class_table[major].str, minor);
+
+ return true;
+}
+
+static void wake_policy_device_resolved(struct btd_adapter *adapter,
+ struct btd_device *device)
+{
+ char *filename;
+ GKeyFile *device_key_file;
+ GError *gerr = NULL;
+
+ if (key_file == NULL)
+ return;
+
+ // Does device support to wake the host?
+ if (!device_get_wake_support(device))
+ return;
+
+ // Check if WakeAllowed has already been stored,
+ // if yes do not change it
+ filename = btd_device_get_storage_path(device, "info");
+ device_key_file = g_key_file_new();
+ if (!g_key_file_load_from_file(device_key_file, filename, 0, &gerr)) {
+ error("Unable to load key file from %s: (%s)", filename,
+ gerr->message);
+ g_clear_error(&gerr);
+ } else {
+ if (g_key_file_has_key(device_key_file, "General",
+ "WakeAllowed", NULL)) {
+ DBG("%s WakeAllowed already stored",
+ device_get_path(device));
+ return;
+ }
+ }
+ g_key_file_free(device_key_file);
+ g_free(filename);
+
+ // Check if Class of Device is allowed to wake up the host
+ if (!is_class_allowed_to_wake(btd_device_get_class(device))) {
+ DBG("%s Force WakeAllowed to false", device_get_path(device));
+ device_set_wake_override(device, false);
+ device_set_wake_allowed(device, false, -1U);
+ }
+}
+
+static int wake_policy_probe(struct btd_adapter *adapter)
+{
+ GError *gerr = NULL;
+
+ DBG("");
+ key_file = g_key_file_new();
+ if (!g_key_file_load_from_file(key_file,
+ CONFIGDIR "/wake-policy.conf",
+ 0,
+ &gerr)) {
+ error("Unable to load key file from %s: (%s)",
+ CONFIGDIR "/wake-policy.conf",
+ gerr->message);
+ g_clear_error(&gerr);
+ g_key_file_free(key_file);
+ key_file = NULL;
+ }
+
+ return 0;
+}
+
+static void wake_policy_remove(struct btd_adapter *adapter)
+{
+ DBG("");
+ if (key_file)
+ g_key_file_free(key_file);
+}
+
+static struct btd_adapter_driver wake_policy_driver = {
+ .name = "wake-policy",
+ .probe = wake_policy_probe,
+ .remove = wake_policy_remove,
+ .device_resolved = wake_policy_device_resolved,
+};
+
+static int wake_policy_init(void)
+{
+ return btd_register_adapter_driver(&wake_policy_driver);
+}
+
+static void wake_policy_exit(void)
+{
+ btd_unregister_adapter_driver(&wake_policy_driver);
+}
+
+BLUETOOTH_PLUGIN_DEFINE(wake_policy, VERSION, BLUETOOTH_PLUGIN_PRIORITY_LOW,
+ wake_policy_init, wake_policy_exit)
diff --git a/plugins/wake-policy.conf b/plugins/wake-policy.conf
new file mode 100644
index 000000000..e6220bad1
--- /dev/null
+++ b/plugins/wake-policy.conf
@@ -0,0 +1,21 @@
+[WakeAllowed]
+# By default each Class of Devices providing the correct service (HID, HoG) is
+# allowed to wake up the host.
+# The following values are used to control the default WakeAllowed value based
+# on the Class of Device.
+# It is still possible for the user to override the WakeAllowed value per
+# device afterwards.
+#
+# Possible values for each Major Class:
+# true,false,<Minor Class allowed list (integer separated by ;)>
+
+#Computer=true
+#Phone=true
+#LAN/Network=true
+#Audio/Video=true
+#Peripheral=true
+#Imaging=true
+#Wearable=true
+#Toy=true
+#Health=true
+#Uncategorized=true
diff --git a/src/device.c b/src/device.c
index 1d4b8ab36..d970745f5 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1500,7 +1500,7 @@ dev_property_advertising_data_exist(const GDBusPropertyTable *property,
return bt_ad_has_data(device->ad, NULL);
}
-static bool device_get_wake_support(struct btd_device *device)
+bool device_get_wake_support(struct btd_device *device)
{
return device->wake_support;
}
diff --git a/src/device.h b/src/device.h
index 5722ca9ca..f8c744baf 100644
--- a/src/device.h
+++ b/src/device.h
@@ -149,6 +149,7 @@ void device_set_wake_support(struct btd_device *device, bool wake_support);
void device_set_wake_override(struct btd_device *device, bool wake_override);
void device_set_wake_allowed(struct btd_device *device, bool wake_allowed,
guint32 id);
+bool device_get_wake_support(struct btd_device *device);
void device_set_refresh_discovery(struct btd_device *dev, bool refresh);
typedef void (*disconnect_watch) (struct btd_device *device, gboolean removal,
--
2.34.1

43
spec_files/bluez/0020-plugins-wake-policy-Only-allow-Peripherals-to-wake-u.patch Normal file
View File

@ -0,0 +1,43 @@
From b4393a13b654263194ceb6fad0db9cd6e1821e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis@collabora.com>
Date: Wed, 24 Apr 2024 15:38:40 +0200
Subject: [PATCH BlueZ 2/2] plugins: wake-policy: Only allow Peripherals to
wake up the host
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
This prevents Headsets/Earbuds to wake up the host.
---
plugins/wake-policy.conf | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/plugins/wake-policy.conf b/plugins/wake-policy.conf
index e6220bad1..35e006f3d 100644
--- a/plugins/wake-policy.conf
+++ b/plugins/wake-policy.conf
@@ -9,13 +9,13 @@
# Possible values for each Major Class:
# true,false,<Minor Class allowed list (integer separated by ;)>
-#Computer=true
-#Phone=true
-#LAN/Network=true
-#Audio/Video=true
+Computer=false
+Phone=false
+LAN/Network=false
+Audio/Video=false
#Peripheral=true
-#Imaging=true
-#Wearable=true
-#Toy=true
-#Health=true
-#Uncategorized=true
+Imaging=false
+Wearable=false
+Toy=false
+Health=false
+Uncategorized=false
--
2.34.1

13
spec_files/bluez/0021-valve-bluetooth-ll-privacy.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/main.conf b/src/main.conf
index 5b2dc83..a24fb0b 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -142,7 +142,7 @@ FastConnectable = true
# 6fbaf188-05e0-496a-9885-d6ddfdb4e03e (BlueZ Experimental ISO socket)
# 69518c4c-b69f-4679-8bc1-c021b47b5733 (BlueZ Experimental Poll Errqueue)
# Defaults to false.
-#KernelExperimental = false
+KernelExperimental = 15c0a148-c273-11ea-b3de-0242ac130004
# The duration to avoid retrying to resolve a peer's name, if the previous
# try failed.

12
spec_files/bluez/bluez.spec
View File

@ -5,10 +5,10 @@
%endif
Name: bluez
Version: 5.75
Version: 5.76
Release: 1%{?dist}.bazzite.{{{ git_dir_version }}}
Summary: Bluetooth utilities
License: GPLv2+
License: GPL-2.0-or-later
URL: http://www.bluez.org/
Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
@ -16,6 +16,11 @@ Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
# Valve
Patch0: 0001-valve-bluetooth-config.patch
Patch1: 0002-valve-bluetooth-phy.patch
Patch2: 0014-shared-gatt-Add-env-variable-to-prefer-indication-ov.patch
Patch3: 0018-disable-unreliable-vcp-tests.patch
Patch4: 0019-plugins-Add-new-plugin-to-manage-wake-policy.patch
Patch5: 0020-plugins-wake-policy-Only-allow-Peripherals-to-wake-u.patch
Patch6: 0021-valve-bluetooth-ll-privacy.patch
BuildRequires: dbus-devel >= 1.6
BuildRequires: glib2-devel
@ -332,6 +337,9 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_userunitdir}/obex.service
%changelog
* Mon May 20 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 5.76-1
- Update to 5.76
* Mon Apr 15 2024 Adam Williamson <awilliam@redhat.com> - 5.75-1
- Update to 5.75