5.82

Backports and update

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  bluez-5.51.tar.xz: d958fa2fe8aa4b592e8a967f73b8379a8102339c
+  bluez-5.82.tar.xz: 0f864334e01bef3b621dc7671093aeffeca695a5

.gitea/workflows/ci.yml

@@ -0,0 +1,17 @@
+version: '1'
+
+name: Run CI/CD...
+
+on: [push]
+
+jobs:
+  main:
+    runs-on: r11_builder
+    steps:
+      - name: Jobs
+        uses: ${{ github.server_url }}/Djam/r11_workflows@main
+        with:
+          CI_DEPLOY: ${{ secrets.CI_DEPLOY }}
+          PUBLICATOR: ${{ secrets.PUBLICATOR }}
+          REPO_DEPLOY: ${{ secrets.REPO_DEPLOY }}
+

.gitignore

@@ -0,0 +1,3 @@
+.*~
+*~
+.env

0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch

@@ -0,0 +1,34 @@
+diff -ruN bluez-5.54_orig/Makefile.obexd bluez-5.54/Makefile.obexd
+--- bluez-5.54_orig/Makefile.obexd	2019-10-31 16:12:55.000000000 +0900
++++ bluez-5.54/Makefile.obexd	2020-03-16 18:40:01.343336667 +0900
+@@ -1,12 +1,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ if OBEX
+ 
+diff -ruN bluez-5.54_orig/obexd/src/org.bluez.obex.service bluez-5.54/obexd/src/org.bluez.obex.service
+--- bluez-5.54_orig/obexd/src/org.bluez.obex.service	2012-12-25 03:46:55.000000000 +1000
++++ bluez-5.54/obexd/src/org.bluez.obex.service	1970-01-01 09:00:00.000000000 +0900
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff -ruN bluez-5.54_orig/obexd/src/org.bluez.obex.service.in bluez-5.54/obexd/src/org.bluez.obex.service.in
+--- bluez-5.54_orig/obexd/src/org.bluez.obex.service.in	1970-01-01 09:00:00.000000000 +0900
++++ bluez-5.54/obexd/src/org.bluez.obex.service.in	2020-03-16 18:38:10.868126666 +0900
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service

0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch

@@ -1,7 +1,7 @@
-From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
+From 90b72b787a6ae6b9b0bf8ece238e108e8607a433 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Sat, 9 Nov 2013 18:13:43 +0100
-Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths
+Subject: [PATCH 1/2] obex: Use GLib helper function to manipulate paths
 
 Instead of trying to do it by hand. This also makes sure that
 relative paths aren't used by the agent.
@@ -10,10 +10,10 @@ relative paths aren't used by the agent.
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/obexd/src/manager.c b/obexd/src/manager.c
-index cec8a39..f18896e 100644
+index f84384ae4..285c07c37 100644
 --- a/obexd/src/manager.c
 +++ b/obexd/src/manager.c
-@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
+@@ -650,14 +650,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
  				DBUS_TYPE_STRING, &name,
  				DBUS_TYPE_INVALID)) {
  		/* Splits folder and name */
@@ -34,5 +34,5 @@ index cec8a39..f18896e 100644
  	}
  
 -- 
-1.8.4.2
+2.14.1
 

bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch

@@ -1,34 +0,0 @@
-diff -urN bluez-5.51/Makefile.obexd bluez-5.51-patched/Makefile.obexd
---- bluez-5.51/Makefile.obexd	2019-09-19 21:51:02.000000000 +0300
-+++ bluez-5.51-patched/Makefile.obexd	2019-09-27 13:42:04.437366618 +0300
-@@ -1,12 +1,12 @@
- if SYSTEMD
- systemduserunitdir = $(SYSTEMD_USERUNITDIR)
- systemduserunit_DATA = obexd/src/obex.service
-+endif
- 
- dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
- 
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
- 
- if OBEX
- 
-diff -urN bluez-5.51/obexd/src/org.bluez.obex.service bluez-5.51-patched/obexd/src/org.bluez.obex.service
---- bluez-5.51/obexd/src/org.bluez.obex.service	2012-12-24 21:46:55.000000000 +0400
-+++ bluez-5.51-patched/obexd/src/org.bluez.obex.service	1970-01-01 03:00:00.000000000 +0300
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff -urN bluez-5.51/obexd/src/org.bluez.obex.service.in bluez-5.51-patched/obexd/src/org.bluez.obex.service.in
---- bluez-5.51/obexd/src/org.bluez.obex.service.in	1970-01-01 03:00:00.000000000 +0300
-+++ bluez-5.51-patched/obexd/src/org.bluez.obex.service.in	2019-09-27 13:43:58.700696733 +0300
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service

bluez.rpmlintrc

@@ -0,0 +1,3 @@
+addFilter("E: non-readable")
+addFilter("E: hardcoded-library-path")
+

bluez.spec

@@ -1,14 +1,20 @@
 %define major 3
 %define libname %mklibname %{name} %{major}
 %define devname %mklibname %{name} -d
+%define with_mesh 1
+%global _compress xz -0f
+
+%global optflags %(echo %{optflags} | sed -e 's/-ffat-lto-objects//g' -e 's/-fvar-tracking-assignments//g' -e 's/-Wa,--compress-debug-sections//g')
+
 
 Summary:	Official Linux Bluetooth protocol stack
 Name:		bluez
-Version:	5.51
-Release:	1
+Version:	5.82
+Release:	2
+Epoch:		2
 License:	GPLv2+
 Group:		Communications
-Url:		http://www.bluez.org/
+URL:		https://www.bluez.org
 Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
 Source1:	pand.conf
 Source2:	dund.conf
@@ -21,9 +27,10 @@ Patch0:		bluez-5.36-systemd-conditional.patch
 ## Ubuntu patches
 Patch1:		0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
 # Non-upstream
-Patch2:		bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch
+Patch2:		0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch3:		0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
 Patch4:		0004-agent-Assert-possible-infinite-loop.patch
+BuildRequires:  xz
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	cups-devel
@@ -32,6 +39,7 @@ BuildRequires:	readline-devel
 BuildRequires:	sbc-devel
 BuildRequires:	speexdsp-devel
 BuildRequires:	json-c-devel
+BuildRequires:	python3-docutils
 BuildRequires:	pkgconfig(alsa)
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(expat)
@@ -42,8 +50,9 @@ BuildRequires:	pkgconfig(libusb)
 BuildRequires:	pkgconfig(libusb-1.0)
 BuildRequires:	pkgconfig(systemd)
 BuildRequires:	pkgconfig(udev) >= 186
-Requires(pre):	rpm-helper
-Suggests:	obex-data-server
+BuildRequires:  pkgconfig(json-c) >= 0.13
+BuildRequires:  llvm17
+
 Obsoletes:	bluez-alsa < 5.0
 Obsoletes:	bluez-gstreamer < 5.0
 
@@ -52,7 +61,7 @@ These are the official Bluetooth communication libraries for Linux.
 
 %files
 %{_bindir}/ciptool
-%{_bindir}/bccmd
+#{_bindir}/bccmd
 %{_bindir}/bluemoon
 %{_bindir}/bluetoothctl
 %{_bindir}/btattach
@@ -63,49 +72,36 @@ These are the official Bluetooth communication libraries for Linux.
 %{_bindir}/hcitool
 %{_bindir}/hex2hcd
 %{_bindir}/l2ping
-%{_bindir}/meshctl
 %{_bindir}/mpris-proxy
 %{_bindir}/rfcomm
 %{_bindir}/sdptool
 %{_libexecdir}/bluetooth/bluetoothd
 %{_libexecdir}/bluetooth/obexd
-%{_unitdir}/bluetooth-logger.service
-%{_unitdir}/bluetooth-mesh.service
 %{_unitdir}/bluetooth.service
 %{_unitdir}/dbus-org.bluez.service
 %{_userunitdir}/obex.service
-%{_mandir}/man1/bccmd.1*
-%{_mandir}/man1/btattach.1*
-%{_mandir}/man1/ciptool.1*
-%{_mandir}/man1/hciattach.1*
-%{_mandir}/man1/hciconfig.1*
-%{_mandir}/man1/hcitool.1*
-%{_mandir}/man1/hcidump.1*
-%{_mandir}/man1/l2ping.1*
-%{_mandir}/man1/rctest.1*
-%{_mandir}/man1/rfcomm.1*
-%{_mandir}/man1/sdptool.1*
-%{_mandir}/man8/*
+
 %config(noreplace) %{_sysconfdir}/sysconfig/*
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf
+#config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf
 %config(noreplace) %{_sysconfdir}/bluetooth
+%{_datadir}/dbus-1/system.d/bluetooth.conf
 %{_datadir}/dbus-1/system-services/org.bluez.service
-%{_datadir}/dbus-1/system-services/org.bluez.mesh.service
 %{_datadir}/dbus-1/services/org.bluez.obex.service
+%{_datadir}/dbus-1/system.d/obex.conf
 %{_datadir}/zsh/site-functions/_bluetoothctl
 %{_localstatedir}/lib/bluetooth
 %dir %{_libdir}/bluetooth
-%{_libdir}/bluetooth/btmon-logger
-%{_libdir}/bluetooth/bluetooth-meshd
-%dir %{_libdir}/bluetooth/plugins
-%{_libdir}/bluetooth/plugins/sixaxis.so
+#dir %{_libdir}/bluetooth/plugins
+#{_libdir}/bluetooth/plugins/sixaxis.so
 %{_udevrulesdir}/97-bluetooth.rules
+%{_userunitdir}/dbus-org.bluez.obex.service
+%{_userunitdir}/mpris-proxy.service
 
 %post
-%_post_service bluetooth
+%systemd_post bluetooth.service
 
 %postun
-%_preun_service bluetooth
+%systemd_post bluetooth.service
 
 #----------------------------------------------------------------------------
 
@@ -179,12 +175,33 @@ and mouse.
 
 %files hid2hci
 /lib/udev/hid2hci
-%{_mandir}/man1/hid2hci.1*
-/lib/udev/rules.d/97-hid2hci.rules
+%{_udevrulesdir}/97-hid2hci.rules
 
 %post hid2hci
 %{_bindir}/udevadm trigger --subsystem-match=usb
 
+#----------------------------------------------------------------------------
+%if %{with_mesh}
+
+%package mesh
+Summary:    Bluetooth MESH
+Group:      Communications
+
+%description mesh
+Bluetooth MESH
+
+%files mesh
+%{_unitdir}/bluetooth-mesh.service
+%{_bindir}/mesh-cfgclient
+%{_bindir}/meshctl
+%{_bindir}/mesh-cfgtest
+%{_libdir}/bluetooth/bluetooth-meshd
+%{_datadir}/dbus-1/system-services/org.bluez.mesh.service
+%{_datadir}/dbus-1/system.d/bluetooth-mesh.conf
+
+
+%endif
+
 #----------------------------------------------------------------------------
 
 %package test
@@ -202,6 +219,42 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 %{_bindir}/l2test
 %{_bindir}/rctest
 %{_bindir}/test-*
+%{_bindir}/isotest
+
+#----------------------------------------------------------------------------
+
+%package docs
+Summary:	Docs Bluetooth
+Group:		System/Servers
+
+%description docs
+Docs Bluethooth
+
+%files docs
+#{_mandir}/man1/bccmd.1*
+%{_mandir}/man1/bluetoothctl*
+%{_mandir}/man1/btattach.1*
+%{_mandir}/man1/ciptool.1*
+%{_mandir}/man1/hciattach.1*
+%{_mandir}/man1/hciconfig.1*
+%{_mandir}/man1/hcitool.1*
+%{_mandir}/man1/hcidump.1*
+%{_mandir}/man1/l2ping.1*
+%{_mandir}/man1/rctest.1*
+%{_mandir}/man1/rfcomm.1*
+%{_mandir}/man1/sdptool.1*
+%{_mandir}/man1/btmon.1*
+%{_mandir}/man1/btmgmt.1*
+%{_mandir}/man5/*
+%{_mandir}/man7/hci.7*
+%{_mandir}/man7/l2cap.7*
+%{_mandir}/man7/rfcomm.7*
+%{_mandir}/man8/*
+
+%{_mandir}/man1/hid2hci.1*
+%{_mandir}/man1/isotest.1*
+
+%{_mandir}/man7/sco.7*
 
 #----------------------------------------------------------------------------
 
@@ -209,51 +262,72 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 %setup -q
 %patch0 -p1 -R
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#patch2 -p1
+#patch3 -p1
 %patch4 -p1
 
+
+%build
+export CC=/opt/llvm17/bin/clang
+export CXX=/opt/llvm17/bin/clang++
+
 libtoolize -f -c
 autoreconf -fi
 
-%build
+#configure2_5x --help
+#exit 1
+
 %configure2_5x \
-    --prefix=/usr \
-    --libdir=%{_libdir} \
-    --libexecdir=%{_libdir} \
-	--enable-sixaxis \
-	--enable-udev \
-	--enable-backtrace \
-	--enable-battery \
-	--enable-deprecated \
-	--enable-deviceinfo \
-	--enable-testing \
-	--enable-library \
-	--enable-usb \
-	--enable-threads \
+	--with-systemdsystemunitdir=%{_unitdir} \
+	--with-systemduserunitdir=%{_userunitdir} \
+	--with-udevdir=%{_udevrulesdir} \
+	--enable-hid2hci \
 	--enable-tools \
+	--enable-cups \
+	--enable-datafiles \
+	--enable-debug \
+	--enable-library \
 	--enable-monitor \
+	--enable-udev \
 	--enable-obex \
 	--enable-client \
 	--enable-systemd \
-	--enable-mesh \
-	--enable-btpclient \
-	--with-systemdsystemunitdir=%{_unitdir} \
-	--with-systemduserunitdir=%{_userunitdir} \
-	--with-udevdir=/lib/udev \
-	--enable-datafiles \
-	--enable-experimental \
+	--enable-threads \
+	--enable-sixaxis \
 	--enable-nfc \
 	--enable-sap \
-	--enable-logger \
+	--enable-a2dp \
+	--enable-health \
+	--enable-midi \
+	--enable-avrcp \
+    --enable-sap   \
+    --enable-avrcp \
+    --enable-bap \
+    --enable-bass \
+    --enable-mcp  \
+    --enable-ccp \
+    --enable-vcp \
+    --enable-micp \
+    --enable-csip \
+    --enable-asha  \
 	--enable-network \
-	--enable-input \
-	--enable-health
+	--enable-hid \
+	--enable-hog \
+	--enable-experimental \
+    --enable-deprecated \
+    --enable-testing \
+    --disable-btpclient \
+%if %{with_mesh}
+    --enable-mesh \
+%else
+    --disable-mesh \
+%endif
+	--enable-manpages
 
 %make
 
 %install
-%makeinstall_std rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev
+%makeinstall_std rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev 
 
 mkdir -p %{buildroot}%{_sysconfdir}/bluetooth
 echo "1234" > %{buildroot}%{_sysconfdir}/bluetooth/pin
@@ -269,9 +343,10 @@ cp test/test-* %{buildroot}%{_bindir}
 cp test/simple-agent %{buildroot}%{_bindir}/simple-agent
 
 rm %{buildroot}%{_sysconfdir}/udev/rules.d/*.rules
-install -p -m644 tools/hid2hci.rules -D %{buildroot}/lib/udev/rules.d/97-hid2hci.rules
+install -p -m644 tools/hid2hci.rules -D %{buildroot}%{_udevrulesdir}/97-hid2hci.rules
 install -m644 %{SOURCE5} -D %{buildroot}%{_udevrulesdir}/97-bluetooth.rules
 sed s,"/usr/bin/bluetoothd","%{_libexecdir}/bluetooth/bluetoothd",g -i %{buildroot}%{_udevrulesdir}/97-bluetooth.rules
+sed s,"@libexecdir@","%{_libexecdir}/bluetooth",g -i %{buildroot}%{_datadir}/dbus-1/services/org.bluez.obex.service
 
 #install more config files
 install -m0644 profiles/network/network.conf %{buildroot}%{_sysconfdir}/bluetooth/
@@ -283,5 +358,3 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth
 ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service
 
 sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf
-
-%changelog