- rel 13

- leave /proc/kmsg (as in kernel log messages) processing to syslog
- don't package coredump.conf until systemd-coredump does not exist

Changed files:
    kmsg-to-syslog.patch -> 1.1
    systemd.spec -> 1.154

diff --git a/kmsg-to-syslog.patch b/kmsg-to-syslog.patch
new file mode 100644 (file)
index 0000000..81c294a
--- /dev/null
+++ b/kmsg-to-syslog.patch
@@ -0,0 +1,8 @@
+--- systemd-44/src/journal/systemd-journald.conf~      2012-03-15 23:13:15.000000000 +0100
++++ systemd-44/src/journal/systemd-journald.conf       2012-04-23 08:17:08.660433320 +0200
+@@ -22,4 +22,4 @@
+ #ForwardToSyslog=yes
+ #ForwardToKMsg=no
+ #ForwardToConsole=no
+-#ImportKernel=yes
++ImportKernel=no

diff --git a/systemd.spec b/systemd.spec
index f342db4e666504ede0f1a783ccb67813a19ffa27..6b782b7f5f173206e7bdfa2f73ed556b6c6140cf 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,7 +20,7 @@ Summary:      A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 Version:       44
-Release:       12
+Release:       13
 License:       GPL v2+
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -44,6 +44,7 @@ Patch4:               tmpfiles-not-fatal.patch
 Patch5:                CVE-2012-1174.patch
 Patch6:                ReleaseSession.patch
 Patch7:                control-subcgroup.patch
+Patch8:                kmsg-to-syslog.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -325,6 +326,7 @@ Force update of packages that provide tmpfiles.d configuration
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -630,7 +632,10 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service
 %dir %{_libexecdir}/binfmt.d
 %dir %{_libexecdir}/modules-load.d
 %dir %{_libexecdir}/sysctl.d
-%{_libexecdir}/sysctl.d/coredump.conf
+# Don't package the kernel.core_pattern setting until systemd-coredump
+# is a part of an actual systemd release and it's made clear how to
+# get the core dumps out of the journal.
+#%{_libexecdir}/sysctl.d/coredump.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted