Accepting request 79198 from home:a_jaeger:branches:openSUSE:Factory

Fix crash with systemctl enable.

OBS-URL: https://build.opensuse.org/request/show/79198
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=177
This commit is contained in:
Frederic Crozat 2011-08-18 08:09:50 +00:00 committed by Git OBS Bridge
parent 282eca940a
commit f8f8bcfb68
3 changed files with 27 additions and 0 deletions

19
fix-crash.patch Normal file
View File

@ -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;
}

View File

@ -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

View File

@ -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