pool/dbus-1
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 207860 from home:sumski:hazard:to:your:stereo

Browse Source 
Drop the dbus-fall-back-to-old-run-directory.patch, and the sed workaround from dbus-1-x11 %post, now that transition from 12.3 (/var/run) to 13.1 (/run) is done

OBS-URL: https://build.opensuse.org/request/show/207860
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=139
This commit is contained in:
Marcus Meissner 2013-11-21 15:08:50 +00:00 committed by Git OBS Bridge
parent 4aeba6fcfe
commit 08687bf4b5
6 changed files with 14 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbus-1-x11.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 20 21:30:25 UTC 2013 - hrvoje.senjan@gmail.com
- Drop the dbus-fall-back-to-old-run-directory.patch, and the sed
workaround from dbus-1-x11 %post, now that transition from 12.3
(/var/run) to 13.1 (/run) is done
-------------------------------------------------------------------
Fri Nov 1 21:31:19 UTC 2013 - hrvoje.senjan@gmail.com

10
dbus-1-x11.spec
View File

@ -60,8 +60,6 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE hpj@suse.com bnc#802525 - Avoid clients hanging after move to /run
Patch2: dbus-fall-back-to-old-run-directory.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@ -117,7 +115,6 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi
@ -210,13 +207,6 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%{stop_on_removal dbus}
%post -n dbus-1
if [ -e /var/lib/old_run_path ]; then
# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered. This is needed as long
# upgrade path from 12.3 is supported (bnc#802525)
mkdir -p /run/systemd/system
/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket
rm /var/lib/old_run_path
fi
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig

7
dbus-1-x11.spec.in
View File

@ -124,13 +124,6 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%{stop_on_removal dbus}
%post -n dbus-1
if [ -e /var/lib/old_run_path ]; then
# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered. This is needed as long
# upgrade path from 12.3 is supported (bnc#802525)
mkdir -p /run/systemd/system
/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket
rm /var/lib/old_run_path
fi
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig

7
dbus-1.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 20 21:30:25 UTC 2013 - hrvoje.senjan@gmail.com
- Drop the dbus-fall-back-to-old-run-directory.patch, and the sed
workaround from dbus-1-x11 %post, now that transition from 12.3
(/var/run) to 13.1 (/run) is done
-------------------------------------------------------------------
Fri Nov 1 21:31:19 UTC 2013 - hrvoje.senjan@gmail.com

3
dbus-1.spec
View File

@ -55,8 +55,6 @@ Source4: baselibs.conf
Patch0: dbus-log-deny.patch
# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
# PATCH-FIX-OPENSUSE hpj@suse.com bnc#802525 - Avoid clients hanging after move to /run
Patch2: dbus-fall-back-to-old-run-directory.patch
%bcond_without selinux
%if %{with selinux}
BuildRequires: libselinux-devel
@ -105,7 +103,6 @@ bus daemon).
%setup -n %{_name}-%{version} -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
autoreconf -fi

274
dbus-fall-back-to-old-run-directory.patch
View File

@ -1,274 +0,0 @@
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index fadc3a8..2c71cdb 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -421,6 +421,153 @@ _dbus_bus_notify_shared_connection_disconnected_unlocked (DBusConnection *connec
_DBUS_UNLOCK (bus);
}
+static dbus_bool_t
+internal_register (DBusConnection *connection,
+ int timeout_milliseconds,
+ DBusError *error)
+{
+ DBusMessage *message, *reply;
+ char *name;
+ BusData *bd;
+ dbus_bool_t retval;
+
+ _dbus_return_val_if_fail (connection != NULL, FALSE);
+ _dbus_return_val_if_error_is_set (error, FALSE);
+
+ retval = FALSE;
+ message = NULL;
+ reply = NULL;
+
+ _DBUS_LOCK (bus_datas);
+
+ bd = ensure_bus_data (connection);
+ if (bd == NULL)
+ {
+ _DBUS_SET_OOM (error);
+ goto out;
+ }
+
+ if (bd->unique_name != NULL)
+ {
+ _dbus_verbose ("Ignoring attempt to register the same DBusConnection %s with the message bus a second time.\n",
+ bd->unique_name);
+ /* Success! */
+ retval = TRUE;
+ goto out;
+ }
+
+ message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
+ "Hello");
+
+ if (!message)
+ {
+ _DBUS_SET_OOM (error);
+ goto out;
+ }
+
+ reply = dbus_connection_send_with_reply_and_block (connection, message, timeout_milliseconds, error);
+
+ if (reply == NULL)
+ goto out;
+ else if (dbus_set_error_from_message (error, reply))
+ goto out;
+ else if (!dbus_message_get_args (reply, error,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID))
+ goto out;
+
+ bd->unique_name = _dbus_strdup (name);
+ if (bd->unique_name == NULL)
+ {
+ _DBUS_SET_OOM (error);
+ goto out;
+ }
+
+ retval = TRUE;
+
+ out:
+ _DBUS_UNLOCK (bus_datas);
+
+ if (message)
+ dbus_message_unref (message);
+
+ if (reply)
+ dbus_message_unref (reply);
+
+ return retval;
+}
+
+static DBusConnection *
+internal_open_and_register (const char *address, dbus_bool_t private, int timeout_milliseconds, DBusError *error)
+{
+ DBusConnection *connection;
+
+ if (private)
+ connection = dbus_connection_open_private (address, error);
+ else
+ connection = dbus_connection_open (address, error);
+
+ if (!connection)
+ {
+ goto out;
+ }
+
+ if (!internal_register (connection, timeout_milliseconds, error))
+ {
+ _dbus_connection_close_possibly_shared (connection);
+ dbus_connection_unref (connection);
+ connection = NULL;
+ goto out;
+ }
+
+out:
+ return connection;
+}
+
+/* When the D-Bus upgrade that moves /var/run/dbus/ to /run/dbus/ is applied,
+ * D-Bus cannot be restarted with the new socket in /run/, because the session
+ * wouldn't be able to cope with it. We end up with a daemon listening on
+ * /var/run/dbus/system_bus_socket, but clients will now try to register
+ * with it on /run/dbus/system_bus_socket, causing the upgrade, and eventually
+ * critical parts of the user's session, to hang.
+ *
+ * The workaround is inelegant, but probably good enough: We allow the initial
+ * attempt to time out quickly and fall back to trying the old default address.
+ * If that fails too, we go back to blocking on the initial address. */
+
+#define OLD_SYSTEM_BUS_DEFAULT_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
+#define INITIAL_TIMEOUT_MILLISECONDS 250
+#define INCREMENT_TIMEOUT_MILLISECONDS 250
+#define MAX_TIMEOUT_MILLISECONDS 10000
+
+static DBusConnection *
+internal_open_and_register_with_fallback (const char *address, dbus_bool_t private, DBusError *error)
+{
+ DBusConnection *connection = NULL;
+ int timeout_milliseconds;
+
+ for (timeout_milliseconds = INITIAL_TIMEOUT_MILLISECONDS;
+ connection == NULL && timeout_milliseconds < MAX_TIMEOUT_MILLISECONDS;
+ timeout_milliseconds += INCREMENT_TIMEOUT_MILLISECONDS)
+ {
+ connection = internal_open_and_register (address, private, timeout_milliseconds, NULL);
+
+ if (!connection && !strcmp (address, DBUS_SYSTEM_BUS_DEFAULT_ADDRESS))
+ connection = internal_open_and_register (OLD_SYSTEM_BUS_DEFAULT_ADDRESS, private, timeout_milliseconds, NULL);
+ }
+
+ if (!connection)
+ {
+ /* We couldn't register with any of the sockets; fall back to original behavior, blocking
+ * forever or returning an error. */
+ connection = internal_open_and_register (address, private, -1, error);
+ }
+
+ return connection;
+}
+
static DBusConnection *
internal_bus_get (DBusBusType type,
dbus_bool_t private,
@@ -474,21 +621,10 @@ internal_bus_get (DBusBusType type,
goto out;
}
- if (private)
- connection = dbus_connection_open_private (address, error);
- else
- connection = dbus_connection_open (address, error);
-
- if (!connection)
- {
- goto out;
- }
+ connection = internal_open_and_register_with_fallback (address, private, error);
- if (!dbus_bus_register (connection, error))
+ if (!connection)
{
- _dbus_connection_close_possibly_shared (connection);
- dbus_connection_unref (connection);
- connection = NULL;
goto out;
}
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index ee33b6c..b87c6f7 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -348,7 +348,7 @@ static void _dbus_connection_update_dispatch_status_and_unlock (DB
static void _dbus_connection_last_unref (DBusConnection *connection);
static void _dbus_connection_acquire_dispatch (DBusConnection *connection);
static void _dbus_connection_release_dispatch (DBusConnection *connection);
-static DBusDispatchStatus _dbus_connection_flush_unlocked (DBusConnection *connection);
+static DBusDispatchStatus _dbus_connection_flush_unlocked (DBusConnection *connection, int timeout_milliseconds);
static void _dbus_connection_close_possibly_shared_and_unlock (DBusConnection *connection);
static dbus_bool_t _dbus_connection_get_is_connected_unlocked (DBusConnection *connection);
static dbus_bool_t _dbus_connection_peek_for_reply_unlocked (DBusConnection *connection,
@@ -2367,7 +2367,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
DBusConnection *connection;
dbus_uint32_t client_serial;
DBusTimeout *timeout;
- int timeout_milliseconds, elapsed_milliseconds;
+ int timeout_milliseconds = -1, elapsed_milliseconds;
_dbus_assert (pending != NULL);
@@ -2379,7 +2379,12 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
connection = _dbus_pending_call_get_connection_and_lock (pending);
/* Flush message queue - note, can affect dispatch status */
- _dbus_connection_flush_unlocked (connection);
+
+ timeout = _dbus_pending_call_get_timeout_unlocked (pending);
+ if (timeout)
+ timeout_milliseconds = dbus_timeout_get_interval (timeout);
+
+ _dbus_connection_flush_unlocked (connection, timeout_milliseconds);
client_serial = _dbus_pending_call_get_reply_serial_unlocked (pending);
@@ -3555,7 +3560,7 @@ dbus_connection_send_with_reply_and_block (DBusConnection *connection,
* @param connection the connection.
*/
static DBusDispatchStatus
-_dbus_connection_flush_unlocked (DBusConnection *connection)
+_dbus_connection_flush_unlocked (DBusConnection *connection, int timeout_milliseconds)
{
/* We have to specify DBUS_ITERATION_DO_READING here because
* otherwise we could have two apps deadlock if they are both doing
@@ -3563,20 +3568,36 @@ _dbus_connection_flush_unlocked (DBusConnection *connection)
* dispatch status.
*/
DBusDispatchStatus status;
+ long start_tv_sec, start_tv_usec;
+ long tv_sec, tv_usec;
+ int elapsed_milliseconds = 0;
HAVE_LOCK_CHECK (connection);
+
+ _dbus_get_monotonic_time (&start_tv_sec, &start_tv_usec);
while (connection->n_outgoing > 0 &&
_dbus_connection_get_is_connected_unlocked (connection))
{
_dbus_verbose ("doing iteration in\n");
+
+ if (timeout_milliseconds >= 0)
+ {
+ _dbus_get_monotonic_time (&tv_sec, &tv_usec);
+ elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
+ (tv_usec - start_tv_usec) / 1000;
+
+ if (elapsed_milliseconds >= timeout_milliseconds)
+ break;
+ }
+
HAVE_LOCK_CHECK (connection);
_dbus_connection_do_iteration_unlocked (connection,
NULL,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_DO_WRITING |
DBUS_ITERATION_BLOCK,
- -1);
+ timeout_milliseconds - elapsed_milliseconds);
}
HAVE_LOCK_CHECK (connection);
@@ -3606,7 +3627,7 @@ dbus_connection_flush (DBusConnection *connection)
CONNECTION_LOCK (connection);
- status = _dbus_connection_flush_unlocked (connection);
+ status = _dbus_connection_flush_unlocked (connection, -1);
HAVE_LOCK_CHECK (connection);
/* Unlocks and calls out to user code */