From 610eae29f2b16f06747896cf766f84f130116b8f Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 25 2015 04:23:59 +0000
Subject: Fix patches


---

diff --git a/systemd.conf.m4 b/systemd.conf.m4
new file mode 100644
index 0000000..d9d51af
--- /dev/null
+++ b/systemd.conf.m4
@@ -0,0 +1,42 @@
+#  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.
+
+# See tmpfiles.d(5) for details
+
+d /run/user 0755 root root -
+F! /run/utmp 0664 root utmp -
+
+d /run/systemd/ask-password 0755 root root -
+d /run/systemd/seats 0755 root root -
+d /run/systemd/sessions 0755 root root -
+d /run/systemd/users 0755 root root -
+d /run/systemd/machines 0755 root root -
+d /run/systemd/shutdown 0755 root root -
+m4_ifdef(`ENABLE_NETWORKD',
+d /run/systemd/netif 0755 systemd-network systemd-network -
+d /run/systemd/netif/links 0755 systemd-network systemd-network -
+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
+)m4_dnl
+
+d /run/log 0755 root root -
+
+z /run/log/journal 2755 root systemd-journal - -
+Z /run/log/journal/%m ~2750 root systemd-journal - -
+m4_ifdef(`HAVE_ACL',``
+a+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
+A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
+'')m4_dnl
+
+z /var/log/journal 2755 root systemd-journal - -
+z /var/log/journal/%m 2755 root systemd-journal - -
+m4_ifdef(`HAVE_ACL',``
+a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
+a+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
+'')m4_dnl
+
+d /var/lib/systemd 0755 root root -
+d /var/lib/systemd/coredump 0755 root root 3d
diff --git a/systemd.spec b/systemd.spec
index 4a26a79..9f8bbe3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -38,6 +38,8 @@ Source6:        sysctl.conf.README
 Source7:        systemd-journal-remote.xml
 Source8:        systemd-journal-gatewayd.xml
 
+Source9:        https://raw.githubusercontent.com/systemd/systemd/master/tmpfiles.d/systemd.conf.m4
+
 # Patch series is available from http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v219-stable
 # GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v219..v219-stable
 # i=1; for p in 0*patch;do printf "Patch%04d:      %s\n" $i $p; ((i++));done
@@ -274,7 +276,7 @@ Patch0230:      0230-hwdb-add-Logitech-MX-Master-DPI-settings.patch
 Patch0231:      0231-ata_id-unreverse-WWN-identifier.patch
 Patch0232:      0232-ata_id-rules-temporarily-restore-botched-wwn-stable-.patch
 Patch0233:      0233-units-order-networkd-after-sysctl.patch
-Patch0234:      0234-tmpfiles-don-t-recursively-descend-into-journal-dire.patch
+#Patch0234:      0234-tmpfiles-don-t-recursively-descend-into-journal-dire.patch
 Patch0235:      0235-exit-status-add-a-missing-string-for-EXIT_SMACK_PROC.patch
 Patch0236:      0236-udev-fix-parameter-process.patch
 
@@ -460,6 +462,10 @@ systemd-journal-gatewayd serves journal events over the network using HTTP.
 %prep
 %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
 
+# This should have been part of the tarball, but is not for some reason
+cp %{SOURCE9} tmpfiles.d/
+rm tmpfiles.d/systemd.conf
+
 %if %{num_patches}
     git init
     git config user.email "systemd-maint@redhat.com"