[packages/bluez] up to 5.68

atler atler at pld-linux.org
Sun Jul 2 02:17:49 CEST 2023


commit 7e96ad71aa1e8605104afdf14273e6ac42d0f510
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jul 2 00:17:57 2023 +0200

    up to 5.68
    
    - update obex patch to follow new bluez logic when absolute path ends
      with '/' (use entire path as folder name then) and otherwise behave
      the same as before

 ...e-GLib-helper-function-to-manipulate-paths.patch | 21 ++++++++++++---------
 bluez.spec                                          |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/bluez.spec b/bluez.spec
index e9b70ea..63f7fc8 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -8,12 +8,12 @@
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
-Version:	5.66
+Version:	5.68
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
-# Source0-md5:	3f9496fedf878fba985e56713ed7752e
+# Source0-md5:	00a72fed12e706b2d8bb40786154d3aa
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
diff --git a/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
index f79d3ad..1f3b4d3 100644
--- a/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+++ b/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
@@ -13,11 +13,10 @@ diff --git a/obexd/src/manager.c b/obexd/src/manager.c
 index f84384ae4..285c07c37 100644
 --- a/obexd/src/manager.c
 +++ b/obexd/src/manager.c
-@@ -650,14 +650,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
- 				DBUS_TYPE_STRING, &name,
+@@ -645,16 +645,19 @@
  				DBUS_TYPE_INVALID)) {
  		/* Splits folder and name */
--		const char *slash = strrchr(name, '/');
+ 		const char *slash = strrchr(name, '/');
 +		gboolean is_relative = !g_path_is_absolute(name);
  		DBG("Agent replied with %s", name);
 -		if (!slash) {
@@ -26,13 +25,17 @@ index f84384ae4..285c07c37 100644
 +			agent->new_name = g_path_get_basename(name);
  			agent->new_folder = NULL;
  		} else {
--			agent->new_name = g_strdup(slash + 1);
+-			if (strlen(slash) == 1)
++			if (slash && strlen(slash) == 1) {
+ 				agent->new_name = NULL;
+-			else
+-				agent->new_name = g_strdup(slash + 1);
 -			agent->new_folder = g_strndup(name, slash - name);
-+			agent->new_name = g_path_get_basename(name);
-+			agent->new_folder = g_path_get_dirname(name);
++				agent->new_folder = g_strndup(name, slash - name);
++			} else {
++				agent->new_name = g_path_get_basename(name);
++				agent->new_folder = g_path_get_dirname(name);
++			}
  		}
  	}
  
--- 
-2.14.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bluez.git/commitdiff/7e96ad71aa1e8605104afdf14273e6ac42d0f510



More information about the pld-cvs-commit mailing list