[systemd/f18] Ship a dummy syslog.target (#951957).

[Michal Schmidt]

commit ca5f3014c4891cc861360892892fae2d7cbdaa7b
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Apr 15 18:28:50 2013 +0200

    Ship a dummy syslog.target (#951957).
    
    and Update README.Fedora-18.

 0015-F18-ship-a-dummy-syslog.target.patch |   53 +++++++++++++++++++++++++++++
 README.Fedora-18                          |    9 +++++
 systemd.spec                              |    9 ++++-
 3 files changed, 70 insertions(+), 1 deletions(-)
---
diff --git a/0015-F18-ship-a-dummy-syslog.target.patch b/0015-F18-ship-a-dummy-syslog.target.patch
new file mode 100644
index 0000000..255c81d
--- /dev/null
+++ b/0015-F18-ship-a-dummy-syslog.target.patch
@@ -0,0 +1,53 @@
+From 935d892fb6ed3ef54056abcc1873c24d77289cf9 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Mon, 15 Apr 2013 18:07:00 +0200
+Subject: [PATCH] (F18) ship a dummy syslog.target
+
+There are buggy unit files which Require syslog.target.
+For F18 resurrect a syslog.target unit as a workaround.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=951957
+---
+ Makefile.am         |  1 +
+ units/syslog.target | 20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+)
+ create mode 100644 units/syslog.target
+
+diff --git a/Makefile.am b/Makefile.am
+index c192cb3..c7b5a4a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -397,6 +397,7 @@ dist_systemunit_DATA = \
+ 	units/quotaon.service \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
++	units/syslog.target \
+ 	units/systemd-udevd-control.socket \
+ 	units/systemd-udevd-kernel.socket \
+ 	units/system-update.target \
+diff --git a/units/syslog.target b/units/syslog.target
+new file mode 100644
+index 0000000..96eb155
+--- /dev/null
++++ b/units/syslog.target
+@@ -0,0 +1,20 @@
++#  This file is part of systemd.
++#
++#  systemd is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU Lesser General Public License as published by
++#  the Free Software Foundation; either version 2.1 of the License, or
++#  (at your option) any later version.
++
++# This unit file exists only for compatibility with broken unit files
++# that express hard requirement dependencies on syslog.target (i.e.
++# invalid usage of a provides-like target).
++
++[Unit]
++Description=Dummy Syslog target for compatibility with broken unit files
++Documentation=man:systemd.special(7)
++Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog
++
++# Avoid that we conflict with shutdown.target, so that we can stay
++# until the very end and do not cancel shutdown.target if we should
++# happen to be activated very late.
++DefaultDependencies=no
diff --git a/README.Fedora-18 b/README.Fedora-18
index e73adb1..f8de6ff 100644
--- a/README.Fedora-18
+++ b/README.Fedora-18
@@ -31,3 +31,12 @@ following areas where systemd in Fedora 18 differs from the upstream version:
 - The udev support for predictable network interface names is present, but it
   is not enabled by default. Users interested in the feature have to opt-in by
   passing the parameter "net.ifnames=1" on the kernel command line.
+
+- A persistent journal is not created by default. Users may opt-in by creating
+  /var/log/journal with appropriate ACLs manually:
+    mkdir /var/log/journal
+    setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/
+
+- A dummy syslog.target unit is provided in F18 as a workaround for broken unit
+  files that have requirement dependencies (such as Requires) on it. The units
+  must be fixed for future Fedora releases.
diff --git a/systemd.spec b/systemd.spec
index b598721..7410d6f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        201
-Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}.3
+Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}.4
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -50,8 +50,11 @@ Patch0009:      0009-keymap-Fix-typo-in-previous-commit.patch
 Patch0010:      0010-shutdown-print-a-nice-message-before-returning-to-in.patch
 Patch0011:      0011-units-fix-some-left-over-mentions-of-remote-fs-setup.patch
 Patch0012:      0012-logind-avoid-creating-stale-session-state-files.patch
+# Simple workaround for dracut difference vs F19
 Patch0013:      0013-F18-main-downgrade-message-about-failure-to-isolate-.patch
 Patch0014:      0014-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
+# Workaround some broken unit files in F18
+Patch0015:      0015-F18-ship-a-dummy-syslog.target.patch
 
 # kernel-install patch for grubby, drop if grubby is obsolete
 Patch1000:      kernel-install-grubby.patch
@@ -789,6 +792,10 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Mon Apr 15 2013 Michal Schmidt <mschmidt at redhat.com> - 201-2.fc18.4
+- Ship a dummy syslog.target (#951957).
+- Update README.Fedora-18.
+
 * Mon Apr 15 2013 Michal Schmidt <mschmidt at redhat.com> - 201-2.fc18.3
 - Fix parsing of envfiles with empty lines (#951866).