From 2930cd379c43a05023f0f2c869ec30d8e407e9c7 Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Fri, 27 Sep 2019 14:47:47 +0300 Subject: [PATCH 1/7] Updated to 5.51 --- ...d-without-systemd-in-the-user-sessio.patch | 34 ------------------- ...d-without-systemd-in-the-user-sessio.patch | 34 +++++++++++++++++++ bluez.spec | 14 ++++++-- 3 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch create mode 100644 bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch diff --git a/bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch b/bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch deleted file mode 100644 index e52d12c..0000000 --- a/bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN bluez-5.50/Makefile.obexd bluez-5.50-patched/Makefile.obexd ---- bluez-5.50/Makefile.obexd 2018-06-01 11:37:35.000000000 +0300 -+++ bluez-5.50-patched/Makefile.obexd 2018-06-05 09:28:26.537699230 +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.50/obexd/src/org.bluez.obex.service bluez-5.50-patched/obexd/src/org.bluez.obex.service ---- bluez-5.50/obexd/src/org.bluez.obex.service 2012-12-24 21:46:55.000000000 +0400 -+++ bluez-5.50-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.50/obexd/src/org.bluez.obex.service.in bluez-5.50-patched/obexd/src/org.bluez.obex.service.in ---- bluez-5.50/obexd/src/org.bluez.obex.service.in 1970-01-01 03:00:00.000000000 +0300 -+++ bluez-5.50-patched/obexd/src/org.bluez.obex.service.in 2018-06-05 09:30:29.454367592 +0300 -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service diff --git a/bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch b/bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch new file mode 100644 index 0000000..c452bb3 --- /dev/null +++ b/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 diff --git a/bluez.spec b/bluez.spec index e71bcb3..796cf51 100644 --- a/bluez.spec +++ b/bluez.spec @@ -4,8 +4,8 @@ Summary: Official Linux Bluetooth protocol stack Name: bluez -Version: 5.50 -Release: 11 +Version: 5.51 +Release: 1 License: GPLv2+ Group: Communications Url: http://www.bluez.org/ @@ -21,7 +21,7 @@ Patch0: bluez-5.36-systemd-conditional.patch ## Ubuntu patches Patch1: 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch # Non-upstream -Patch2: bluez-5.50-allow-using-obexd-without-systemd-in-the-user-sessio.patch +Patch2: bluez-5.51-allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch4: 0004-agent-Assert-possible-infinite-loop.patch BuildRequires: bison @@ -31,6 +31,7 @@ BuildRequires: elfutils-devel BuildRequires: readline-devel BuildRequires: sbc-devel BuildRequires: speexdsp-devel +BuildRequires: json-c-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(expat) @@ -62,12 +63,14 @@ These are the official Bluetooth communication libraries for Linux. %{_bindir}/hcitool %{_bindir}/hex2hcd %{_bindir}/l2ping +%{_bindir}/meshctl %{_bindir}/mpris-proxy %{_bindir}/rfcomm %{_bindir}/sdptool %{_libexecdir}/bluetooth/bluetoothd %{_libexecdir}/bluetooth/obexd %{_unitdir}/bluetooth-logger.service +%{_unitdir}/bluetooth-mesh.service %{_unitdir}/bluetooth.service %{_unitdir}/dbus-org.bluez.service %{_userunitdir}/obex.service @@ -87,10 +90,13 @@ These are the official Bluetooth communication libraries for Linux. %config(noreplace) %{_sysconfdir}/dbus-1/system.d/*.conf %config(noreplace) %{_sysconfdir}/bluetooth %{_datadir}/dbus-1/system-services/org.bluez.service +%{_datadir}/dbus-1/system-services/org.bluez.mesh.service %{_datadir}/dbus-1/services/org.bluez.obex.service +%{_datadir}/zsh/site-functions/_bluetoothctl %{_localstatedir}/lib/bluetooth %dir %{_libdir}/bluetooth %{_libdir}/bluetooth/btmon-logger +%{_libdir}/bluetooth/bluetooth-meshd %dir %{_libdir}/bluetooth/plugins %{_libdir}/bluetooth/plugins/sixaxis.so %{_udevrulesdir}/97-bluetooth.rules @@ -230,6 +236,8 @@ autoreconf -fi --enable-obex \ --enable-client \ --enable-systemd \ + --enable-mesh \ + --enable-btpclient \ --with-systemdsystemunitdir=%{_unitdir} \ --with-systemduserunitdir=%{_userunitdir} \ --with-udevdir=/lib/udev \ From b8b0a0b3caee2be5ac1f784876f340926bce4bae Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Fri, 27 Sep 2019 14:48:19 +0300 Subject: [PATCH 2/7] Updated to 5.51 --- .abf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.abf.yml b/.abf.yml index ea43ed2..208d897 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - bluez-5.50.tar.xz: a59289c91ccb7fac248e916838d4e66d7936151e + bluez-5.51.tar.xz: d958fa2fe8aa4b592e8a967f73b8379a8102339c From 85dd96203e0de0b23b7612283df4fa1da1c4be04 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 02:57:22 +0300 Subject: [PATCH 3/7] bot: rpm5 -> rpm4 (1) --- bluez.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bluez.spec b/bluez.spec index 796cf51..7f37fa4 100644 --- a/bluez.spec +++ b/bluez.spec @@ -43,7 +43,7 @@ BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) >= 186 Requires(pre): rpm-helper -Suggests: obex-data-server +Recommends: obex-data-server Obsoletes: bluez-alsa < 5.0 Obsoletes: bluez-gstreamer < 5.0 @@ -217,7 +217,7 @@ libtoolize -f -c autoreconf -fi %build -%configure2_5x \ +%configure \ --prefix=/usr \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ @@ -253,7 +253,7 @@ autoreconf -fi %make %install -%makeinstall_std rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev +%make_install rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev mkdir -p %{buildroot}%{_sysconfdir}/bluetooth echo "1234" > %{buildroot}%{_sysconfdir}/bluetooth/pin From 14301b2b6b913093e2f5a2f1549204585cd59159 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 20:00:33 +0300 Subject: [PATCH 4/7] bot: rpm5 -> rpm4 (2) --- bluez.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluez.spec b/bluez.spec index 7f37fa4..cdc3653 100644 --- a/bluez.spec +++ b/bluez.spec @@ -250,7 +250,7 @@ autoreconf -fi --enable-input \ --enable-health -%make +%make_build %install %make_install rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev From c74e63a18e5d21aba8c796e922567ecdaaa40144 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 6 Jan 2020 02:37:01 +0300 Subject: [PATCH 5/7] bot: rpm5 -> rpm4 (4) --- bluez.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/bluez.spec b/bluez.spec index cdc3653..0cfda40 100644 --- a/bluez.spec +++ b/bluez.spec @@ -284,4 +284,3 @@ ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf -%changelog From 42908f196e449a5e993ca21132dfaf9c014666ea Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 6 Jan 2020 03:55:27 +0300 Subject: [PATCH 6/7] bot: rpm5 -> rpm4 (5) --- bluez.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/bluez.spec b/bluez.spec index 0cfda40..cda3c36 100644 --- a/bluez.spec +++ b/bluez.spec @@ -283,4 +283,3 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf - From 72cd49c335053c836d3f9e15601ac2107ed09ccb Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 14:30:31 +0300 Subject: [PATCH 7/7] bot: rpm5 -> rpm4 (8) --- bluez.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bluez.spec b/bluez.spec index cda3c36..bc9cee5 100644 --- a/bluez.spec +++ b/bluez.spec @@ -250,10 +250,10 @@ autoreconf -fi --enable-input \ --enable-health -%make_build +%make %install -%make_install rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev +%makeinstall_std rulesdir=%{_sysconfdir}/udev/rules.d udevdir=/lib/udev mkdir -p %{buildroot}%{_sysconfdir}/bluetooth echo "1234" > %{buildroot}%{_sysconfdir}/bluetooth/pin