rpms/bluez
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS bluez-5.87+1.git30db66dc971b-1.el9

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-08-24 08:53:53 -04:00
parent cc91b14671
commit 5be45b4140
6 changed files with 80 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bluez.metadata
View File

@ -1 +1 @@
7528c0df967386e976b58aa5be514a817e6afe18 SOURCES/bluez-5.85.tar.xz
d3d7b3a461826d09115b3f737d124bc449af6fd1 SOURCES/bluez-5.87+1.git30db66dc971b.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/bluez-5.85.tar.xz
SOURCES/bluez-5.87+1.git30db66dc971b.tar.xz

125
SOURCES/0001-Add-missing-mesh-gatt-JSON-files.patch
View File

@ -1,125 +0,0 @@
From 669de134aa19fbd6b7ac59575446a064bbf27565 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 14 Feb 2024 16:51:14 +0100
Subject: [PATCH] Add missing mesh-gatt JSON files
---
tools/mesh-gatt/local_node.json | 61 +++++++++++++++++++++++++++++++++
tools/mesh-gatt/prov_db.json | 37 ++++++++++++++++++++
2 files changed, 98 insertions(+)
create mode 100644 tools/mesh-gatt/local_node.json
create mode 100644 tools/mesh-gatt/prov_db.json
diff --git a/tools/mesh-gatt/local_node.json b/tools/mesh-gatt/local_node.json
new file mode 100644
index 000000000000..5ffa7ada1f65
--- /dev/null
+++ b/tools/mesh-gatt/local_node.json
@@ -0,0 +1,61 @@
+{
+ "$schema":"file:\/\/\/BlueZ\/Mesh\/local_schema\/mesh.jsonschema",
+ "meshName":"BT Mesh",
+ "netKeys":[
+ {
+ "index": 0,
+ "keyRefresh": 0
+ }
+ ],
+ "appKeys":[
+ {
+ "index": 0,
+ "boundNetKey": 0
+ },
+ {
+ "index": 1,
+ "boundNetKey": 0
+ }
+ ],
+"node": {
+ "IVindex":"00000005",
+ "IVupdate":"0",
+ "sequenceNumber": 0,
+ "composition": {
+ "cid": "0002",
+ "pid": "0010",
+ "vid": "0001",
+ "crpl": "000a",
+ "features": {
+ "relay": false,
+ "proxy": true,
+ "friend": false,
+ "lowPower": false
+ },
+ "elements": [
+ {
+ "elementIndex": 0,
+ "location": "0001",
+ "models": ["0000", "0001", "1001"]
+ }
+ ]
+ },
+ "configuration":{
+ "netKeys": [0],
+ "appKeys": [ 0, 1],
+ "defaultTTL": 10,
+ "elements": [
+ {
+ "elementIndex": 0,
+ "unicastAddress":"0077",
+ "models": [
+ {
+ "modelId": "1001",
+ "bind": [1]
+ }
+ ]
+ }
+ ]
+ }
+ }
+}
diff --git a/tools/mesh-gatt/prov_db.json b/tools/mesh-gatt/prov_db.json
new file mode 100644
index 000000000000..74a03128d4d5
--- /dev/null
+++ b/tools/mesh-gatt/prov_db.json
@@ -0,0 +1,37 @@
+{
+ "$schema":"file:\/\/\/BlueZ\/Mesh\/schema\/mesh.jsonschema",
+ "meshName":"BT Mesh",
+ "IVindex":5,
+ "IVupdate":0,
+ "netKeys":[
+ {
+ "index":0,
+ "keyRefresh":0,
+ "key":"18eed9c2a56add85049ffc3c59ad0e12"
+ }
+ ],
+ "appKeys":[
+ {
+ "index":0,
+ "boundNetKey":0,
+ "key":"4f68ad85d9f48ac8589df665b6b49b8a"
+ },
+ {
+ "index":1,
+ "boundNetKey":0,
+ "key":"2aa2a6ded5a0798ceab5787ca3ae39fc"
+ }
+ ],
+ "provisioners":[
+ {
+ "provisionerName":"BT Mesh Provisioner",
+ "unicastAddress":"0077",
+ "allocatedUnicastRange":[
+ {
+ "lowAddress":"0100",
+ "highAddress":"7fff"
+ }
+ ]
+ }
+ ],
+}
--
2.43.0

27
SOURCES/0001-build-Don-t-install-btmgmt-man-page-as-tool-isn-t.patch
View File

@ -1,27 +0,0 @@
From c9ec6137b16aaf371b311f4777a042ec1175719b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 29 Jan 2026 13:40:52 +0100
Subject: [PATCH] build: Don't install btmgmt man page as tool isn't
The btmgmt tool isn't installed through the Makefiles, so the
man page shouldn't be installed either.
---
Makefile.tools | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.tools b/Makefile.tools
index 561b03d0b95b..f0b106fae7ef 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -355,7 +355,7 @@ profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS)
if MANPAGES
man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1 tools/isotest.1 \
- tools/btmgmt.1 client/bluetoothctl.1 \
+ client/bluetoothctl.1 \
client/bluetoothctl-mgmt.1 \
client/bluetoothctl-monitor.1 client/bluetoothctl-admin.1 \
client/bluetoothctl-advertise.1 client/bluetoothctl-endpoint.1 \
--
2.52.0

39
SOURCES/0001-hci-tester-Work-around-possible-string-overflow.patch Normal file
View File

@ -0,0 +1,39 @@
From 8440635a802cc4a8f529f9b1f6933a5fad2aa8d4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 16 Jun 2026 10:52:58 +0200
Subject: [PATCH] hci-tester: Work-around possible string overflow
Quiet overflow warning by checking for a non-NULL destination.
In function 'memcpy',
inlined from 'test_pre_setup_lt_address' at tools/hci-tester.c:67:2:
/usr/include/bits/string_fortified.h:29:10: warning: '__builtin_memcpy' writing 6 bytes into a region of size 0 overflows the destination [-Wstringop-overflow=]
29 | return __builtin___memcpy_chk (__dest, __src, __len,
| ^
---
tools/hci-tester.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/hci-tester.c b/tools/hci-tester.c
index b8446ee83ccf..c9e7c58d2e95 100644
--- a/tools/hci-tester.c
+++ b/tools/hci-tester.c
@@ -12,6 +12,7 @@
#include <config.h>
#endif
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -57,6 +58,7 @@ static void test_pre_setup_lt_address(const void *data, uint8_t size,
struct user_data *user = tester_get_data();
const struct bt_hci_rsp_read_bd_addr *rsp = data;
+ assert(user);
if (rsp->status) {
tester_warn("Read lower tester address failed (0x%02x)",
rsp->status);
--
2.54.0

44
SPECS/bluez.spec
View File

@ -4,8 +4,15 @@
%bcond_with deprecated
%endif
# Snapshot generated with:
# git config tar.tar.xz.command "xz -c"
# export SHA=`git rev-parse --short HEAD` ; export VERSION=5.86 ; git archive --format=tar.xz -o bluez-$VERSION+1.git$SHA.tar.xz --prefix=bluez-$VERSION+1.git$SHA/ HEAD
# as a post-release snapshot, see:
# https://fedoraproject.org/wiki/PackagingDrafts/TildeVersioning
%global gitsha 30db66dc971b
Name: bluez
Version: 5.85
Version: 5.87+1.git%{gitsha}
Release: 1%{?dist}
Summary: Bluetooth utilities
License: GPLv2+
@ -16,10 +23,8 @@ Source1: bluez.gitignore
# https://github.com/hadess/bluez/commits/obex-5.46
Patch1: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20240214155019.325715-1-hadess@hadess.net/
Patch2: 0001-Add-missing-mesh-gatt-JSON-files.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20260129125948.2724071-2-hadess@hadess.net/
Patch3: 0001-build-Don-t-install-btmgmt-man-page-as-tool-isn-t.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20260616085538.3568474-1-hadess@hadess.net/
Patch2: 0001-hci-tester-Work-around-possible-string-overflow.patch
BuildRequires: dbus-devel >= 1.6
BuildRequires: glib2-devel
@ -148,6 +153,7 @@ Object Exchange daemon for sharing files, contacts etc over bluetooth
autoreconf -vif
%configure --enable-tools --enable-library --disable-optimization \
--enable-deprecated \
--enable-external-ell \
--enable-sixaxis --enable-cups --enable-nfc --enable-mesh \
--enable-hid2hci --enable-testing \
--with-systemdsystemunitdir=%{_unitdir} \
@ -172,6 +178,12 @@ done
# Red Hat Bugzilla bug #1699680
install -m0755 tools/avinfo $RPM_BUILD_ROOT%{_bindir}
# btmgmt is not installed by "make install", but it is useful for debugging
# some issues and to set the MAC address on HCIs which don't have their
# MAC address configured
install -m0755 tools/btmgmt $RPM_BUILD_ROOT%{_bindir}
rst2man doc/btmgmt.rst --no-datestamp --no-generator $RPM_BUILD_ROOT%{_mandir}/man1/btmgmt.1
# Remove libtool archive
find $RPM_BUILD_ROOT -name '*.la' -delete
@ -239,12 +251,14 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_bindir}/bluemoon
%{_bindir}/bluetoothctl
%{_bindir}/btattach
%{_bindir}/btmgmt
%{_bindir}/btmon
%{_bindir}/hex2hcd
%{_bindir}/l2ping
%{_bindir}/mpris-proxy
%{_mandir}/man1/bluetoothctl.1.*
%{_mandir}/man1/bluetoothctl-*.1.*
%{_mandir}/man1/btmgmt.1.*
%{_mandir}/man1/btattach.1.*
%{_mandir}/man1/btmon.1.*
%{_mandir}/man1/l2ping.1.*
@ -293,6 +307,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_mandir}/man1/isotest.1.*
%{_mandir}/man1/rctest.1.*
%{_mandir}/man5/org.bluez.*.5.*
%{_mandir}/man7/btsnoop.7.*
%{_mandir}/man7/hci.7.*
%{_mandir}/man7/iso.7.*
%{_mandir}/man7/l2cap.7.*
@ -332,6 +347,25 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_userunitdir}/obex.service
%changelog
* Thu Jul 16 2026 Bastien Nocera <bnocera@redhat.com> - 5.87+1.git30db66dc971b-1
- Update to 5.87 post-release snapshot
Resolves: RHEL-193095
* Thu Jul 02 2026 Bastien Nocera <bnocera@redhat.com> - 5.86+1.git220f102c8db9-1
- Update to 5.87 pre-release snapshot
Resolves: RHEL-169988
* Fri Mar 27 2026 Bastien Nocera <bnocera@redhat.com> - 5.86-2
- Fix startup warning
Resolves: RHEL-161518
* Tue Feb 10 2026 Bastien Nocera <bnocera@redhat.com> - 5.86-1
- Update to 5.86
- Re-add btmgmt as it does not require bluetoothd to be running,
unlike bluetoothctl mgmt
- Fix audio output not working in some circumstances
Resolves: RHEL-147734
* Mon Jan 26 2026 Bastien Nocera <bnocera@redhat.com> - 5.85-1
- Update to 5.85
Resolves: RHEL-142552