Revert version 5.48

bluetooth.conf.patch

@@ -1,21 +0,0 @@
-Description: Add permission to bluetooth control for user into bluetooth 
-Forwarded: not-needed
-Origin: vendor
-Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
-
-Index: bluez/src/bluetooth.conf
-===================================================================
---- bluez.orig/src/bluetooth.conf
-+++ bluez/src/bluetooth.conf
-@@ -21,6 +21,11 @@
-     <allow send_interface="org.freedesktop.DBus.Properties"/>
-   </policy>
- 
-+  <!-- allow users of bluetooth group to communicate -->
-+  <policy group="bluetooth">
-+    <allow send_destination="org.bluez"/>
-+  </policy>
-+
-   <policy at_console="true">
-     <allow send_destination="org.bluez"/>
-   </policy>

bluez-5.36-systemd-conditional.patch

@@ -0,0 +1,38 @@
+From 488fd81a0f9cb193a733ac03fba0a80c145868c9 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 20 Oct 2015 12:24:45 +0200
+Subject: systemd: Check if bluetooth is supported in the kernel
+
+When running a kernel without bluetooth support, bluetooth.service fails to
+start with
+
+    bluetoothd[1640]: Failed to access management interface
+    bluetoothd[1640]: Adapter handling initialization failed
+    systemd[1]: bluetooth.service: Main process exited, code=exited, status=1/FAILURE
+    systemd[1]: Failed to start Bluetooth service.
+
+This causes an unnecessary "degraded" state and more importantly breaks package
+installation when the bluez package auto-starts the daemon.
+
+Add a condition to only start the service if /sys/class/bluetooth exists.
+
+https://launchpad.net/bugs/1506774
+---
+ src/bluetooth.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
+index 35e9457..83e4732 100644
+--- a/src/bluetooth.service.in
++++ b/src/bluetooth.service.in
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Bluetooth service
+ Documentation=man:bluetoothd(8)
++ConditionPathIsDirectory=/sys/class/bluetooth
+ 
+ [Service]
+ Type=dbus
+-- 
+cgit v0.11.2
+

bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch

@@ -0,0 +1,34 @@
+diff -urN bluez-5.51/Makefile.obexd bluez-5.51-patched/Makefile.obexd
+--- bluez-5.51/Makefile.obexd	2019-09-19 21:51:02.000000000 +0300
++++ bluez-5.51-patched/Makefile.obexd	2019-09-27 13:42:04.437366618 +0300
+@@ -1,12 +1,12 @@
+ if SYSTEMD
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ if OBEX
+ 
+diff -urN bluez-5.51/obexd/src/org.bluez.obex.service bluez-5.51-patched/obexd/src/org.bluez.obex.service
+--- bluez-5.51/obexd/src/org.bluez.obex.service	2012-12-24 21:46:55.000000000 +0400
++++ bluez-5.51-patched/obexd/src/org.bluez.obex.service	1970-01-01 03:00:00.000000000 +0300
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff -urN bluez-5.51/obexd/src/org.bluez.obex.service.in bluez-5.51-patched/obexd/src/org.bluez.obex.service.in
+--- bluez-5.51/obexd/src/org.bluez.obex.service.in	1970-01-01 03:00:00.000000000 +0300
++++ bluez-5.51-patched/obexd/src/org.bluez.obex.service.in	2019-09-27 13:43:58.700696733 +0300
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service

bluez.spec

@@ -5,7 +5,7 @@
 Summary:	Official Linux Bluetooth protocol stack
 Name:		bluez
 Version:	5.48
-Release:	1
+Release:	2
 Epoch:      1
 License:	GPLv2+
 Group:		Communications
@@ -19,12 +19,13 @@ Source5:	97-bluetooth.rules
 Source10:	bluez-uinput.modules
 # Revert this commit, it leads to huge delay on boot in Plasma 5
 Patch0: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-Patch1: bluetooth.conf.patch
+Patch1: bluez-5.36-systemd-conditional.patch
 Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-Patch4: change_path_of_hogsuspend.patch
+Patch4: bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch
 Patch5: fix-lp1750308-upstream-commit-1bf03369.patch
 Patch6: fix_build_with_5.2-rc2_kernel_headers.patch
+Patch7: 0004-agent-Assert-possible-infinite-loop.patch
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	cups-devel
@@ -41,6 +42,7 @@ BuildRequires:	pkgconfig(udev) >= 186
 Requires(pre):	rpm-helper
 Obsoletes:	bluez-alsa < 5.0
 Obsoletes:	bluez-gstreamer < 5.0
+Suggests:	obex-data-server
 
 %description
 These are the official Bluetooth communication libraries for Linux.
@@ -202,6 +204,7 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 autoreconf -vfi

change_path_of_hogsuspend.patch

@@ -1,17 +0,0 @@
-Description: Move path of hogsuspend to /run.
-Forwarded: not-needed
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/759188
-Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
-
---- a/profiles/input/suspend-dummy.c	2014-08-26 12:00:40.006495551 +0900
-+++ b/profiles/input/suspend-dummy.c	2014-08-26 12:01:37.658496141 +0900
-@@ -40,7 +40,7 @@
- #include "src/log.h"
- #include "suspend.h"
- 
--#define HOG_SUSPEND_FIFO	"/tmp/hogsuspend"
-+#define HOG_SUSPEND_FIFO	"/run/hogsuspend"
- 
- static suspend_event suspend_cb = NULL;
- static resume_event resume_cb = NULL;