rpms/telepathy-salut/OLPC-4 salut-chmod-unix-socket.patch, NONE, 1.1 salut-olpc-no-dbus-uid-check.patch, NONE, 1.1 telepathy-salut.spec, 1.20, 1.21

[Morgan Collett]

Author: morgan

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

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

salut-chmod-unix-socket.patch:

--- NEW FILE salut-chmod-unix-socket.patch ---
diff -rN -u old-telepathy-salut-rainbow/src/tube-stream.c new-telepathy-salut-rainbow/src/tube-stream.c
--- old-telepathy-salut-rainbow/src/tube-stream.c	2007-12-11 16:03:02.000000000 +0100
+++ new-telepathy-salut-rainbow/src/tube-stream.c	2007-12-11 16:03:02.000000000 +0100
@@ -637,6 +637,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)
     {


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

--- NEW FILE salut-olpc-no-dbus-uid-check.patch ---
diff -rN -up old-telepathy-salut/src/tube-dbus.c new-telepathy-salut/src/tube-dbus.c
--- old-telepathy-salut/src/tube-dbus.c	2007-11-15 13:33:51.902677010 -0500
+++ new-telepathy-salut/src/tube-dbus.c	2007-11-15 13:33:51.902677010 -0500
@@ -252,6 +252,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,
@@ -270,6 +278,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 Salut. 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-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-4/telepathy-salut.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- telepathy-salut.spec	17 Sep 2008 22:31:26 -0000	1.20
+++ telepathy-salut.spec	27 Nov 2008 10:29:13 -0000	1.21
@@ -1,16 +1,19 @@
 Name:           telepathy-salut
 Version:        0.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
 License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/FrontPage
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:         salut-olpc-no-dbus-uid-check.patch
+Patch1:         salut-chmod-unix-socket.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:	dbus-glib-devel >= 0.61
+BuildRequires:	avahi-glib-devel
 BuildRequires:	avahi-gobject-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
@@ -30,12 +33,14 @@
 local network using zero-configuration networking.
 
 
+%patch0 -p1 -b .dbus-uid
+%patch1 -p1 -b .chmod-socket
 %prep
 %setup -q
 
 
 %build
-%configure --enable-ssl
+%configure --enable-olpc
 make %{?_smp_mflags}
 
 
@@ -58,6 +63,9 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Thu Nov 27 2008 Morgan Collett <morgan.collett at gmail.com> - 0.3.5-2
+- Add rainbow patches and --enable-olpc
+
 * Wed Sep 17 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.3.5-1
 - Update to 0.3.5.