Skip to content

bluez: update to 5.86 #59504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cinerea0 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −53
Open

bluez: update to 5.86 #59504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion srcpkgs/bluez/patches/0001-enable-dbus-without-systemd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down
22 changes: 0 additions & 22 deletions srcpkgs/bluez/patches/0002-allow-obexd-on-non-systemd-system.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions srcpkgs/bluez/patches/0004-permission.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,3 @@
<policy context="default">
<allow send_destination="org.bluez"/>
</policy>
--- 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

12 changes: 6 additions & 6 deletions srcpkgs/bluez/patches/basename.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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 <stdbool.h>
@@ -26,6 +26,17 @@
#include <sys/stat.h>
#include "tools/missing.h"

+char *
+xbasename(const char *filename)
Expand All @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/bluez/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"

Expand Down