Accepting request 1103450 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1103450
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=194

0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch

@@ -1,38 +0,0 @@
-From 90b72b787a6ae6b9b0bf8ece238e108e8607a433 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 9 Nov 2013 18:13:43 +0100
-Subject: [PATCH 1/2] obex: Use GLib helper function to manipulate paths
-
-Instead of trying to do it by hand. This also makes sure that
-relative paths aren't used by the agent.
----
- obexd/src/manager.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-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,
- 				DBUS_TYPE_INVALID)) {
- 		/* Splits folder and name */
--		const char *slash = strrchr(name, '/');
-+		gboolean is_relative = !g_path_is_absolute(name);
- 		DBG("Agent replied with %s", name);
--		if (!slash) {
--			agent->new_name = g_strdup(name);
-+		if (is_relative) {
-+			agent->new_name = g_path_get_basename(name);
- 			agent->new_folder = 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);
- 		}
- 	}
- 
--- 
-2.14.1
-

bluez-5.66.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574
-size 2257288

bluez-disable-broken-tests.diff

@@ -2,26 +2,6 @@ Index: bluez-5.65/Makefile.am
 ===================================================================
 --- bluez-5.65.orig/Makefile.am
 +++ bluez-5.65/Makefile.am
-@@ -532,7 +532,8 @@ unit_test_lib_SOURCES = unit/test-lib.c
- unit_test_lib_LDADD = src/libshared-glib.la \
- 				lib/libbluetooth-internal.la $(GLIB_LIBS)
- 
--unit_tests += unit/test-gatt
-+# hangs forever in OBS where AF_ALG is not supported.
-+#unit_tests += unit/test-gatt
- 
- unit_test_gatt_SOURCES = unit/test-gatt.c
- unit_test_gatt_LDADD = src/libshared-glib.la \
-@@ -562,7 +563,8 @@ unit_test_gattrib_LDADD = lib/libbluetoo
- 			$(GLIB_LIBS) $(DBUS_LIBS) -ldl -lrt
- 
- if MIDI
--unit_tests += unit/test-midi
-+# fails on i386??? or just random?
-+#unit_tests += unit/test-midi
- unit_test_midi_CPPFLAGS = $(AM_CPPFLAGS) $(ALSA_CFLAGS) -DMIDI_TEST
- unit_test_midi_SOURCES = unit/test-midi.c \
- 			profiles/midi/libmidi.h \
 @@ -572,7 +574,7 @@ unit_test_midi_LDADD = src/libshared-gli
  endif
  

bluez.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri Aug 11 07:11:10 UTC 2023 - Joey Lee <jlee@suse.com>
+
+- 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch be
+  removed by Timo Jyrinki when updating to 5.68. I saw some reasons:
+    - Upstream didn't take this patch:
+      https://www.spinics.net/lists/linux-bluetooth/msg40136.html
+    - Fedora also marked this patch in bluez.spec since bluez-5.68-2.fc39
+      https://src.fedoraproject.org/rpms/bluez/blob/2b133d795f4f823c8b22ef5a07569792ad7ce6aa/f/bluez.spec
+  We didn't put any bug number of this patch when it be introduced
+  to bluez.spec since Nov 23, 2021. So, let's remove this patch unless
+  upstream or Fedora add it back.
+
+-------------------------------------------------------------------
+Thu Aug 10 10:14:31 UTC 2023 - Timo Jyrinki <tjyrinki@suse.com>
+
+- update to 5.68
+  * Fix issue with A2DP and handling of Transport.Acquire.
+  * Fix issue with BAP and initiating QoS and Enable procedures.
+  * Fix issue with BAP and detaching streams when PAC is removed.
+  * Fix issue with BAP and reading all instances of PAC.
+  * Fix issue with BAP and not being able to reconfigure.
+  * Fix issue with BAP and transport configuration changes.
+  * Fix issue with BAP and handling unexpected disconnect.
+  * Fix issue with GATT and not removing pending services.
+  * Fix issue with GATT and client ready handling.
+  * Fix issue with handling fallback to transient hostname.
+  * Add support for SecureConnections configuration option.
+  * Add support for Mesh Remove Provisioning.
+  * Add support for Mesh Private Beacons.
+- Remove patches that are not needed with the new upstream.
+
 -------------------------------------------------------------------
 Wed Nov 16 12:41:37 UTC 2022 - Stefan Seyfried <seife+obs@b1-systems.com>
 

bluez.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bluez
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2010-2020 B1 Systems GmbH, Vohburg, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -31,7 +31,7 @@
 %global modprobe_d_files 50-bluetooth.conf
 
 Name:           bluez
-Version:        5.66
+Version:        5.68
 Release:        0
 Summary:        Bluetooth Stack for Linux
 License:        GPL-2.0-or-later
@@ -50,9 +50,6 @@ Patch2:         bluez-sdp-unix-path.patch
 Patch3:         bluez-cups-libexec.patch
 # workaround for broken tests (reported upstream but not yet fixed)
 Patch4:         bluez-disable-broken-tests.diff
-#
-# PATCH-FIX-UPSTREAM 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch -- obex: Use GLib helper function to manipulate paths
-Patch11:        https://src.fedoraproject.org/rpms/bluez/raw/rawhide/f/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
 # disable tests for bypass boo#1078285
 Patch12:        disable_some_obex_tests.patch
 # get rid of python2. WARNING: this is autogenerated by 2to3 and might not work