rpms/telepathy-gabble/OLPC-3 gabble-chmod-unix-socket.patch, NONE, 1.1 gabble-olpc-no-dbus-uid-check.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 telepathy-gabble.spec, 1.34, 1.35

[Morgan Collett (morgan)]

Author: morgan

Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17036

Modified Files:
	.cvsignore sources telepathy-gabble.spec 
Added Files:
	gabble-chmod-unix-socket.patch 
	gabble-olpc-no-dbus-uid-check.patch 
Log Message:
Update to 0.7.6, add 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	3 May 2008 23:27:46 -0000	1.26
+++ .cvsignore	3 Jul 2008 09:45:59 -0000	1.27
@@ -1 +1 @@
-telepathy-gabble-0.7.4.tar.gz
+telepathy-gabble-0.7.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	3 May 2008 23:27:46 -0000	1.26
+++ sources	3 Jul 2008 09:45:59 -0000	1.27
@@ -1 +1 @@
-a32237f355fc78357d340ad79edf6c5d  telepathy-gabble-0.7.4.tar.gz
+17564dcb79d886d527609c154834c1c7  telepathy-gabble-0.7.6.tar.gz


Index: telepathy-gabble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-gabble/OLPC-3/telepathy-gabble.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- telepathy-gabble.spec	3 May 2008 23:27:46 -0000	1.34
+++ telepathy-gabble.spec	3 Jul 2008 09:45:59 -0000	1.35
@@ -1,5 +1,5 @@
 Name:           telepathy-gabble
-Version:        0.7.4
+Version:        0.7.6
 Release:        1%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
@@ -8,12 +8,15 @@
 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
+BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.72
 BuildRequires:  loudmouth-devel >= 1.3.2
-BuildRequires:  telepathy-glib-devel >= 0.7.0
+BuildRequires:  telepathy-glib-devel >= 0.7.8
 BuildRequires:  libxslt
 BuildRequires:  python
 
@@ -27,7 +30,8 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .dbus-uid
+%patch1 -p1 -b .chmod-socket
 
 %build
 %configure
@@ -56,6 +60,10 @@
 
 
 %changelog
+* Thu Jul 3 2008 Morgan Collett <morgan at laptop.org> - 0.7.6-1
+- Update to 0.7.6
+- Add OLPC patches to disable security for rainbow
+
 * Fri May  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.7.4-1
 - Update to 0.7.4.
 - Package new documentation.