diff -Nru dbus-1.10.10/debian/changelog dbus-1.10.10/debian/changelog --- dbus-1.10.10/debian/changelog 2016-09-11 08:09:45.000000000 +0000 +++ dbus-1.10.10/debian/changelog 2016-10-21 08:27:14.000000000 +0000 @@ -1,3 +1,11 @@ +dbus (1.10.10-1ubuntu2) zesty; urgency=medium + + * debian/patches/make-uid-0-immune-to-timeout.patch: + - Add a test patch proposed by Simon McVittie upstream to fix bug + LP: #1591411. + + -- Ɓukasz 'sil2100' Zemczak Tue, 11 Oct 2016 20:12:43 +0200 + dbus (1.10.10-1ubuntu1) yakkety; urgency=medium [ Jeremy Bicha ] diff -Nru dbus-1.10.10/debian/patches/make-uid-0-immune-to-timeout.patch dbus-1.10.10/debian/patches/make-uid-0-immune-to-timeout.patch --- dbus-1.10.10/debian/patches/make-uid-0-immune-to-timeout.patch 1970-01-01 00:00:00.000000000 +0000 +++ dbus-1.10.10/debian/patches/make-uid-0-immune-to-timeout.patch 2016-10-11 18:12:13.000000000 +0000 @@ -0,0 +1,36 @@ +From 2da37508fe325df49c278ff7ddfe0ab79443453e Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 1 Jul 2016 16:35:55 +0100 +Subject: [PATCH] WiP: make uid 0 immune to pending_fd_timeout + +--- dbus-1.10.6.orig/bus/connection.c ++++ dbus-1.10.6/bus/connection.c +@@ -671,6 +671,13 @@ static dbus_bool_t + pending_unix_fds_timeout_cb (void *data) + { + DBusConnection *connection = data; ++ unsigned long uid; ++ ++ if (dbus_connection_get_unix_user (connection, &uid) && uid == 0) ++ { ++ return TRUE; ++ } ++ + dbus_connection_close (connection); + return TRUE; + } +--- dbus-1.10.6.orig/test/dbus-daemon.c ++++ dbus-1.10.6/test/dbus-daemon.c +@@ -282,6 +282,12 @@ test_no_reply (Fixture *f, + dbus_bus_get_unique_name (f->right_conn), "/", + "com.example", "WaitForever"); + ++ if (getuid () == 0) ++ { ++ g_test_skip ("Cannot test, uid 0 is immune to this limit"); ++ return; ++ } ++ + add_echo_filter (f); + + if (m == NULL) diff -Nru dbus-1.10.10/debian/patches/series dbus-1.10.10/debian/patches/series --- dbus-1.10.10/debian/patches/series 2016-09-11 08:09:45.000000000 +0000 +++ dbus-1.10.10/debian/patches/series 2016-10-21 08:26:35.000000000 +0000 @@ -3,3 +3,4 @@ dont-stop-dbus.patch aa-get-connection-apparmor-security-context.patch session.conf-system.conf-include-legacy-files-as-.dpkg-ba.patch +make-uid-0-immune-to-timeout.patch