rpms/telepathy-gabble/OLPC-2 gabble-olpc-no-dbus-uid-check.patch, NONE, 1.1 telepathy-gabble.spec, 1.45, 1.46
Michael Stone (mstone)
fedora-extras-commits at redhat.com
Thu Nov 15 21:25:46 UTC 2007
Author: mstone
Update of /cvs/pkgs/rpms/telepathy-gabble/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16926
Modified Files:
telepathy-gabble.spec
Added Files:
gabble-olpc-no-dbus-uid-check.patch
Log Message:
- dev.laptop.org #4948: Add OLPC-specific patch to disable checking of the
UID connecting to D-Bus tubes.
- Fix whitespace in the Requires line.
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-2/telepathy-gabble.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- telepathy-gabble.spec 12 Nov 2007 20:22:44 -0000 1.45
+++ telepathy-gabble.spec 15 Nov 2007 21:25:12 -0000 1.46
@@ -2,7 +2,7 @@
Name: telepathy-gabble
Version: 0.7.1
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
Summary: A Jabber/XMPP connection manager
Group: Applications/Communications
@@ -12,6 +12,7 @@
#Source0: http://projects.collabora.co.uk/~smcv/olpc-snapshots/%{name}-%{version}-%{alphatag}.tar.gz
Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
#Patch0: telepathy-gabble-0.5.12.1-no-Werror.patch
+Patch0: gabble-olpc-no-dbus-uid-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +23,7 @@
BuildRequires: libxslt
BuildRequires: python
-Requires: telepathy-filesystem
+Requires: telepathy-filesystem
%description
@@ -35,6 +36,7 @@
# for non-release builds only:
# -n %{name}-%{version}-%{alphatag}
#%patch0 -p1 -b .no-Werror
+%patch0 -p1 -b .dbus-uid
%build
%configure
@@ -60,6 +62,11 @@
%changelog
+* Thu Nov 15 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.7.1-0.4.olpc2
+- dev.laptop.org #4948: Add OLPC-specific patch to disable checking of the
+ UID connecting to D-Bus tubes.
+- Fix whitespace in the Requires line.
+
* Mon Nov 12 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.7.1-0.3
- Update to 0.7.1, which separates persistence and debugging, so OLPCs can
get debug logs without having Gabble stay in RAM forever
More information about the fedora-extras-commits
mailing list