[Buildroot] [PATCH 1/1] package/bluez-tools: bump to version f65321736475429316f07ee94ec0deac8e46ec4a

[Arnout Vandecappelle]

On 06/09/2021 17:21, Jan Havran wrote:
> Minor fixes:
> - build with gcc 10 (drop patch)
> - correct the signal handler registration bt-agent
> 
> Other changes:
> - remove incorrectly handled error argument from device_* calls
> - add UUID for SIMAccess
> 
> Signed-off-by: Jan Havran <havran.jan at email.cz>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
>  .../bluez-tools/0001-fix-gcc-10-compile.patch | 46 -------------------
>  package/bluez-tools/bluez-tools.hash          |  2 +-
>  package/bluez-tools/bluez-tools.mk            |  2 +-
>  3 files changed, 2 insertions(+), 48 deletions(-)
>  delete mode 100644 package/bluez-tools/0001-fix-gcc-10-compile.patch
> 
> diff --git a/package/bluez-tools/0001-fix-gcc-10-compile.patch b/package/bluez-tools/0001-fix-gcc-10-compile.patch
> deleted file mode 100644
> index 028c2db69d..0000000000
> --- a/package/bluez-tools/0001-fix-gcc-10-compile.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 687105d611b38961f390f0a328f9cfa3b93aeb18 Mon Sep 17 00:00:00 2001
> -From: Leigh Scott <leigh123linux at gmail.com>
> -Date: Tue, 28 Jan 2020 22:46:37 +0000
> -Subject: [PATCH] fix gcc-10 compile
> -
> -[Retrieved from:
> -https://github.com/khvzak/bluez-tools/pull/34/commits/687105d611b38961f390f0a328f9cfa3b93aeb18]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ----
> - src/lib/agent-helper.c | 2 ++
> - src/lib/agent-helper.h | 4 ++--
> - 2 files changed, 4 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c
> -index bf50bcc..2b94100 100644
> ---- a/src/lib/agent-helper.c
> -+++ b/src/lib/agent-helper.c
> -@@ -33,6 +33,8 @@
> - 
> - #include "agent-helper.h"
> - 
> -+gboolean agent_need_unregister;
> -+
> - static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" 
>  type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
> - static guint _bt_agent_registration_id = 0;
> - static GHashTable *_pin_hash_table = NULL;
> -diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h
> -index 8e1cc85..9a952c4 100644
> ---- a/src/lib/agent-helper.h
> -+++ b/src/lib/agent-helper.h
> -@@ -35,7 +35,7 @@ extern "C" {
> - #define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
> - #define AGENT_PATH "/org/blueztools"
> - 
> --gboolean agent_need_unregister;
> -+extern gboolean agent_need_unregister;
> - 
> - void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
> - void unregister_agent_callbacks(GError **error);
> -@@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error);
> - }
> - #endif
> - 
> --#endif /* __AGENT_HELPER_H */
> -\ No newline at end of file
> -+#endif /* __AGENT_HELPER_H */
> diff --git a/package/bluez-tools/bluez-tools.hash b/package/bluez-tools/bluez-tools.hash
> index 808e5c6061..f013f195cb 100644
> --- a/package/bluez-tools/bluez-tools.hash
> +++ b/package/bluez-tools/bluez-tools.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f  bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz
> +sha256  dd5acf9e501514f4ad1136af966d2723f3270e0e2fffd6d29da93fa76c9fafa3  bluez-tools-f65321736475429316f07ee94ec0deac8e46ec4a.tar.gz
>  sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
> diff --git a/package/bluez-tools/bluez-tools.mk b/package/bluez-tools/bluez-tools.mk
> index c58701981a..007235958b 100644
> --- a/package/bluez-tools/bluez-tools.mk
> +++ b/package/bluez-tools/bluez-tools.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -BLUEZ_TOOLS_VERSION = 97efd293491ad7ec96a655665339908f2478b3d1
> +BLUEZ_TOOLS_VERSION = f65321736475429316f07ee94ec0deac8e46ec4a
>  BLUEZ_TOOLS_SITE = $(call github,khvzak,bluez-tools,$(BLUEZ_TOOLS_VERSION))
>  
>  # sources fetched from github, no configure script)
>