[Pkg-bluetooth-commits] r1434 - in /packages/bluez/trunk/debian: changelog patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch patches/series

iwamatsu at users.alioth.debian.org iwamatsu at users.alioth.debian.org
Tue Jul 22 05:52:21 UTC 2014 

Author: iwamatsu
Date: Tue Jul 22 05:52:20 2014
New Revision: 1434

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1434
Log:
Add support user session of obexd. (Closes: #754675)


Added:
    packages/bluez/trunk/debian/patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
    packages/bluez/trunk/debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
Modified:
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/patches/series

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1434&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog	(original)
+++ packages/bluez/trunk/debian/changelog	Tue Jul 22 05:52:20 2014
@@ -2,6 +2,9 @@
 
   * Fix FTBFS with C99. (Closes: #755345)
     Add patches/fix_ftbfs_with_c99.patch.
+  * Add support user session of obexd. (Closes: #754675)
+    Add patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+    and patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch.
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Tue, 22 Jul 2014 09:25:12 +0900
 

Added: packages/bluez/trunk/debian/patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch?rev=1434&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch	(added)
+++ packages/bluez/trunk/debian/patches/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch	Tue Jul 22 05:52:20 2014
@@ -0,0 +1,59 @@
+http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw at public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,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
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1

Added: packages/bluez/trunk/debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch?rev=1434&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch	(added)
+++ packages/bluez/trunk/debian/patches/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch	Tue Jul 22 05:52:20 2014
@@ -0,0 +1,38 @@
+From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Sat, 9 Nov 2013 18:13:43 +0100
+Subject: [PATCH 1/5] 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 cec8a39..f18896e 100644
+--- a/obexd/src/manager.c
++++ b/obexd/src/manager.c
+@@ -651,14 +651,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);
+ 		}
+ 	}
+ 
+-- 
+1.8.4.2
+

Modified: packages/bluez/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/series?rev=1434&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/series	(original)
+++ packages/bluez/trunk/debian/patches/series	Tue Jul 22 05:52:20 2014
@@ -1,3 +1,5 @@
 0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
 bluetooth.conf.patch
 fix_ftbfs_with_c99.patch
+0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch

More information about the Pkg-bluetooth-commits mailing list