Accepting request 214486 from home:fcrozat:branches:Base:System

- Add analyze-fix-crash-in-command-line-parsing.patch: fix crash in
  systemd-analyze (bnc#859365)

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

analyze-fix-crash-in-command-line-parsing.patch

@@ -0,0 +1,35 @@
+From da6de8a55784115451582051c8da620056994a05 Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat@suse.com>
+Date: Mon, 20 Jan 2014 11:05:22 +0100
+Subject: [PATCH] analyze: fix crash in command line parsing
+
+Ensure DBusError is set before it can possibly be freed on return.
+Fix crash when calling set-log-level without any parameter.
+
+Fix https://bugzilla.novell.com/show_bug.cgi?id=859365
+---
+ src/analyze/systemd-analyze.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
+index 27d063c..cdfae93 100644
+--- a/src/analyze/systemd-analyze.c
++++ b/src/analyze/systemd-analyze.c
+@@ -1226,13 +1226,13 @@ static int set_log_level(DBusConnection *bus, char **args) {
+         assert(bus);
+         assert(args);
+ 
++        dbus_error_init(&error);
+         if (strv_length(args) != 1) {
+                 log_error("This command expects one argument only.");
+                 return -E2BIG;
+         }
+ 
+         value = args[0];
+-        dbus_error_init(&error);
+ 
+         m = dbus_message_new_method_call("org.freedesktop.systemd1",
+                                          "/org/freedesktop/systemd1",
+-- 
+1.8.4
+

systemd-mini.changes

@@ -1,3 +1,85 @@
+-------------------------------------------------------------------
+Mon Jan 20 10:18:20 UTC 2014 - fcrozat@suse.com
+
+- Add analyze-fix-crash-in-command-line-parsing.patch: fix crash in
+  systemd-analyze (bnc#859365)
+
+-------------------------------------------------------------------
+Fri Jan 17 16:09:24 UTC 2014 - werner@suse.de
+
+- Add patch
+  1019-make-completion-smart-to-be-able-to-redirect.patch 
+  to make redirections work with the bash command completions for
+  for systemd command tools (bnc#856858, bnc#859072)
+
+-------------------------------------------------------------------
+Fri Jan 17 12:24:13 UTC 2014 - werner@suse.de
+
+- Add patch
+  1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
+  to support the "+" to tag wanted dependencies as well as make
+  sure that required dependencies are handles as required ones.
+  This should fix bnc#858864 and bnc#857204.
+
+-------------------------------------------------------------------
+Thu Jan 16 16:08:00 UTC 2014 - lnussel@suse.de
+
+- apply preset also to service files that are new in upgrade
+
+-------------------------------------------------------------------
+Wed Jan 15 14:11:02 UTC 2014 - werner@suse.de
+
+- Change support-powerfail-with-powerstatus.patch to use BindsTo
+  instead of BindTo 
+
+-------------------------------------------------------------------
+Wed Jan 15 12:34:53 UTC 2014 - werner@suse.de
+
+- Add patch 1017-enforce-sufficient-shutdown-warnings.patch
+  Warn once per hour in the last 3 hours, then all 30 minutes in last
+  hour, all 15 minutes in the last 45 minutes, all 10 minutes in the
+  last 15 minutes, and then all minute in the last 10 minutes (bnc#750845)
+
+-------------------------------------------------------------------
+Tue Jan 14 18:28:09 UTC 2014 - werner@suse.de
+
+- Add patch support-powerfail-with-powerstatus.patch and source
+  file systemd-powerfail to implement SIGPWR support with evaluation
+  of the file /var/run/powerstatus (bnc#737690)
+
+-------------------------------------------------------------------
+Fri Dec 20 12:06:18 UTC 2013 - werner@suse.de
+
+- Adapt patch
+  1011-check-4-valid-kmsg-device.patch
+  to fit current upstream version maybe related to bnc#854884
+- Change patch
+  1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch
+  to check if XDG_RUNTIME_DIR is set before the call of pam_putenv()
+  may fix bnc#855160	
+
+-------------------------------------------------------------------
+Fri Dec 20 09:40:01 UTC 2013 - lbsousajr@gmail.com
+
+- Disable multi-seat-x build, since package xorg-x11-server
+  currently in Factory no longer needs it.
+
+-------------------------------------------------------------------
+Wed Dec 18 18:56:01 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added 0001-logind-garbage-collect-stale-users.patch: Don't stop a
+  running user manager from garbage-collecting the user. Original
+  behavior caused bnc#849870
+
+-------------------------------------------------------------------
+Mon Dec 16 11:08:33 UTC 2013 - lbsousajr@gmail.com
+
+- Add build-sys-make-multi-seat-x-optional.patch
+  * See: http://cgit.freedesktop.org/systemd/systemd/commit/?id=bd441fa27a22b7c6e11d9330560e0622fb69f297
+  * Now systemd-multi-seat-x build can be disabled with configure option
+    --disable-multi-seat-x. It should be done when xorg-x11-server
+    no longer needs it (work in progress).
+
 -------------------------------------------------------------------
 Mon Dec 16 09:43:29 UTC 2013 - fcrozat@suse.com
 

systemd-mini.spec

@@ -23,6 +23,11 @@
 %define udevpkgname udev-mini
 %define udev_major 1
 
+%if 0%{?sles_version} == 0
+%global         with_bash_completion 1
+%endif
+%bcond_with     bash_completion
+
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        208
@@ -89,6 +94,9 @@ Conflicts:      kiwi
 # the buildignore is important for bootstrapping
 #!BuildIgnore:  udev
 Requires:       %{udevpkgname} >= 172
+%if %{with bash_completion}
+Requires:       bash-completion
+%endif
 Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
 Requires:       kmod >= 14
@@ -117,6 +125,7 @@ Source8:        systemd-journald.init
 Source9:        nss-myhostname-config
 Source10:       macros.systemd.upstream
 Source11:       after-local.service
+Source12:       systemd-powerfail
 
 Source1060:     boot.udev
 Source1061:     write_dev_root_rule
@@ -246,6 +255,8 @@ Patch79:        0001-analyze-set-white-background.patch
 Patch80:        0001-analyze-set-text-on-side-with-most-space.patch
 # PATCH-FIX-UPSTREAM 0001-logind-garbage-collect-stale-users.patch -- Don't stop a running user manager from garbage-collecting the user.
 Patch81:        0001-logind-garbage-collect-stale-users.patch
+# PATCH-FIX-UPSTREAM analyze-fix-crash-in-command-line-parsing.patch fcrozat@suse.com bnc#859365 -- Fix crash in systemd-analyze
+Patch82:        analyze-fix-crash-in-command-line-parsing.patch
 
 # udev patches
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@@ -276,6 +287,14 @@ Patch1013:      U_logind_revert_lazy_session_activation_on_non_vt_seats.patch
 Patch1014:      1014-journald-with-journaling-FS.patch
 # PATCH-FIX-UPSTREAM build-sys-make-multi-seat-x-optional.patch
 Patch1015:      build-sys-make-multi-seat-x-optional.patch
+# PATCH-FIX-SUSE support-powerfail-with-powerstatus.patch
+Patch1016:      support-powerfail-with-powerstatus.patch
+# PATCH-FIX-SUSE 1017-enforce-sufficient-shutdown-warnings.patch
+Patch1017:      1017-enforce-sufficient-shutdown-warnings.patch
+# PATCH-FIX-SUSE 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
+Patch1018:      1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
+# PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch
+Patch1019:      1019-make-completion-smart-to-be-able-to-redirect.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -539,6 +558,7 @@ cp %{SOURCE7} m4/
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
 
 # udev patches
 %patch1001 -p1
@@ -558,6 +578,10 @@ cp %{SOURCE7} m4/
 %patch1013 -p1
 %patch1014 -p1
 %patch1015 -p1
+%patch1016 -p1
+%patch1017 -p1
+%patch1018 -p1
+%patch1019 -p1
 
 # ensure generate files are removed
 rm -f units/emergency.service
@@ -735,6 +759,21 @@ EOF
 install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
 ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
 
+# support for SIGPWR handling with /var/run/powerstatus of e.g. powerd
+install -m 755 %{S:12} %{buildroot}/%{_prefix}/lib/systemd/
+install -m 644 units/powerfail.service %{buildroot}/%{_prefix}/lib/systemd/system/
+install -m 644 man/systemd-powerfail.service.8 %{buildroot}/%{_mandir}/man8/
+
+# clean out some completions which requires bash-completion package
+%if %{without bash_completion}
+for c in %{buildroot}/%{_datadir}/bash-completion/completions/*
+do
+    test -e "$c" || continue
+    grep -q _init_completion "$c" || continue
+    rm -vf "$c"
+done
+%endif
+
 %fdupes -s %{buildroot}%{_mandir}
 
 # packaged in systemd-rpm-macros

systemd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 20 10:18:20 UTC 2014 - fcrozat@suse.com
+
+- Add analyze-fix-crash-in-command-line-parsing.patch: fix crash in
+  systemd-analyze (bnc#859365)
+
 -------------------------------------------------------------------
 Fri Jan 17 16:09:24 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -250,6 +250,8 @@ Patch79:        0001-analyze-set-white-background.patch
 Patch80:        0001-analyze-set-text-on-side-with-most-space.patch
 # PATCH-FIX-UPSTREAM 0001-logind-garbage-collect-stale-users.patch -- Don't stop a running user manager from garbage-collecting the user.
 Patch81:        0001-logind-garbage-collect-stale-users.patch
+# PATCH-FIX-UPSTREAM analyze-fix-crash-in-command-line-parsing.patch fcrozat@suse.com bnc#859365 -- Fix crash in systemd-analyze
+Patch82:        analyze-fix-crash-in-command-line-parsing.patch
 
 # udev patches
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@@ -551,6 +553,7 @@ cp %{SOURCE7} m4/
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
 
 # udev patches
 %patch1001 -p1