Accepting request 79200 from Base:System

Fix crash with systemctl enable. (forwarded request 79198 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/79200
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=55

fix-crash.patch

@@ -0,0 +1,19 @@
+commit e191553d1dc80cd6d65d05f0cb29f8967fab6983
+Author: Kay Sievers <kay.sievers@vrfy.org>
+Date:   Wed Aug 17 19:38:07 2011 +0200
+
+    convert int to boolean for dbus_bool_t
+
+diff --git a/src/dbus-manager.c b/src/dbus-manager.c
+index ae88895..cfc2afc 100644
+--- a/src/dbus-manager.c
++++ b/src/dbus-manager.c
+@@ -444,7 +444,7 @@ static DBusMessage *message_from_file_changes(
+         if (carries_install_info >= 0) {
+                 dbus_bool_t b;
+ 
+-                b = carries_install_info;
++                b = !!carries_install_info;
+                 if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b))
+                         goto oom;
+         }

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 18 07:31:12 UTC 2011 - aj@suse.de
+
+- Fix crash with systemctl enable.
+
 -------------------------------------------------------------------
 Tue Aug 16 17:02:27 UTC 2011 - fcrozat@suse.com
 

systemd.spec

@@ -60,6 +60,8 @@ Patch2:         gperf-missing.patch
 Patch3:         systemd-cryptsetup.patch
 # PATCH-FIX-UPSTREAM fcrozat@suse.com -- don't set getty before passphrase is typed
 Patch4:         systemd-cryptsetup-query.patch
+# PATCH-FIX-UPSTREAM aj@suse.com -- fix crash on systemctl enable
+Patch5:         fix-crash.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -122,6 +124,7 @@ Plymouth integration for systemd
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 autoreconf -fiv