[systemd/f21] systemd-216-10.fc21

[Zbigniew Jędrzejewski-Szmek]

commit 668bffb7a0b4abc3ca30cb871b0948841a4d7b3b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Nov 4 15:42:28 2014 -0500

    systemd-216-10.fc21

 ...make-systemd-journald.service-Type-notify.patch |   33 ++++++++++++++++++++
 systemd.spec                                       |    6 +++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0039-units-make-systemd-journald.service-Type-notify.patch b/0039-units-make-systemd-journald.service-Type-notify.patch
new file mode 100644
index 0000000..934fd77
--- /dev/null
+++ b/0039-units-make-systemd-journald.service-Type-notify.patch
@@ -0,0 +1,33 @@
+From 25bfe24d32faa1203d74ffb6bfbf732e10426ea3 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Tue, 4 Nov 2014 20:28:08 +0100
+Subject: [PATCH] units: make systemd-journald.service Type=notify
+
+It already calls sd_notify(), so it looks like an oversight.
+
+Without it, its ordering to systemd-journal-flush.service is
+non-deterministic and the SIGUSR1 from flushing may kill journald before
+it has its signal handlers set up.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85871
+https://bugzilla.redhat.com/show_bug.cgi?id=1159641
+(cherry picked from commit a87a38c20196a4aeb56b6ba71d688eefd0b21c30)
+
+Conflicts:
+	units/systemd-journald.service.in
+---
+ units/systemd-journald.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
+index 4de38fad59..441d5b1f96 100644
+--- a/units/systemd-journald.service.in
++++ b/units/systemd-journald.service.in
+@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
+ Before=sysinit.target
+ 
+ [Service]
++Type=notify
+ Sockets=systemd-journald.socket systemd-journald-dev-log.socket
+ ExecStart=@rootlibexecdir@/systemd-journald
+ Restart=always
diff --git a/systemd.spec b/systemd.spec
index 00925cf..9006b35 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        216
-Release:        9%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        10%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -79,6 +79,7 @@ Patch0035:      0035-Raise-level-of-Found-dependency.-lines.patch
 Patch0036:      0036-manager-do-not-print-timing-when-running-in-test-mod.patch
 Patch0037:      0037-unit-do-not-order-timers.target-before-basic.target.patch
 Patch0038:      0038-units-order-sd-journal-flush-after-sd-remount-fs.patch
+Patch0039:      0039-units-make-systemd-journald.service-Type-notify.patch
 
 Patch0996:      Accept-StartTimeout-options-for-compatibility.patch
 Patch0997:      units-remove-dev-log-to-always-create-symlink.patch
@@ -868,6 +869,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %{_datadir}/systemd/gatewayd
 
 %changelog
+* Tue Nov 04 2014 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-10
+- Fix for #1159641.
+
 * Mon Nov 03 2014 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-9
 - Drop PackageKit.service from presets (#1154126)
 - Pull more changes from upstream, including post-217 bugfixes. This