[arch-commits] Commit in systemd/trunk (2 files)

[Andreas Radke]

    Date: Friday, April 17, 2015 @ 16:35:17
  Author: andyrtr
Revision: 237278

upgpkg: systemd 219-5

gnutls rebuild, add upstream fix for FS#44413

Added:
  systemd/trunk/0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch
Modified:
  systemd/trunk/PKGBUILD

---------------------------------------------------------------------+
 0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch |   28 ++++++++++
 PKGBUILD                                                            |    9 ++-
 2 files changed, 34 insertions(+), 3 deletions(-)

Added: 0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch
===================================================================
--- 0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch	                        (rev 0)
+++ 0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch	2015-04-17 14:35:17 UTC (rev 237278)
@@ -0,0 +1,28 @@
+From f2273101c21bc59a390379e182e53cd4f07a7e71 Mon Sep 17 00:00:00 2001
+From: Benjamin Franzke <benjaminfranzke at googlemail.com>
+Date: Thu, 19 Feb 2015 20:47:28 +0100
+Subject: machined: use x-machine-unix prefix for the container bus on dbus1
+
+This fixes "machinectl login" on systems configured with --disable-kdbus.
+
+The error was:
+machinectl login foo
+Failed to get machine PTY: Input/output error
+
+diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
+index 15c9159..9e78a67 100644
+--- a/src/machine/machine-dbus.c
++++ b/src/machine/machine-dbus.c
+@@ -511,7 +511,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
+ #ifdef ENABLE_KDBUS
+         asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT ";x-machine-unix:pid=" PID_FMT, m->leader, m->leader);
+ #else
+-        asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT, m->leader);
++        asprintf(&container_bus->address, "x-machine-unix:pid=" PID_FMT, m->leader);
+ #endif
+         if (!container_bus->address)
+                 return log_oom();
+-- 
+cgit v0.10.2
+
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-17 13:54:57 UTC (rev 237277)
+++ PKGBUILD	2015-04-17 14:35:17 UTC (rev 237278)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=219
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -20,7 +20,8 @@
         '0001-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch'
         '0001-core-shared-in-deserializing-match-same-files-reache.patch'
         '0001-tmpfiles-Fix-handling-of-duplicate-lines.patch'
-        '0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch')
+        '0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch'
+        '0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch')
 md5sums=('e0d6c9a4b4f69f66932d2230298c9a34'
          '90ea67a7bb237502094914622a39e281'
          '58af51bd4c0464f195b3433b4e17cf6c'
@@ -29,7 +30,8 @@
          'cb8550749cd52b5902ed6fdf0eb465ec'
          '9d46aebfc04cc849fd4295f449b239a2'
          'c4c9c0f0a06314450563ed571962881e'
-         '6b9d611dffd92c94641360c3ef2659c1')
+         '6b9d611dffd92c94641360c3ef2659c1'
+         '3a0fc672b34ced18ca1364edf8644165')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -39,6 +41,7 @@
   patch -Np1 <../0001-core-shared-in-deserializing-match-same-files-reache.patch
   patch -Np1 <../0001-tmpfiles-Fix-handling-of-duplicate-lines.patch
   patch -Np1 <../0001-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
+  patch -Np1 <../0001-use-x-machine-unix-prefix-for-the-container-bus-on-dbus1.patch
 }
 
 build() {