rpms/telepathy-gabble/OLPC-4 gabble-chmod-unix-socket.patch, NONE, 1.1 gabble-olpc-no-dbus-uid-check.patch, NONE, 1.1 telepathy-gabble.spec, 1.42, 1.43

[Morgan Collett]

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15486

Modified Files:
	telepathy-gabble.spec 
Added Files:
	gabble-chmod-unix-socket.patch 
	gabble-olpc-no-dbus-uid-check.patch 
Log Message:
Add back rainbow patches

gabble-chmod-unix-socket.patch:

--- NEW FILE gabble-chmod-unix-socket.patch ---
diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c
--- old-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
+++ new-telepathy-gabble-rainbow/src/tube-stream.c	2007-12-11 16:28:48.000000000 +0100
@@ -650,6 +650,9 @@
               "Error binding socket: %s", g_strerror (errno));
           return FALSE;
         }
+
+      /* Everyone can use the socket */
+      chmod (addr.sun_path, 0777);
     }
   else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4)
     {


gabble-olpc-no-dbus-uid-check.patch:

--- NEW FILE gabble-olpc-no-dbus-uid-check.patch ---
diff -rN -up old-telepathy-gabble/src/tube-dbus.c new-telepathy-gabble/src/tube-dbus.c
--- old-telepathy-gabble/src/tube-dbus.c	2007-11-15 13:39:37.923570564 -0500
+++ new-telepathy-gabble/src/tube-dbus.c	2007-11-15 13:39:37.923570564 -0500
@@ -216,6 +216,14 @@ out:
   return DBUS_HANDLER_RESULT_HANDLED;
 }
 
+static dbus_bool_t
+allow_all_connections (DBusConnection *conn,
+                       unsigned long uid,
+                       void *data)
+{
+  return TRUE;
+}
+
 static void
 new_connection_cb (DBusServer *server,
                    DBusConnection *conn,
@@ -234,6 +242,13 @@ new_connection_cb (DBusServer *server,
   dbus_connection_ref (conn);
   dbus_connection_setup_with_g_main (conn, NULL);
   dbus_connection_add_filter (conn, filter_cb, tube, NULL);
+
+  /* OLPC have a security system making applications running under
+   * a different uid than Gabble. So we have to explicitely allow connections
+   * from all uid. */
+  dbus_connection_set_unix_user_function (conn, allow_all_connections,
+      NULL, NULL);
+
   priv->dbus_conn = conn;
 }
 



Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-4/telepathy-gabble.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- telepathy-gabble.spec	23 Oct 2008 19:23:47 -0000	1.42
+++ telepathy-gabble.spec	27 Nov 2008 10:40:03 -0000	1.43
@@ -1,6 +1,6 @@
 Name:           telepathy-gabble
 Version:        0.7.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -8,6 +8,9 @@
 License:        LGPLv2+ and (BSD)
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:         gabble-olpc-no-dbus-uid-check.patch
+Patch1:         gabble-chmod-unix-socket.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
@@ -28,7 +31,8 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .dbus-uid
+%patch1 -p1 -b .chmod-socket
 
 %build
 %configure
@@ -57,6 +61,9 @@
 
 
 %changelog
+* Thu Nov 27 2008 Morgan Collett <morgan.collett at gmail.com> - 0.7.12-2
+- Add rainbow patches for OLPC
+
 * Thu Oct 23 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.12-1
 - Update to 0.7.12.