diff options
Diffstat (limited to 'source/n')
| -rw-r--r-- | source/n/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch | 35 | ||||
| -rwxr-xr-x | source/n/bluez/bluez.SlackBuild | 5 |
2 files changed, 1 insertions, 39 deletions
diff --git a/source/n/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch b/source/n/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch deleted file mode 100644 index c09a54daf..000000000 --- a/source/n/bluez/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1528118a8f84b4b178729c1f9fc3f6d858c04f9f Mon Sep 17 00:00:00 2001 -From: Xiao Yao <xiaoyao@rock-chips.com> -Date: Sun, 17 Dec 2023 21:50:12 +0800 -Subject: [PATCH] adapter: Fix link key address type for old kernels - -Fixes: https://github.com/bluez/bluez/issues/686 - -Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com> ---- - src/adapter.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/adapter.c b/src/adapter.c -index ee70b00d2..b4628a411 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -4347,7 +4347,17 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys, - struct link_key_info *info = l->data; - - bacpy(&key->addr.bdaddr, &info->bdaddr); -- key->addr.type = info->bdaddr_type; -+ -+ /* -+ * According to the Bluetooth specification, the address -+ * type of the link key is not fixed. However, the -+ * load_link_keys function in the old kernel code requires -+ * that the address type must be BREDR. Since the address -+ * type is not actually used by the link key, to maintain -+ * compatibility with older kernel versions, the addr.type -+ * of the link key is set to BDADDR_BREDR. -+ */ -+ key->addr.type = BDADDR_BREDR; - key->type = info->type; - memcpy(key->val, info->key, 16); - key->pin_len = info->pin_len; diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index a58c6902d..de035ce03 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,9 +78,6 @@ find . \ zcat $CWD/bluez-5.51-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 -# Fix regression in 5.71: -cat $CWD/1528118a8f84b4b178729c1f9fc3f6d858c04f9f.patch | patch -p1 --verbose || exit 1 - sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} autoreconf -vif |