[maemo-commits] [maemo-commits] r15698 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-06-28 01:04:04 +0300 (Sat, 28 Jun 2008)
New Revision: 15698

Modified:
   projects/haf/trunk/dbus/debian/patches/02-allow-all-in-session.patch
   projects/haf/trunk/dbus/debian/patches/04-no-fork.patch
   projects/haf/trunk/dbus/debian/patches/05-static-bus-address.patch
Log:
Add comments about hacks that need to go


Modified: projects/haf/trunk/dbus/debian/patches/02-allow-all-in-session.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/02-allow-all-in-session.patch	2008-06-27 21:58:53 UTC (rev 15697)
+++ projects/haf/trunk/dbus/debian/patches/02-allow-all-in-session.patch	2008-06-27 22:04:04 UTC (rev 15698)
@@ -1,12 +1,12 @@
 Index: b/bus/session.conf.in
 ===================================================================
 --- a/bus/session.conf.in	2008-04-04 18:24:08.000000000 +0300
-+++ b/bus/session.conf.in	2008-06-09 20:12:05.000000000 +0300
++++ b/bus/session.conf.in	2008-06-28 00:11:54.000000000 +0300
 @@ -19,6 +19,8 @@
      <allow eavesdrop="true"/>
      <!-- Allow anyone to own anything -->
      <allow own="*"/>
-+    <!-- allow all users to connect -->
++    <!-- XXX: Allow all users to connect -->
 +    <allow user="*"/>
    </policy>
  

Modified: projects/haf/trunk/dbus/debian/patches/04-no-fork.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/04-no-fork.patch	2008-06-27 21:58:53 UTC (rev 15697)
+++ projects/haf/trunk/dbus/debian/patches/04-no-fork.patch	2008-06-27 22:04:04 UTC (rev 15698)
@@ -1,12 +1,13 @@
 Index: b/bus/system.conf.in
 ===================================================================
---- a/bus/system.conf.in	2008-06-09 20:12:11.000000000 +0300
-+++ b/bus/system.conf.in	2008-06-09 20:12:15.000000000 +0300
-@@ -18,7 +18,7 @@
+--- a/bus/system.conf.in	2008-04-04 18:24:08.000000000 +0300
++++ b/bus/system.conf.in	2008-06-28 00:58:14.000000000 +0300
+@@ -18,7 +18,8 @@
    <user>@DBUS_USER@</user>
  
    <!-- Fork into daemon mode -->
 -  <fork/>
++  <!-- XXX: DSME does not like this, disabled for Maemo -->
 +  <!-- <fork/> -->
  
    <!-- We use system service launching using a helper -->

Modified: projects/haf/trunk/dbus/debian/patches/05-static-bus-address.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/05-static-bus-address.patch	2008-06-27 21:58:53 UTC (rev 15697)
+++ projects/haf/trunk/dbus/debian/patches/05-static-bus-address.patch	2008-06-27 22:04:04 UTC (rev 15698)
@@ -1,12 +1,13 @@
 Index: b/bus/session.conf.in
 ===================================================================
---- a/bus/session.conf.in	2008-06-09 20:12:05.000000000 +0300
-+++ b/bus/session.conf.in	2008-06-09 20:12:19.000000000 +0300
-@@ -8,7 +8,7 @@
+--- a/bus/session.conf.in	2008-06-28 00:11:54.000000000 +0300
++++ b/bus/session.conf.in	2008-06-28 00:21:11.000000000 +0300
+@@ -8,7 +8,8 @@
    <!-- Our well-known bus type, don't change this -->
    <type>session</type>
  
 -  <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
++  <!-- XXX: This hack needs to go -->
 +  <listen>unix:path=/tmp/session_bus_socket</listen>
  
    <standard_session_servicedirs />