bluez: update to 5.65

Close: #38891
This commit is contained in:
Đoàn Trần Công Danh 2022-08-25 21:58:47 +07:00
parent 3d17013188
commit 4df0ab5d91
5 changed files with 2 additions and 191 deletions

View file

@ -1,116 +0,0 @@
From 1370cc9a32f8979158a894c3de75bcb3c29af03a Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Thu, 3 Oct 2019 12:59:56 +0700
Subject: [PATCH 4/8] include sys/time.h for musl build
---
mesh/appkey.c | 1 +
mesh/crypto.c | 1 +
mesh/friend.c | 1 +
mesh/manager.c | 1 +
mesh/mesh.c | 1 +
mesh/net.c | 2 +-
mesh/pb-adv.c | 1 +
mesh/prov-acceptor.c | 1 +
mesh/prov-initiator.c | 1 +
9 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/mesh/appkey.c b/mesh/appkey.c
index 45d604007..b570bff9d 100644
--- a/mesh/appkey.c
+++ b/mesh/appkey.c
@@ -22,6 +22,7 @@
#endif
#define _GNU_SOURCE
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-defs.h"
diff --git a/mesh/crypto.c b/mesh/crypto.c
index 596a289f9..3ecdb564c 100644
--- a/mesh/crypto.c
+++ b/mesh/crypto.c
@@ -24,6 +24,7 @@
#define _GNU_SOURCE
#include <unistd.h>
#include <sys/socket.h>
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-defs.h"
diff --git a/mesh/friend.c b/mesh/friend.c
index 5f5f6f823..a5bab6929 100644
--- a/mesh/friend.c
+++ b/mesh/friend.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-defs.h"
diff --git a/mesh/manager.c b/mesh/manager.c
index e4a7deaeb..e5837ed48 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -22,6 +22,7 @@
#endif
#define _GNU_SOURCE
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-defs.h"
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 6d2f86b6d..1eef01eee 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -22,6 +22,7 @@
#endif
#define _GNU_SOURCE
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-io.h"
diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index 6ef45b8b0..797ff9da7 100644
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <sys/time.h>
#include <ell/ell.h>
#include "mesh/mesh-defs.h"
diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index 03972c227..1b38f1bdd 100644
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <sys/time.h>
#include <ell/ell.h>
#include "src/shared/ecc.h"
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index 7a767cfb3..c9ffea45d 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <sys/time.h>
#include <ell/ell.h>
#include "src/shared/ecc.h"
--
2.23.0

View file

@ -1,37 +0,0 @@
From d1d8408c9a7c7b5ffa30371f246cc18085e11313 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Thu, 3 Oct 2019 13:00:27 +0700
Subject: [PATCH 6/9] musl fix
Including <linux/if_bridge.h> causes the inclusion of <linux/in6.h>,
which defines 'struct in6_addr', already defined in <netinet/in.h>.
Remove <linux/if_bridge.h> to fix musl build.
---
tools/bneptest.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/bneptest.c b/tools/bneptest.c
index 8bc7596b6..6b3956cfa 100644
--- a/tools/bneptest.c
+++ b/tools/bneptest.c
@@ -37,7 +37,6 @@
#include <net/if.h>
#include <linux/sockios.h>
#include <netinet/in.h>
-#include <linux/if_bridge.h>
#include <glib.h>
@@ -51,6 +50,9 @@
#include "lib/bnep.h"
#include "profiles/network/bnep.h"
+/* From <linux/if_bridge.h> */
+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8
+
enum {
MODE_LISTEN,
MODE_CONNECT,
--
2.23.0

View file

@ -1,25 +0,0 @@
From fe1a76a03b9cbc28621d53680eb9ff4a2bd31778 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Thu, 3 Oct 2019 16:31:01 +0700
Subject: [PATCH 7/9] include string.h
---
android/client/if-hf-client.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/android/client/if-hf-client.c b/android/client/if-hf-client.c
index f701a814c..b44eb4291 100644
--- a/android/client/if-hf-client.c
+++ b/android/client/if-hf-client.c
@@ -16,6 +16,8 @@
*/
#define _GNU_SOURCE
+#include <string.h>
+
#include "if-main.h"
#include "../hal-utils.h"
--
2.23.0

View file

@ -1,11 +0,0 @@
--- a/tools/mesh-cfgtest.c
+++ b/tools/mesh-cfgtest.c
@@ -34,6 +34,8 @@
#include "mesh/mesh-defs.h"
#include "mesh/mesh.h"
+#include <limits.h>
+
#define MAX_CRPL_SIZE 0x7fff
#define CFG_SRV_MODEL 0x0000
#define CFG_CLI_MODEL 0x0001

View file

@ -1,6 +1,6 @@
# Template file for 'bluez'
pkgname=bluez
version=5.64
version=5.65
revision=1
build_style=gnu-configure
configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://www.bluez.org/"
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
checksum=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34
checksum=2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4
conf_files="/etc/bluetooth/main.conf"
system_groups="bluetooth"