Author: mstone
Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343
Modified Files:
telepathy-salut.spec
Added Files:
salut-olpc-no-dbus-uid-check.patch
Log Message:
- dev.laptop.org #4947: Add OLPC-specific patch to disable checking of the
UID connecting to D-Bus tubes.
- Properly quote a %% character in earlier in the changelog.
- Fix whitespace issues in the BuildRequires and Requires lines.
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-2/telepathy-salut.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- telepathy-salut.spec 14 Nov 2007 15:48:32 -0000 1.25
+++ telepathy-salut.spec 15 Nov 2007 22:21:37 -0000 1.26
@@ -1,25 +1,26 @@
Name: telepathy-salut
Version: 0.1.9
-Release: 0.8%{?dist}
+Release: 0.9%{?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
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: libxml2-devel
-BuildRequires: openssl-devel
-BuildRequires: cyrus-sasl-devel
-BuildRequires: libxslt
-BuildRequires: telepathy-glib-devel >= 0.6.1
-BuildRequires: check-devel
+BuildRequires: dbus-glib-devel >= 0.61
+BuildRequires: avahi-glib-devel
+BuildRequires: libxml2-devel
+BuildRequires: openssl-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: libxslt
+BuildRequires: telepathy-glib-devel >= 0.6.1
+BuildRequires: check-devel
-Requires: telepathy-filesystem
+Requires: telepathy-filesystem
%description
%{name} is a Telepathy connection manager for link-local XMPP.
@@ -31,6 +32,7 @@
%prep
%setup -q
+%patch0 -p1 -b .dbus-uid
%build
@@ -56,6 +58,12 @@
%{_mandir}/man8/%{name}.8.gz
%changelog
+* Thu Nov 15 2007 Robert McQueen <robert.mcqueen at collabora.co.uk> - 0.1.9-0.9.olpc2
+- dev.laptop.org #4947: Add OLPC-specific patch to disable checking of the
+ UID connecting to D-Bus tubes.
+- Properly quote a %% character in earlier in the changelog.
+- Fix whitespace issues in the BuildRequires and Requires lines.
+
* Wed Nov 14 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.1.9-0.8
- New upstream release
- dev.laptop.org #4903: fix crash in unreliable mesh networks
@@ -120,7 +128,7 @@
- Fixes brown-paper-bag bug in Tubes (laptop.org #4438)
* Tue Oct 23 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.1.5.1-0.5.olpc20071022
-- Tweak use of %setup macro because we're now building snapshot tarballs with the inner directory containing the alpha tag (for jhbuild's benefit)
+- Tweak use of %%setup macro because we're now building snapshot tarballs with the inner directory containing the alpha tag (for jhbuild's benefit)
* Mon Oct 22 2007 Simon McVittie <simon.mcvittie at collabora.co.uk> - 0.1.5.1-0.4.olpc20071022
- New snapshot