From 6c23bed1ab6b5b583dffb147919d1acad7fcdd2a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 20:51:20 +0100
Subject: [PATCH] try to fix some kind of problems installing files to load
 btusb with reset=1 and load module crypto_user [release 5.63-2mamba;Fri Jan
 21 2022]

---
 bluetooth.modprobe |  3 +++
 bluez.spec         | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 bluetooth.modprobe

diff --git a/bluetooth.modprobe b/bluetooth.modprobe
new file mode 100644
index 0000000..3072d78
--- /dev/null
+++ b/bluetooth.modprobe
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
diff --git a/bluez.spec b/bluez.spec
index 3953cfa..5686a2a 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,6 +1,6 @@
 Name:          bluez
 Version:       5.63
-Release:       1mamba
+Release:       2mamba
 Summary:       Userspace tools for the Bluetooth wireless library for Linux
 Group:         Applications/Communication 
 Vendor:        openmamba
@@ -8,6 +8,7 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.bluez.org/
 Source:        http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.gz
+Source1:       bluetooth.modprobe
 Patch0:        bluez5-5.41-mode-43xx-firmware-into-lib-firmware.patch
 Patch1:        bluez5-5.41-bcm43xx-Add-bcm43xx-3wire-variant.patch
 Patch2:        bluez5-5.41-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
@@ -98,6 +99,17 @@ for f in network input; do
    install -D -m0644 profiles/$f/$f.conf %{buildroot}%{_sysconfdir}/bluetooth/$f.conf
 done
 
+# fix module loading errors
+install -D -m0644 %{SOURCE1} %{buildroot}%{_modprobedir}/bluetooth-usb.conf
+
+# load module at system start required by some functions
+# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+install -dm755 %{buildroot}%{_modulesloaddir}
+echo "crypto_user" > %{buildroot}%{_modulesloaddir}/bluez.conf
+
+# fix obex file transfer - https://bugs.archlinux.org/task/45816
+ln -fs obex.service %{buildroot}%{_userunitdir}/dbus-org.bluez.obex.service
+  
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -124,7 +136,7 @@ fi
 find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 :
 
-%post   -n libbluetooth -p /sbin/ldconfig
+%post -n libbluetooth -p /sbin/ldconfig
 %postun -n libbluetooth -p /sbin/ldconfig
 
 %files
@@ -140,7 +152,10 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %{_unitdir}/bluetooth.service
 %{_unitdir}/bluetooth-mesh.service
 %{_udevrulesdir}/97-hid2hci.rules
+%{_modprobedir}/bluetooth-usb.conf
+%{_modulesloaddir}/bluez.conf
 %{_userunitdir}/obex.service
+%{_userunitdir}/dbus-org.bluez.obex.service
 %{_libdir}/cups/backend/bluetooth
 %{_datadir}/zsh/site-functions/_bluetoothctl
 %{_datadir}/dbus-1/services/org.bluez.obex.service
@@ -166,6 +181,9 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %doc ChangeLog README
 
 %changelog
+* Fri Jan 21 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.63-2mamba
+- try to fix some kind of problems installing files to load btusb with reset=1 and load module crypto_user
+
 * Fri Jan 07 2022 Automatic Build System <autodist@mambasoft.it> 5.63-1mamba
 - automatic version update by autodist