.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=547

systemd-dbus-system-bus-address.patch

@@ -9,3 +9,16 @@
  #define KERNEL_SYSTEM_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus"
  
  #ifdef ENABLE_KDBUS
+--- systemd-210/src/libsystemd/sd-bus/sd-bus.c
++++ systemd-210/src/libsystemd/sd-bus/sd-bus.c	2014-03-12 14:31:09.966736492 +0000
+@@ -794,8 +794,8 @@ static int parse_container_unix_address(
+         machine = NULL;
+ 
+         b->sockaddr.un.sun_family = AF_UNIX;
+-        strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
+-        b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/var/run/dbus/system_bus_socket");
++        strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
++        b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/dbus/system_bus_socket");
+ 
+         return 0;
+ }

systemd-mini.changes

@@ -1,4 +1,12 @@
--------------------------------------------------------------------
+-----------------------------------------------------------------
+Tue Mar 11 11:32:37 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Due to previous reason, resurrect systemd-dbus-system-bus-address.patch
+- Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only
+  needed for quering default DBus directories, which we nowpass to configure.
+  This also unbreaks libdbus <-> systemd-miniBuild Cycle
+
+-----------------------------------------------------------------
 Tue Mar 11 11:01:53 UTC 2014 - werner@suse.de
 
 - Add or port upstream bugfix patches: 

systemd-mini.spec

@@ -72,7 +72,6 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
 BuildRequires:  xz
 BuildRequires:  pkgconfig(blkid) >= 2.20
-BuildRequires:  pkgconfig(dbus-1) >= 1.3.2
 %if ! 0%{?bootstrap}
 BuildRequires:  libgcrypt-devel
 %if %{with python}
@@ -204,6 +203,8 @@ Patch25:        Forward-suspend-hibernate-calls-to-pm-utils.patch
 Patch38:        rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
 # PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
 Patch46:        use-usr-sbin-sulogin-for-emergency-service.patch
+# PATCH-FIX-OPENSUSE Make systemd talk with dbus-daemon even on big endian
+Patch47:        use-correct-size-4-reply_cookie-4-bigendian.patch
 # PATCH-FIX-OPENSUSE make-emergency.service-conflict-with-syslog.socket.patch (bnc#852232)
 Patch84:        make-emergency.service-conflict-with-syslog.socket.patch
 # PATCH-FIX-SUSE 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
@@ -575,6 +576,7 @@ cp %{SOURCE7} m4/
 %patch41 -p1
 %patch42 -p1
 %patch46 -p1
+%patch47 -p1
 %patch84 -p1
 %patch86 -p1
 %patch90 -p1
@@ -687,7 +689,6 @@ export V=1
   --disable-networkd \
 %endif
   --disable-kdbus \
-  --enable-dbus \
   CFLAGS="%{optflags}"
 make %{?_smp_mflags}
 

systemd.changes

@@ -1,4 +1,12 @@
--------------------------------------------------------------------
+-----------------------------------------------------------------
+Tue Mar 11 11:32:37 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Due to previous reason, resurrect systemd-dbus-system-bus-address.patch
+- Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only
+  needed for quering default DBus directories, which we nowpass to configure.
+  This also unbreaks libdbus <-> systemd-miniBuild Cycle
+
+-----------------------------------------------------------------
 Tue Mar 11 11:01:53 UTC 2014 - werner@suse.de
 
 - Add or port upstream bugfix patches: 

systemd.spec

@@ -67,7 +67,6 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  tcpd-devel
 BuildRequires:  xz
 BuildRequires:  pkgconfig(blkid) >= 2.20
-BuildRequires:  pkgconfig(dbus-1) >= 1.3.2
 %if ! 0%{?bootstrap}
 BuildRequires:  libgcrypt-devel
 %if %{with python}
@@ -199,6 +198,8 @@ Patch25:        Forward-suspend-hibernate-calls-to-pm-utils.patch
 Patch38:        rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
 # PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
 Patch46:        use-usr-sbin-sulogin-for-emergency-service.patch
+# PATCH-FIX-OPENSUSE Make systemd talk with dbus-daemon even on big endian
+Patch47:        use-correct-size-4-reply_cookie-4-bigendian.patch
 # PATCH-FIX-OPENSUSE make-emergency.service-conflict-with-syslog.socket.patch (bnc#852232)
 Patch84:        make-emergency.service-conflict-with-syslog.socket.patch
 # PATCH-FIX-SUSE 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
@@ -570,6 +571,7 @@ cp %{SOURCE7} m4/
 %patch41 -p1
 %patch42 -p1
 %patch46 -p1
+%patch47 -p1
 %patch84 -p1
 %patch86 -p1
 %patch90 -p1
@@ -682,7 +684,6 @@ export V=1
   --disable-networkd \
 %endif
   --disable-kdbus \
-  --enable-dbus \
   CFLAGS="%{optflags}"
 make %{?_smp_mflags}
 

use-correct-size-4-reply_cookie-4-bigendian.patch

@@ -0,0 +1,18 @@
+From: Olaf Kirch <okir@suse.de>
+Date: Date: Wed, 12 Mar 2014 13:52:50 +0000
+Subject: [PATCH] Let systemd talk with dbus-daemon even on big endian
+
+Related to bug #866732 that is to help systemd to talk with dbus-daemon
+on s390x.
+
+--- systemd-210/src/libsystemd/sd-bus/bus-message.h
++++ systemd-210/src/libsystemd/sd-bus/bus-message.h	2014-03-12 14:06:54.862235499 +0000
+@@ -84,7 +84,7 @@ struct sd_bus_message {
+ 
+         sd_bus *bus;
+ 
+-        uint32_t reply_cookie;
++        uint64_t reply_cookie;
+ 
+         const char *path;
+         const char *interface;