Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2021-12-01 20:46:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez" Wed Dec 1 20:46:21 2021 rev:183 rq:934690 version:5.62 Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2021-10-30 23:13:09.763027761 +0200 +++ /work/SRC/openSUSE:Factory/.bluez.new.31177/bluez.changes 2021-12-02 02:10:31.663527587 +0100 @@ -1,0 +2,13 @@ +Tue Nov 23 09:52:32 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com> + +- Stop nuking the obex service, we support user systemd services + just fine now. Following this, no longer hack the dbus service, + leave it as a systemd service as upstream intended. +- Split out obex in own package with it's needed enabledment as a + systemd user service. +- Add 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch: + 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. Patch from fedora. + +------------------------------------------------------------------- New: ---- 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.tfWu3v/_old 2021-12-02 02:10:32.275525721 +0100 +++ /var/tmp/diff_new_pack.tfWu3v/_new 2021-12-02 02:10:32.279525708 +0100 @@ -53,6 +53,9 @@ # # Move 43xx firmware path for RPi3 bluetooth support bsc#1140688 Patch10: RPi-Move-the-43xx-firmware-into-lib-firmware.patch +# +# 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 # Upstream suggests to use btmon instead of hcidump and does not want those patches # => PATCH-FIX-OPENSUSE for those two :-) # fix some memory leak with malformed packet (reported upstream but not yet fixed) @@ -184,15 +187,20 @@ to use the modern tools instead. %endif +%package obexd +Summary: Object Exchange daemon for sharing content +License: GPL-2.0-or-later +Group: Hardware/Mobile +Requires: bluez = %{version} + +%description obexd +Object Exchange daemon for sharing content. + %prep %setup -q %autopatch -p1 mkdir dbus-apis cp -a doc/*.txt dbus-apis/ -# FIXME: Change the dbus service to be a real service, not systemd launched -sed -i "s:Exec=/bin/false:Exec=%{_libexecdir}/bluetooth/obexd:g" obexd/src/org.bluez.obex.service -sed -i "/SystemdService=.*/d" obexd/src/org.bluez.obex.service -# END FIXME # for auto-enable subpackage sed -i '/^#AutoEnable=false/aAutoEnable=true' src/main.conf @@ -242,10 +250,6 @@ # no idea why this is suddenly necessary... install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth -# FIXME: Do not delete the systemd service once we support systemd user/session services -rm %{buildroot}%{_userunitdir}/obex.service -# end FIXME - ## same as in fedora... # "make install" fails to install gatttool, used with Bluetooth Low Energy # boo#970628 @@ -318,6 +322,18 @@ %post -n libbluetooth3 -p /sbin/ldconfig %postun -n libbluetooth3 -p /sbin/ldconfig +%pre obexd +%systemd_user_pre obex.service + +%post obexd +%systemd_user_post obex.service + +%preun obexd +%systemd_user_preun obex.service + +%postun obexd +%systemd_user_postun obex.service + %files %doc AUTHORS ChangeLog README dbus-apis src/main.conf %if %{with mesh} @@ -339,7 +355,6 @@ %{_bindir}/mesh-cfgtest %{_mandir}/man8/bluetooth-meshd.8%{?ext_man} %endif -%{_libexecdir}/bluetooth/obexd %{_bindir}/bluetoothctl %{_bindir}/btmon %if %{with mesh} @@ -364,11 +379,15 @@ %{_unitdir}/bluetooth-mesh.service %endif %{_datadir}/dbus-1/system-services/org.bluez.service -%{_datadir}/dbus-1/services/org.bluez.obex.service # not packaged, boo#1151518 ###%%{_datadir}/dbus-1/system-services/org.bluez.mesh.service %{_datadir}/zsh/site-functions/_bluetoothctl +%files obexd +%{_libexecdir}/bluetooth/obexd +%{_datadir}/dbus-1/services/org.bluez.obex.service +%{_userunitdir}/obex.service + %if %{with bluez_deprecated} %files deprecated %{_bindir}/gatttool ++++++ 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch ++++++ >From 90b72b787a6ae6b9b0bf8ece238e108e8607a433 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <had...@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
