From ac7a26972034a1a68f3a5823ad3a9ab31e1e8023 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 21 Mar 2026 17:44:28 -0400 Subject: [PATCH] bluez: update to 5.86 --- .../0001-enable-dbus-without-systemd.patch | 2 +- ...02-allow-obexd-on-non-systemd-system.patch | 22 ------------------- srcpkgs/bluez/patches/0004-permission.patch | 22 ------------------- srcpkgs/bluez/patches/basename.patch | 12 +++++----- srcpkgs/bluez/template | 4 ++-- 5 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch diff --git a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch index a7d5eb46ac1d6e..e829e7bace484c 100644 --- a/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch +++ b/srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -43,14 +43,14 @@ conf_DATA = src/main.conf +@@ -47,6 +47,9 @@ conf_DATA = src/main.conf conf_DATA += profiles/input/input.conf conf_DATA += profiles/network/network.conf state_DATA = diff --git a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch b/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch deleted file mode 100644 index 8dab1698b6ce55..00000000000000 --- a/srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -5,9 +5,6 @@ if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service - --dbussessionbusdir = $(DBUS_SESSIONBUSDIR) --dbussessionbus_DATA = obexd/src/org.bluez.obex.service -- - obexd-add-service-symlink: - $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service - -@@ -18,6 +15,9 @@ obexd-add-service-symlink: - obexd-remove-service-symlink: - endif - -+dbussessionbusdir = $(DBUS_SESSIONBUSDIR) -+dbussessionbus_DATA = obexd/src/org.bluez.obex.service -+ - obex_plugindir = $(libdir)/obex/plugins - - obexd_builtin_modules = diff --git a/srcpkgs/bluez/patches/0004-permission.patch b/srcpkgs/bluez/patches/0004-permission.patch index 4ec3ec9206ab23..c106406264ba83 100644 --- a/srcpkgs/bluez/patches/0004-permission.patch +++ b/srcpkgs/bluez/patches/0004-permission.patch @@ -11,25 +11,3 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth - statedir = $(localstatedir)/lib/bluetooth - - bluetoothd-fix-permissions: -- install -dm555 $(DESTDIR)$(confdir) -+ install -dm755 $(DESTDIR)$(confdir) - install -dm700 $(DESTDIR)$(statedir) - - if DATAFILES ---- a/Makefile.in -+++ b/Makefile.in -@@ -13737,7 +13737,7 @@ uninstall-man: uninstall-man1 uninstall- - - - bluetoothd-fix-permissions: -- install -dm555 $(DESTDIR)$(confdir) -+ install -dm755 $(DESTDIR)$(confdir) - install -dm700 $(DESTDIR)$(statedir) - @BTPCLIENT_TRUE@tools/btpclient.$(OBJEXT): src/libshared-ell.la ell/internal - diff --git a/srcpkgs/bluez/patches/basename.patch b/srcpkgs/bluez/patches/basename.patch index 07139a94272bfc..3754e972534952 100644 --- a/srcpkgs/bluez/patches/basename.patch +++ b/srcpkgs/bluez/patches/basename.patch @@ -1,6 +1,6 @@ --- a/mesh/rpl.c +++ b/mesh/rpl.c -@@ -33,6 +33,17 @@ +@@ -34,6 +34,17 @@ static const char *rpl_dir = "/rpl"; @@ -18,20 +18,20 @@ bool rpl_put_entry(struct mesh_node *node, uint16_t src, uint32_t iv_index, uint32_t seq) { -@@ -146,7 +157,7 @@ static void get_entries(const char *iv_p +@@ -147,7 +158,7 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list) if (!dir) return; -- iv_txt = basename(iv_path); +- iv_txt = mesh_basename(iv_path); + iv_txt = xbasename(iv_path); if (sscanf(iv_txt, "%08x", &iv_index) != 1) { closedir(dir); return; --- a/tools/hex2hcd.c +++ b/tools/hex2hcd.c -@@ -25,6 +25,17 @@ - #include +@@ -26,6 +26,17 @@ #include + #include "tools/missing.h" +char * +xbasename(const char *filename) @@ -47,7 +47,7 @@ static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr) { const char *ptr = line + 1; -@@ -302,7 +313,7 @@ static void ver_parse_entry(const char * +@@ -303,7 +314,7 @@ static void ver_parse_entry(const char *pathname) } if (S_ISREG(st.st_mode)) { diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 51dfb5cc2309cb..599f698afd6c9f 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,6 +1,6 @@ # Template file for 'bluez' pkgname=bluez -version=5.78 +version=5.86 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --disable-systemd @@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.bluez.org/" changelog="https://git.kernel.org/pub/scm/bluetooth/bluez.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/bluetooth/bluez-${version}.tar.xz" -checksum=830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 +checksum=99f144540c6070591e4c53bcb977eb42664c62b7b36cb35a29cf72ded339621d conf_files="/etc/bluetooth/main.conf" system_groups="bluetooth"