From 1977f62b5ade6cd92922de231fa5eff1fa75283d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 15 Nov 2022 08:03:01 +0000
Subject: [PATCH] bluez: update to 5.66

---
 packages/network/bluez/package.mk             |  4 +--
 .../patches/bluez-06-raspberry-pi-mods.patch  | 20 ++++++++-------
 ...ixaxis-fix-PID-navigation-controller.patch |  2 +-
 .../patches/bluez-20-sixaxis-autotrust.patch  | 25 -------------------
 4 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100644 packages/network/bluez/patches/bluez-20-sixaxis-autotrust.patch

diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index c7799a1888..154b965bd8 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bluez"
-PKG_VERSION="5.65"
-PKG_SHA256="2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4"
+PKG_VERSION="5.66"
+PKG_SHA256="39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/network/bluez/patches/bluez-06-raspberry-pi-mods.patch b/packages/network/bluez/patches/bluez-06-raspberry-pi-mods.patch
index 3b96b20ca0..342a4c09ac 100644
--- a/packages/network/bluez/patches/bluez-06-raspberry-pi-mods.patch
+++ b/packages/network/bluez/patches/bluez-06-raspberry-pi-mods.patch
@@ -23,6 +23,17 @@ Last-Update: 2017-04-05
  	int init_speed = 0;
  	int send_break = 0;
  	pid_t pid;
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -44,7 +45,7 @@
+ #define HCI_UART_VND_DETECT	5
+ 
+ #ifndef FIRMWARE_DIR
+-#define FIRMWARE_DIR "/etc/firmware"
++#define FIRMWARE_DIR "/lib/firmware"
+ #endif
+ 
+ int read_hci_event(int fd, unsigned char *buf, int size);
 --- a/tools/hciattach_bcm43xx.c
 +++ b/tools/hciattach_bcm43xx.c
 @@ -36,6 +36,7 @@
@@ -33,15 +44,6 @@ Last-Update: 2017-04-05
  
  #include "lib/bluetooth.h"
  #include "lib/hci.h"
-@@ -44,7 +45,7 @@
- #include "hciattach.h"
- 
- #ifndef FIRMWARE_DIR
--#define FIRMWARE_DIR "/etc/firmware"
-+#define FIRMWARE_DIR "/lib/firmware"
- #endif
- 
- #define FW_EXT ".hcd"
 @@ -303,9 +304,23 @@
  static int bcm43xx_locate_patch(const char *dir_name,
  		const char *chip_name, char *location)
diff --git a/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch b/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch
index eb3d6f1142..12cf6a8b57 100644
--- a/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch
+++ b/packages/network/bluez/patches/bluez-11_sixaxis-fix-PID-navigation-controller.patch
@@ -29,9 +29,9 @@ index 939fed7..f6baea7 100644
 +	else
 +		btd_device_set_pnpid(device, cp->source, cp->vid, cp->pid, cp->version);
 +
- 	btd_device_set_trusted(device, false);
  	btd_device_set_temporary(device, true);
  
+ 	closure = g_new0(struct authentication_closure, 1);
 diff --git a/profiles/input/sixaxis.h b/profiles/input/sixaxis.h
 index 8e6f3cc..321a918 100644
 --- a/profiles/input/sixaxis.h
diff --git a/packages/network/bluez/patches/bluez-20-sixaxis-autotrust.patch b/packages/network/bluez/patches/bluez-20-sixaxis-autotrust.patch
deleted file mode 100644
index 033a4dad48..0000000000
--- a/packages/network/bluez/patches/bluez-20-sixaxis-autotrust.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 40c6e7c5a0d81a781c94e5a64661848018c1f8be Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Thu, 19 Sep 2019 22:55:09 +0100
-Subject: [PATCH] sixaxis autotrust
-
----
- plugins/sixaxis.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
-index f6baea7..c166304 100644
---- a/plugins/sixaxis.c
-+++ b/plugins/sixaxis.c
-@@ -371,7 +371,7 @@ static bool setup_device(int fd, const char *sysfs_path,
- 	else
- 		btd_device_set_pnpid(device, cp->source, cp->vid, cp->pid, cp->version);
- 
--	btd_device_set_trusted(device, false);
-+	btd_device_set_trusted(device, true);
- 	btd_device_set_temporary(device, true);
- 
- 	closure = g_new0(struct authentication_closure, 1);
--- 
-2.7.4
-