diff --git a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
index b8ca9b2..c3b9c3a 100644
--- a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
+++ b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] kernel-install: add fedora specific callouts to
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
old mode 100644
new mode 100755
-index 3ae1d77e3..f1c74de27
+index 3ae1d77e33..f1c74de27e
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -71,6 +71,42 @@ fi
diff --git a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
index 8adaa52..f61c9b1 100644
--- a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
+++ b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
@@ -15,7 +15,7 @@ Conflicts:
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/README b/README
-index c72209262..5f5783a68 100644
+index c72209262e..5f5783a684 100644
--- a/README
+++ b/README
@@ -135,7 +135,8 @@ REQUIREMENTS:
@@ -29,7 +29,7 @@ index c72209262..5f5783a68 100644
dracut (optional)
PolicyKit (optional)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 78ceeb6fa..d8976809d 100644
+index 78ceeb6fab..d8976809d1 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -323,11 +323,16 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
index b1ba2d4..e528319 100644
--- a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
+++ b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
@@ -9,7 +9,7 @@ Read /etc/sysctl.conf as the last file, overwriting everything.
1 file changed, 4 insertions(+)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 275a5b74a..d007c932c 100644
+index 275a5b74ae..d007c932c6 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -320,6 +320,10 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0004-remove-user-.service.patch b/SOURCES/0004-remove-user-.service.patch
index 0ea024f..5c38570 100644
--- a/SOURCES/0004-remove-user-.service.patch
+++ b/SOURCES/0004-remove-user-.service.patch
@@ -11,7 +11,7 @@ Conflicts:
2 files changed, 40 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index bf04d3184..75459f74d 100644
+index bf04d31840..75459f74d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -535,7 +535,6 @@ nodist_systemunit_DATA = \
@@ -31,7 +31,7 @@ index bf04d3184..75459f74d 100644
units/systemd-suspend.service.in \
units/quotaon.service.in \
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index f4c4490e8..97eb4feca 100644
+index f4c4490e8f..97eb4feca9 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -399,39 +399,6 @@ static int user_start_slice(User *u) {
diff --git a/SOURCES/0005-logind-session-save-stopping-flag.patch b/SOURCES/0005-logind-session-save-stopping-flag.patch
index e478ac6..904227a 100644
--- a/SOURCES/0005-logind-session-save-stopping-flag.patch
+++ b/SOURCES/0005-logind-session-save-stopping-flag.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index a02a537f7..d2e7b4012 100644
+index a02a537f7c..d2e7b40124 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -181,12 +181,14 @@ int session_save(Session *s) {
diff --git a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
index e536cd8..6f45bda 100644
--- a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
+++ b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
@@ -10,7 +10,7 @@ Resolves: #978948
1 file changed, 11 insertions(+)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 338c1d328..6f30474c3 100644
+index 338c1d3280..6f30474c39 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1713,6 +1713,17 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
diff --git a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
index df8ec5c..0b09ee8 100644
--- a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
+++ b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 rules/40-redhat.rules
diff --git a/Makefile.am b/Makefile.am
-index 75459f74d..a734e9c48 100644
+index 75459f74d3..a734e9c486 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3564,7 +3564,8 @@ dist_udevrules_DATA += \
@@ -31,7 +31,7 @@ index 75459f74d..a734e9c48 100644
rules/99-systemd.rules
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
new file mode 100644
-index 000000000..2b494e57c
+index 0000000000..2b494e57cf
--- /dev/null
+++ b/rules/40-redhat.rules
@@ -0,0 +1,3 @@
diff --git a/SOURCES/0008-Revert-remove-references-of-readahead.patch b/SOURCES/0008-Revert-remove-references-of-readahead.patch
index 264938b..28fd9ff 100644
--- a/SOURCES/0008-Revert-remove-references-of-readahead.patch
+++ b/SOURCES/0008-Revert-remove-references-of-readahead.patch
@@ -11,7 +11,7 @@ This reverts commit 3b71c18d3e3906f8606c66bea98b327684394e61.
3 files changed, 9 insertions(+)
diff --git a/.gitignore b/.gitignore
-index e8a4085a3..0360f7c6b 100644
+index e8a4085a3a..0360f7c6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@
@@ -23,7 +23,7 @@ index e8a4085a3..0360f7c6b 100644
/systemd-remount-fs
/systemd-reply-password
diff --git a/README b/README
-index 5f5783a68..287d05c9b 100644
+index 5f5783a684..287d05c9b4 100644
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ AUTHOR:
@@ -35,7 +35,7 @@ index 5f5783a68..287d05c9b 100644
- except src/shared/siphash24.c which is CC0 Public Domain
- except src/journal/lookup3.c which is Public Domain
diff --git a/TODO b/TODO
-index 255a4f2d0..90b2c4b30 100644
+index 255a4f2d07..90b2c4b30a 100644
--- a/TODO
+++ b/TODO
@@ -786,6 +786,13 @@ Features:
diff --git a/SOURCES/0009-Revert-missing-remove-fanotify.patch b/SOURCES/0009-Revert-missing-remove-fanotify.patch
index 447c020..7e22f05 100644
--- a/SOURCES/0009-Revert-missing-remove-fanotify.patch
+++ b/SOURCES/0009-Revert-missing-remove-fanotify.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 src/shared/linux/fanotify.h
diff --git a/Makefile.am b/Makefile.am
-index a734e9c48..70e4fbc6d 100644
+index a734e9c486..70e4fbc6d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -749,6 +749,7 @@ libsystemd_shared_la_SOURCES = \
@@ -28,7 +28,7 @@ index a734e9c48..70e4fbc6d 100644
src/shared/missing.h \
src/shared/initreq.h \
diff --git a/configure.ac b/configure.ac
-index 97a29d63f..3f50887a8 100644
+index 97a29d63fd..3f50887a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,6 +310,7 @@ RT_LIBS="$LIBS"
@@ -41,7 +41,7 @@ index 97a29d63f..3f50887a8 100644
AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN],
diff --git a/src/shared/linux/fanotify.h b/src/shared/linux/fanotify.h
new file mode 100644
-index 000000000..5cc1a7e67
+index 0000000000..5cc1a7e676
--- /dev/null
+++ b/src/shared/linux/fanotify.h
@@ -0,0 +1,98 @@
@@ -144,7 +144,7 @@ index 000000000..5cc1a7e67
+
+#endif /* _LINUX_FANOTIFY_H */
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index b33a70cb2..06a55769a 100644
+index b33a70cb2c..06a55769a4 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -156,6 +156,70 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
diff --git a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
index 4dad621..7a692c0 100644
--- a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
+++ b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
@@ -89,7 +89,7 @@ Conflicts:
create mode 100644 units/systemd-readahead-replay.service.in
diff --git a/Makefile-man.am b/Makefile-man.am
-index d0fb9aa1a..ac6f69af7 100644
+index d0fb9aa1ae..ac6f69af70 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1234,6 +1234,34 @@ man/systemd-random-seed.html: man/systemd-random-seed.service.html
@@ -152,7 +152,7 @@ index d0fb9aa1a..ac6f69af7 100644
man/systemd-resolved.service.xml \
man/systemd-rfkill@.service.xml \
diff --git a/Makefile.am b/Makefile.am
-index 70e4fbc6d..b0e4b5a42 100644
+index 70e4fbc6d4..b0e4b5a42a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2603,7 +2603,8 @@ systemctl_LDADD = \
@@ -224,7 +224,7 @@ index 70e4fbc6d..b0e4b5a42 100644
if ENABLE_BOOTCHART
systemd_bootchart_SOURCES = \
diff --git a/configure.ac b/configure.ac
-index 3f50887a8..f701bcf71 100644
+index 3f50887a8d..f701bcf716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -930,6 +930,14 @@ if test "x$enable_vconsole" != "xno"; then
@@ -251,7 +251,7 @@ index 3f50887a8..f701bcf71 100644
quotacheck: ${have_quotacheck}
tmpfiles: ${have_tmpfiles}
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
-index b7ba36365..b12abe2dc 100644
+index b7ba363656..b12abe2dc8 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -137,6 +137,7 @@
@@ -263,7 +263,7 @@ index b7ba36365..b12abe2dc 100644
</para>
</refsect1>
diff --git a/man/sd-login.xml b/man/sd-login.xml
-index 328f71164..abcdb99f6 100644
+index 328f71164d..abcdb99f6f 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -128,6 +128,7 @@
@@ -276,7 +276,7 @@ index 328f71164..abcdb99f6 100644
</refsect1>
diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml
new file mode 100644
-index 000000000..bcc46b24d
+index 0000000000..bcc46b24d8
--- /dev/null
+++ b/man/sd-readahead.xml
@@ -0,0 +1,117 @@
@@ -399,7 +399,7 @@ index 000000000..bcc46b24d
+</refentry>
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
new file mode 100644
-index 000000000..98272997c
+index 0000000000..98272997cb
--- /dev/null
+++ b/man/sd_readahead.xml
@@ -0,0 +1,178 @@
@@ -582,7 +582,7 @@ index 000000000..98272997c
+
+</refentry>
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
-index 06d5ae531..46ede1ab8 100644
+index 06d5ae5319..46ede1ab8f 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -127,6 +127,17 @@
@@ -605,7 +605,7 @@ index 06d5ae531..46ede1ab8 100644
</variablelist>
diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
new file mode 100644
-index 000000000..669fe7894
+index 0000000000..669fe78942
--- /dev/null
+++ b/man/systemd-readahead-replay.service.xml
@@ -0,0 +1,203 @@
@@ -813,7 +813,7 @@ index 000000000..669fe7894
+
+</refentry>
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 51254ec53..b552029b8 100644
+index 51254ec533..b552029b82 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,5 +17,6 @@ src/hostname/hostnamed.c
@@ -824,7 +824,7 @@ index 51254ec53..b552029b8 100644
units/user@.service.in
units/debug-shell.service.in
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
-index 58b1c7b4e..06f03bd1e 100644
+index 58b1c7b4e5..06f03bd1e7 100644
--- a/shell-completion/zsh/_systemd
+++ b/shell-completion/zsh/_systemd
@@ -63,7 +63,8 @@ case "$service" in
@@ -838,7 +838,7 @@ index 58b1c7b4e..06f03bd1e 100644
systemd-tty-ask-password-agent)
_arguments \
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 05061c070..dfbca8754 100644
+index 05061c0704..dfbca8754f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -111,7 +111,7 @@ static int create_disk(
@@ -851,7 +851,7 @@ index 05061c070..dfbca8754 100644
if (!nofail)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 5c58b58f8..7d5a6c650 100644
+index 5c58b58f8a..7d5a6c6508 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -133,6 +133,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
@@ -863,7 +863,7 @@ index 5c58b58f8..7d5a6c650 100644
"Type=oneshot\n"
"RemainAfterExit=yes\n"
diff --git a/src/notify/notify.c b/src/notify/notify.c
-index f98075d51..e4a128b0b 100644
+index f98075d513..e4a128b0b2 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -31,6 +31,7 @@
@@ -944,7 +944,7 @@ index f98075d51..e4a128b0b 100644
diff --git a/src/readahead/Makefile b/src/readahead/Makefile
new file mode 120000
-index 000000000..d0b0e8e00
+index 0000000000..d0b0e8e008
--- /dev/null
+++ b/src/readahead/Makefile
@@ -0,0 +1 @@
@@ -952,7 +952,7 @@ index 000000000..d0b0e8e00
\ No newline at end of file
diff --git a/src/readahead/readahead-analyze.c b/src/readahead/readahead-analyze.c
new file mode 100644
-index 000000000..76db3cb7e
+index 0000000000..76db3cb7e4
--- /dev/null
+++ b/src/readahead/readahead-analyze.c
@@ -0,0 +1,146 @@
@@ -1104,7 +1104,7 @@ index 000000000..76db3cb7e
+}
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
new file mode 100644
-index 000000000..822a803a4
+index 0000000000..822a803a41
--- /dev/null
+++ b/src/readahead/readahead-collect.c
@@ -0,0 +1,650 @@
@@ -1760,7 +1760,7 @@ index 000000000..822a803a4
+}
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
new file mode 100644
-index 000000000..3ca48a725
+index 0000000000..3ca48a7257
--- /dev/null
+++ b/src/readahead/readahead-common.c
@@ -0,0 +1,398 @@
@@ -2164,7 +2164,7 @@ index 000000000..3ca48a725
+}
diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h
new file mode 100644
-index 000000000..b34f3aadd
+index 0000000000..b34f3aadd7
--- /dev/null
+++ b/src/readahead/readahead-common.h
@@ -0,0 +1,61 @@
@@ -2231,7 +2231,7 @@ index 000000000..b34f3aadd
+int main_analyze(const char *pack_path);
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
new file mode 100644
-index 000000000..f81e0fe55
+index 0000000000..f81e0fe55d
--- /dev/null
+++ b/src/readahead/readahead-replay.c
@@ -0,0 +1,281 @@
@@ -2518,7 +2518,7 @@ index 000000000..f81e0fe55
+}
diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c
new file mode 100644
-index 000000000..35176e937
+index 0000000000..35176e9379
--- /dev/null
+++ b/src/readahead/readahead.c
@@ -0,0 +1,163 @@
@@ -2687,7 +2687,7 @@ index 000000000..35176e937
+}
diff --git a/src/readahead/sd-readahead.c b/src/readahead/sd-readahead.c
new file mode 100644
-index 000000000..675d82cdd
+index 0000000000..675d82cdd1
--- /dev/null
+++ b/src/readahead/sd-readahead.c
@@ -0,0 +1,89 @@
@@ -2782,7 +2782,7 @@ index 000000000..675d82cdd
+}
diff --git a/src/readahead/test-ssd.c b/src/readahead/test-ssd.c
new file mode 100644
-index 000000000..808faf359
+index 0000000000..808faf359c
--- /dev/null
+++ b/src/readahead/test-ssd.c
@@ -0,0 +1,41 @@
@@ -2829,7 +2829,7 @@ index 000000000..808faf359
+}
diff --git a/src/systemd/sd-readahead.h b/src/systemd/sd-readahead.h
new file mode 100644
-index 000000000..bb30f9a45
+index 0000000000..bb30f9a45e
--- /dev/null
+++ b/src/systemd/sd-readahead.h
@@ -0,0 +1,73 @@
@@ -2907,7 +2907,7 @@ index 000000000..bb30f9a45
+
+#endif
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
-index ee1b864bc..24963f062 100644
+index ee1b864bcf..24963f0623 100644
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -12,6 +12,7 @@ enable remote-fs.target
@@ -2919,7 +2919,7 @@ index ee1b864bc..24963f062 100644
enable systemd-networkd.service
enable systemd-resolved.service
diff --git a/units/.gitignore b/units/.gitignore
-index 6fdb629c3..638a7abc4 100644
+index 6fdb629c3d..638a7abc4c 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -52,6 +52,9 @@
@@ -2933,7 +2933,7 @@ index 6fdb629c3..638a7abc4 100644
/systemd-remount-fs.service
/systemd-resolved.service
diff --git a/units/ldconfig.service b/units/ldconfig.service
-index f9691e2f2..43c145b72 100644
+index f9691e2f2d..43c145b726 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -10,7 +10,7 @@ Description=Rebuild Dynamic Linker Cache
@@ -2946,7 +2946,7 @@ index f9691e2f2..43c145b72 100644
ConditionNeedsUpdate=/etc
diff --git a/units/quotaon.service.in b/units/quotaon.service.in
-index 7d59a4019..49a50a7fe 100644
+index 7d59a40195..49a50a7feb 100644
--- a/units/quotaon.service.in
+++ b/units/quotaon.service.in
@@ -9,7 +9,7 @@
@@ -2959,7 +2959,7 @@ index 7d59a4019..49a50a7fe 100644
ConditionPathExists=@QUOTAON@
diff --git a/units/system-update.target b/units/system-update.target
-index 48d46fcbd..d0f847f95 100644
+index 48d46fcbda..d0f847f957 100644
--- a/units/system-update.target
+++ b/units/system-update.target
@@ -10,7 +10,7 @@ Description=System Update
@@ -2972,7 +2972,7 @@ index 48d46fcbd..d0f847f95 100644
Before=shutdown.target
AllowIsolate=yes
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
-index 5e6706c11..b146e30f2 100644
+index 5e6706c11c..b146e30f2d 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-backlight@.service(8)
@@ -2985,7 +2985,7 @@ index 5e6706c11..b146e30f2 100644
[Service]
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index 34a5d5237..02dfe774d 100644
+index 34a5d5237b..02dfe774df 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
@@ -2998,7 +2998,7 @@ index 34a5d5237..02dfe774d 100644
ConditionPathIsReadWrite=/proc/sys/
ConditionDirectoryNotEmpty=|/lib/binfmt.d
diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in
-index 405c6f3fd..89fa7e1dd 100644
+index 405c6f3fd2..89fa7e1dd7 100644
--- a/units/systemd-firstboot.service.in
+++ b/units/systemd-firstboot.service.in
@@ -10,7 +10,7 @@ Description=First Boot Wizard
@@ -3011,7 +3011,7 @@ index 405c6f3fd..89fa7e1dd 100644
ConditionPathIsReadWrite=/etc
ConditionFirstBoot=yes
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
-index 6d7657853..26cce5131 100644
+index 6d7657853e..26cce5131e 100644
--- a/units/systemd-fsck-root.service.in
+++ b/units/systemd-fsck-root.service.in
@@ -9,6 +9,7 @@
@@ -3023,7 +3023,7 @@ index 6d7657853..26cce5131 100644
ConditionPathIsReadWrite=!/
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
-index 857e62567..d2cda6a46 100644
+index 857e625679..d2cda6a466 100644
--- a/units/systemd-fsck@.service.in
+++ b/units/systemd-fsck@.service.in
@@ -10,7 +10,7 @@ Description=File System Check on %f
@@ -3036,7 +3036,7 @@ index 857e62567..d2cda6a46 100644
[Service]
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
-index 791528e2b..4bed482f8 100644
+index 791528e2b2..4bed482f8c 100644
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -10,7 +10,7 @@ Description=Rebuild Hardware Database
@@ -3049,7 +3049,7 @@ index 791528e2b..4bed482f8 100644
ConditionNeedsUpdate=/etc
ConditionPathExists=|!@udevlibexecdir@/hwdb.bin
diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in
-index 6370dd478..5b85889dd 100644
+index 6370dd478f..5b85889dda 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/units/systemd-journal-catalog-update.service.in
@@ -10,7 +10,7 @@ Description=Rebuild Journal Catalog
@@ -3062,7 +3062,7 @@ index 6370dd478..5b85889dd 100644
ConditionNeedsUpdate=/etc
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
-index 040a0febe..32deb52e2 100644
+index 040a0febe8..32deb52e26 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,6 +10,7 @@ Description=Load Kernel Modules
@@ -3074,7 +3074,7 @@ index 040a0febe..32deb52e2 100644
ConditionCapability=CAP_SYS_MODULE
ConditionDirectoryNotEmpty=|/lib/modules-load.d
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
-index 5cb9bc3bc..f726ea1bc 100644
+index 5cb9bc3bc9..f726ea1bcd 100644
--- a/units/systemd-quotacheck.service.in
+++ b/units/systemd-quotacheck.service.in
@@ -9,7 +9,7 @@
@@ -3087,7 +3087,7 @@ index 5cb9bc3bc..f726ea1bc 100644
ConditionPathExists=@QUOTACHECK@
diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
-index b55844b36..1879b2f24 100644
+index b55844b36f..1879b2f24c 100644
--- a/units/systemd-random-seed.service.in
+++ b/units/systemd-random-seed.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-random-seed.service(8) man:random(4)
@@ -3101,7 +3101,7 @@ index b55844b36..1879b2f24 100644
[Service]
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
new file mode 100644
-index 000000000..d4b8e6793
+index 0000000000..d4b8e67932
--- /dev/null
+++ b/units/systemd-readahead-collect.service.in
@@ -0,0 +1,28 @@
@@ -3135,7 +3135,7 @@ index 000000000..d4b8e6793
+Also=systemd-readahead-drop.service
diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in
new file mode 100644
-index 000000000..e0d957944
+index 0000000000..e0d9579449
--- /dev/null
+++ b/units/systemd-readahead-done.service.in
@@ -0,0 +1,22 @@
@@ -3163,7 +3163,7 @@ index 000000000..e0d957944
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer
new file mode 100644
-index 000000000..c58e09616
+index 0000000000..c58e09616e
--- /dev/null
+++ b/units/systemd-readahead-done.timer
@@ -0,0 +1,22 @@
@@ -3191,7 +3191,7 @@ index 000000000..c58e09616
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-drop.service b/units/systemd-readahead-drop.service
new file mode 100644
-index 000000000..d9d12bc53
+index 0000000000..d9d12bc533
--- /dev/null
+++ b/units/systemd-readahead-drop.service
@@ -0,0 +1,19 @@
@@ -3216,7 +3216,7 @@ index 000000000..d9d12bc53
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
new file mode 100644
-index 000000000..c64a533e4
+index 0000000000..c64a533e4e
--- /dev/null
+++ b/units/systemd-readahead-replay.service.in
@@ -0,0 +1,26 @@
@@ -3247,7 +3247,7 @@ index 000000000..c64a533e4
+[Install]
+WantedBy=default.target
diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
-index 8d9daacaa..70e1a8680 100644
+index 8d9daacaa5..70e1a8680a 100644
--- a/units/systemd-remount-fs.service.in
+++ b/units/systemd-remount-fs.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-remount-fs.service(8)
@@ -3260,7 +3260,7 @@ index 8d9daacaa..70e1a8680 100644
Wants=local-fs-pre.target
ConditionPathExists=/etc/fstab
diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in
-index b48efe5d9..0d2757d61 100644
+index b48efe5d99..0d2757d61c 100644
--- a/units/systemd-rfkill@.service.in
+++ b/units/systemd-rfkill@.service.in
@@ -12,7 +12,7 @@ DefaultDependencies=no
@@ -3273,7 +3273,7 @@ index b48efe5d9..0d2757d61 100644
[Service]
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
-index fa72085f9..ade9dc300 100644
+index fa72085f9e..ade9dc3007 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -10,6 +10,7 @@ Description=Apply Kernel Variables
@@ -3285,7 +3285,7 @@ index fa72085f9..ade9dc300 100644
Before=sysinit.target shutdown.target
ConditionPathIsReadWrite=/proc/sys/
diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in
-index ffd6d7747..69fea11fb 100644
+index ffd6d7747b..69fea11fb1 100644
--- a/units/systemd-sysusers.service.in
+++ b/units/systemd-sysusers.service.in
@@ -10,7 +10,7 @@ Description=Create System Users
@@ -3298,7 +3298,7 @@ index ffd6d7747..69fea11fb 100644
ConditionNeedsUpdate=/etc
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
-index 133c8c94c..31b237841 100644
+index 133c8c94c4..31b2378410 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
@@ -3311,7 +3311,7 @@ index 133c8c94c..31b237841 100644
[Service]
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
-index 0123a030e..0b66c53fe 100644
+index 0123a030e4..0b66c53fe0 100644
--- a/units/systemd-tmpfiles-setup-dev.service.in
+++ b/units/systemd-tmpfiles-setup-dev.service.in
@@ -10,7 +10,7 @@ Description=Create Static Device Nodes in /dev
@@ -3324,7 +3324,7 @@ index 0123a030e..0b66c53fe 100644
ConditionCapability=CAP_SYS_MODULE
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index e895cda0e..72ab083d5 100644
+index e895cda0e6..72ab083d54 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -10,7 +10,7 @@ Description=Create Volatile Files and Directories
@@ -3337,7 +3337,7 @@ index e895cda0e..72ab083d5 100644
RefuseManualStop=yes
diff --git a/units/systemd-update-done.service.in b/units/systemd-update-done.service.in
-index ec7d90639..7031bff61 100644
+index ec7d906392..7031bff614 100644
--- a/units/systemd-update-done.service.in
+++ b/units/systemd-update-done.service.in
@@ -10,7 +10,7 @@ Description=Update is Completed
@@ -3350,7 +3350,7 @@ index ec7d90639..7031bff61 100644
ConditionNeedsUpdate=|/etc
ConditionNeedsUpdate=|/var
diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
-index 163eccd91..da7dda76b 100644
+index 163eccd91f..da7dda76ba 100644
--- a/units/systemd-update-utmp.service.in
+++ b/units/systemd-update-utmp.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
@@ -3363,7 +3363,7 @@ index 163eccd91..da7dda76b 100644
[Service]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
-index 616036187..18faa63f2 100644
+index 6160361871..18faa63f28 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -10,6 +10,7 @@ Description=Setup Virtual Console
diff --git a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
index 224549e..573205c 100644
--- a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
+++ b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
@@ -14,7 +14,7 @@ Resolves: #1054477
create mode 100644 rules/73-idrac.rules
diff --git a/Makefile.am b/Makefile.am
-index b0e4b5a42..9e64d6f98 100644
+index b0e4b5a42a..9e64d6f988 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3567,7 +3567,8 @@ dist_udevrules_DATA += \
@@ -29,7 +29,7 @@ index b0e4b5a42..9e64d6f98 100644
rules/99-systemd.rules
diff --git a/rules/73-idrac.rules b/rules/73-idrac.rules
new file mode 100644
-index 000000000..d67fc425b
+index 0000000000..d67fc425b1
--- /dev/null
+++ b/rules/73-idrac.rules
@@ -0,0 +1,6 @@
diff --git a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
index 8f2ca1f..d9d9682 100644
--- a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
+++ b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
@@ -25,7 +25,7 @@ Conflicts:
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 37ff1b800..99caa0a2a 100644
+index 37ff1b8008..99caa0a2ab 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -38,7 +38,7 @@
diff --git a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
index f43c278..ae948e9 100644
--- a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
+++ b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
@@ -12,7 +12,7 @@ This reverts commit d47f6ca5f9b7a0b400d8bdb050151a0284fb4bdb.
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/README b/README
-index 287d05c9b..ac2a81c0c 100644
+index 287d05c9b4..ac2a81c0cc 100644
--- a/README
+++ b/README
@@ -115,7 +115,7 @@ REQUIREMENTS:
@@ -25,7 +25,7 @@ index 287d05c9b..ac2a81c0c 100644
PAM >= 1.1.2 (optional)
libcryptsetup (optional)
diff --git a/configure.ac b/configure.ac
-index f701bcf71..9c25c3c6f 100644
+index f701bcf716..9c25c3c6fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"])
@@ -38,7 +38,7 @@ index f701bcf71..9c25c3c6f 100644
if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then
AC_MSG_ERROR([*** blkid support requested but libraries not found])
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
-index 03e3dc286..89995831b 100644
+index 03e3dc2867..89995831b1 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -221,7 +221,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
diff --git a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
index 74d8ed2..ad6558d 100644
--- a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
+++ b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] journald-audit: exit gracefully in the case we can't join
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index c2f1545cc..151097a6e 100644
+index c2f1545cc9..151097a6e6 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -529,8 +529,10 @@ int server_open_audit(Server *s) {
diff --git a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
index 12ce6da..2e944f8 100644
--- a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
+++ b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 3 deletions(-)
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
-index 9b0e080e6..125d6e0a1 100644
+index 9b0e080e6f..125d6e0a17 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -10,8 +10,5 @@
diff --git a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
index 6ca0904..d961513 100644
--- a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
+++ b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
@@ -16,7 +16,7 @@ Conflicts:
2 files changed, 170 insertions(+), 91 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 9e64d6f98..bf65b2406 100644
+index 9e64d6f988..bf65b24060 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,7 @@ catalogdir=$(prefix)/lib/systemd/catalog
@@ -50,7 +50,7 @@ index 9e64d6f98..bf65b2406 100644
# ------------------------------------------------------------------------------
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 753c3d1d6..66097ef74 100644
+index 753c3d1d65..66097ef741 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -186,141 +186,211 @@ static int context_write_data_local_rtc(Context *c) {
diff --git a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
index 9d0405c..ec96e4f 100644
--- a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
+++ b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
@@ -15,7 +15,7 @@ possibly confuse gcc5 on armv7hl to segfault during compilation.
1 file changed, 1 insertion(+)
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index 34d93379d..de9c6ab32 100644
+index 34d93379da..de9c6ab32d 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -179,6 +179,7 @@ static int verify_cert_authorized(gnutls_session_t session) {
diff --git a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
index 11dbfd4..33846e8 100644
--- a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
+++ b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
@@ -11,7 +11,7 @@ Found by Valgrind while testing the previous memory leak fix.
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index de9c6ab32..a95fff18f 100644
+index de9c6ab32d..a95fff18f3 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -239,10 +239,14 @@ static int get_auth_dn(gnutls_x509_crt_t client_cert, char **buf) {
diff --git a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
index 7df522b..e31dc92 100644
--- a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
+++ b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
@@ -11,7 +11,7 @@ parse_acl() returns the error instead of setting errno.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index c948d4d21..88ba7e46a 100644
+index c948d4d218..88ba7e46a2 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -689,7 +689,7 @@ static int get_acls_from_arg(Item *item) {
diff --git a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
index f153626..628c688 100644
--- a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
+++ b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] test: utf8 - fix utf16 tests on BE machines
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
-index befa38575..346f8524c 100644
+index befa385754..346f8524c6 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -95,7 +95,7 @@ static void test_utf8_escaping_printable(void) {
diff --git a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
index dcfd099..1d72b94 100644
--- a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
+++ b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
@@ -16,7 +16,7 @@ Status quo ante can be restored with:
2 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index a4ff1ab87..cbe09d7ab 100644
+index a4ff1ab878..cbe09d7aba 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -282,6 +282,77 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
@@ -113,7 +113,7 @@ index a4ff1ab87..cbe09d7ab 100644
if (acl_copy_entry(j, i) < 0)
return -errno;
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
-index 90e88ffa2..fdb90063f 100644
+index 90e88ffa26..fdb90063fa 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
diff --git a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
index c88d977..3e500df 100644
--- a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
+++ b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
@@ -15,7 +15,7 @@ src/shared/time-util.c:789:25: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index 947ac1fcf..1c36c577c 100644
+index 947ac1fcfb..1c36c577c4 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -786,7 +786,7 @@ int parse_nsec(const char *t, nsec_t *nsec) {
diff --git a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
index 32071ee..cee0f61 100644
--- a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
+++ b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] test-time: test "infinity" parsing in nanoseconds
1 file changed, 6 insertions(+)
diff --git a/src/test/test-time.c b/src/test/test-time.c
-index 8cfc4cc4f..3840fff06 100644
+index 8cfc4cc4fe..3840fff061 100644
--- a/src/test/test-time.c
+++ b/src/test/test-time.c
@@ -78,12 +78,18 @@ static void test_parse_nsec(void) {
diff --git a/SOURCES/0024-bootchart-fix-default-init-path.patch b/SOURCES/0024-bootchart-fix-default-init-path.patch
index 5412474..ede2395 100644
--- a/SOURCES/0024-bootchart-fix-default-init-path.patch
+++ b/SOURCES/0024-bootchart-fix-default-init-path.patch
@@ -15,7 +15,7 @@ https://launchpad.net/bugs/1423867
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index bf65b2406..2e6455f6e 100644
+index bf65b24060..2e6455f6e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,7 @@ AM_CPPFLAGS = \
@@ -27,7 +27,7 @@ index bf65b2406..2e6455f6e 100644
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
-index 64a384bac..175be6868 100644
+index 64a384bacf..175be68688 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -76,7 +76,7 @@ int sysfd=-1;
diff --git a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
index 711be45..b78b75e 100644
--- a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
+++ b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1184712
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 21cb898b9..6b93ec844 100644
+index 21cb898b9a..6b93ec8446 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7204,6 +7204,11 @@ found:
diff --git a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
index 8905c89..af1f944 100644
--- a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
+++ b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
@@ -11,7 +11,7 @@ CID#1271344/1271345
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index cbe09d7ab..e67e9acb6 100644
+index cbe09d7aba..e67e9acb6a 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -302,7 +302,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
diff --git a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
index 9aa8e4c..e7920e8 100644
--- a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
+++ b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
@@ -11,7 +11,7 @@ If we have less samples than expected, systemd-bootchart will crash.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
-index e111fa9cc..144177cd4 100644
+index e111fa9cce..144177cd47 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -1170,7 +1170,7 @@ static void svg_ps_bars(void) {
diff --git a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
index 540dc28..0b62bdc 100644
--- a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
+++ b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
@@ -13,7 +13,7 @@ syscalls getrandom and memfd_create").
1 file changed, 10 insertions(+)
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 06a55769a..8cb0b2c96 100644
+index 06a55769a4..8cb0b2c96e 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -243,6 +243,16 @@ static inline int memfd_create(const char *name, unsigned int flags) {
diff --git a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
index b0c98a8..6394ebd 100644
--- a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
+++ b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
@@ -16,7 +16,7 @@ in --user mode, but leave a BindsTo= dependency in --system mode.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index ee8e607c2..9f1e55e2f 100644
+index ee8e607c27..9f1e55e2f1 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2845,7 +2845,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
diff --git a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
index ee8e413..efd1243 100644
--- a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
+++ b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
@@ -18,7 +18,7 @@ deactivate, as there's no point in further iteration.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 9f1e55e2f..563f6fe85 100644
+index 9f1e55e2f1..563f6fe850 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1648,12 +1648,14 @@ static void unit_check_binds_to(Unit *u) {
diff --git a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
index 9789955..62c8734 100644
--- a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
+++ b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
@@ -12,7 +12,7 @@ overrides.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index d007c932c..b6945eda5 100644
+index d007c932c6..b6945eda54 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -176,7 +176,7 @@ found:
diff --git a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
index e2ed67c..90d037d 100644
--- a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
+++ b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
@@ -13,7 +13,7 @@ https://lists.fedoraproject.org/pipermail/devel/2015-February/208412.html
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
-index f18923399..def151bb8 100644
+index f18923399b..def151bb84 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -5,9 +5,16 @@
diff --git a/SOURCES/0033-core-rework-device-state-logic.patch b/SOURCES/0033-core-rework-device-state-logic.patch
index 6c79277..de711bd 100644
--- a/SOURCES/0033-core-rework-device-state-logic.patch
+++ b/SOURCES/0033-core-rework-device-state-logic.patch
@@ -25,7 +25,7 @@ its BindTo dependency on the device would not be fulfilled.
6 files changed, 285 insertions(+), 180 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index d3deac393..75b9a4628 100644
+index d3deac3936..75b9a46287 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -36,7 +36,8 @@
@@ -595,7 +595,7 @@ index d3deac393..75b9a4628 100644
DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
diff --git a/src/core/device.h b/src/core/device.h
-index bb7ae0783..0609b20fd 100644
+index bb7ae07834..0609b20fdb 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -29,20 +29,28 @@ typedef struct Device Device;
@@ -636,7 +636,7 @@ index bb7ae0783..0609b20fd 100644
+
+int device_found_node(Manager *m, const char *node, bool add, DeviceFound found, bool now);
diff --git a/src/core/mount.c b/src/core/mount.c
-index f3977e62d..c971330af 100644
+index f3977e62de..c971330af2 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1391,7 +1391,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
@@ -754,7 +754,7 @@ index f3977e62d..c971330af 100644
/* New or changed mount entry */
diff --git a/src/core/swap.c b/src/core/swap.c
-index 6997921fd..5c19af5d9 100644
+index 6997921fde..5c19af5d91 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -338,7 +338,7 @@ static int swap_load(Unit *u) {
@@ -881,7 +881,7 @@ index 6997921fd..5c19af5d9 100644
int r = 0;
Swap *s;
diff --git a/src/core/swap.h b/src/core/swap.h
-index 73e64d87a..914a2dbcc 100644
+index 73e64d87a4..914a2dbccd 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -116,8 +116,8 @@ struct Swap {
@@ -896,7 +896,7 @@ index 73e64d87a..914a2dbcc 100644
const char* swap_state_to_string(SwapState i) _const_;
SwapState swap_state_from_string(const char *s) _pure_;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 563f6fe85..a6558ee23 100644
+index 563f6fe850..a6558ee23b 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2843,7 +2843,6 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
diff --git a/SOURCES/0034-core-fix-return-value-on-OOM.patch b/SOURCES/0034-core-fix-return-value-on-OOM.patch
index e1916e0..d20be17 100644
--- a/SOURCES/0034-core-fix-return-value-on-OOM.patch
+++ b/SOURCES/0034-core-fix-return-value-on-OOM.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core: fix return value on OOM
1 file changed, 2 insertions(+)
diff --git a/src/core/device.c b/src/core/device.c
-index 75b9a4628..1cc103c29 100644
+index 75b9a46287..1cc103c290 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -211,6 +211,8 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha
diff --git a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
index 65398d5..cd115ec 100644
--- a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
+++ b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
@@ -16,7 +16,7 @@ Failed to get machine PTY: Input/output error
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
-index b46f0a8da..b0f0f66e0 100644
+index b46f0a8dac..b0f0f66e09 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -477,7 +477,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
diff --git a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
index 25f87b1..39b3589 100644
--- a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
+++ b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] shared: AFS is also a network filesystem
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index ba035caed..f24b5b4ec 100644
+index ba035caed0..f24b5b4ec5 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1689,6 +1689,7 @@ bool chars_intersect(const char *a, const char *b) {
diff --git a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
index 29e00dd..05144dd 100644
--- a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
+++ b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
@@ -14,7 +14,7 @@ systemd[1]: Unit type .swap is not supported on this system.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 4775219e4..bc9b7ec62 100644
+index 4775219e4a..bc9b7ec620 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -961,7 +961,7 @@ int manager_enumerate(Manager *m) {
diff --git a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
index 1c337ce..8c3adb7 100644
--- a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
+++ b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
@@ -14,7 +14,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89391
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index d9dea8deb..afded7e38 100644
+index d9dea8deb0..afded7e380 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -344,22 +344,25 @@ int process_data(RemoteSource *source) {
@@ -78,7 +78,7 @@ index d9dea8deb..afded7e38 100644
source->state = STATE_DATA_FINISH;
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
-index 8499f4eb8..22db55091 100644
+index 8499f4eb82..22db550913 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -42,7 +42,9 @@ typedef struct RemoteSource {
diff --git a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
index b628a6a..d915722 100644
--- a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
+++ b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
@@ -18,7 +18,7 @@ This is because ext4 does not support FS_NOCOW_FL.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 2845e05ce..0f28718b0 100644
+index 2845e05ce0..0f28718b0e 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2611,8 +2611,8 @@ int journal_file_open(
diff --git a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
index e31e45d..58c8cee 100644
--- a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
+++ b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89379
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
-index 028c2a7a5..22a3a5347 100644
+index 028c2a7a5b..22a3a5347a 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
diff --git a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
index a360030..cccf37c 100644
--- a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
+++ b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
@@ -12,7 +12,7 @@ than -ENOSYS. For -ENOSYS, debug log is printed.
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 88ba7e46a..187997e1f 100644
+index 88ba7e46a2..187997e1f4 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -704,6 +704,9 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
diff --git a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
index 6489de5..d3aa3e5 100644
--- a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
+++ b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
@@ -13,7 +13,7 @@ treat this like if this directory was empty, and not an error.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index f24b5b4ec..85487230a 100644
+index f24b5b4ec5..85487230a2 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5994,7 +5994,7 @@ int on_ac_power(void) {
diff --git a/SOURCES/0043-import-remove-unused-variable.patch b/SOURCES/0043-import-remove-unused-variable.patch
index 2f53c5d..c1b250a 100644
--- a/SOURCES/0043-import-remove-unused-variable.patch
+++ b/SOURCES/0043-import-remove-unused-variable.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] import: remove unused variable
1 file changed, 1 deletion(-)
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
-index 999aa8ab5..493252a13 100644
+index 999aa8ab5e..493252a132 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -301,7 +301,6 @@ finish:
diff --git a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
index ca351d0..76d6e19 100644
--- a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
+++ b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
@@ -22,7 +22,7 @@ System Information
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 1b7d87101..2cb976923 100644
+index 1b7d87101a..2cb976923d 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -586,7 +586,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr*
diff --git a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
index ffc4ab6..7955280 100644
--- a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
+++ b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
@@ -11,7 +11,7 @@ They were removed in commit 798d3a52 ("Reindent man pages to 2ch").
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 9b07af422..640cb8b7d 100644
+index 9b07af4226..640cb8b7d6 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -715,11 +715,12 @@
diff --git a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
index 80be3a9..e8a2d25 100644
--- a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
+++ b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
@@ -33,7 +33,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1186018
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/core/socket.c b/src/core/socket.c
-index 48c43a288..88aae4815 100644
+index 48c43a2880..88aae4815b 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2100,7 +2100,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
@@ -64,7 +64,7 @@ index 48c43a288..88aae4815 100644
if (p) {
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index b9db7f104..70bc1caa2 100644
+index b9db7f1047..70bc1caa2a 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -436,6 +436,10 @@ bool path_equal(const char *a, const char *b) {
@@ -79,7 +79,7 @@ index b9db7f104..70bc1caa2 100644
assert(path);
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index bd0d32473..bcf116ed3 100644
+index bd0d32473f..bcf116ed3d 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -45,6 +45,7 @@ int path_make_relative(const char *from_dir, const char *to_path, char **_r);
@@ -91,7 +91,7 @@ index bd0d32473..bcf116ed3 100644
char** path_strv_make_absolute_cwd(char **l);
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c6f64876b..c278d6f9d 100644
+index c6f64876be..c278d6f9d4 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -325,9 +325,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
diff --git a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
index 8fd388d..f1daf0d 100644
--- a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
+++ b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
@@ -11,7 +11,7 @@ Cleanup. No behavior change.
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c278d6f9d..c31f60ec7 100644
+index c278d6f9d4..c31f60ec7e 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -435,48 +435,48 @@ bool socket_ipv6_is_supported(void) {
diff --git a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
index 7bda801..cddcfc4 100644
--- a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
+++ b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
@@ -12,7 +12,7 @@ instead of implementing similar comparing of addresses.
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c31f60ec7..deecce8a8 100644
+index c31f60ec7e..deecce8a80 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -464,23 +464,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) {
diff --git a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
index 052866b..b90180a 100644
--- a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
+++ b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
@@ -13,7 +13,7 @@ socket, just return false.
1 file changed, 4 insertions(+)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index deecce8a8..a4e26b1d8 100644
+index deecce8a80..a4e26b1d8c 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -349,6 +349,10 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
diff --git a/SOURCES/0050-man-make-bootup-graph-consistent.patch b/SOURCES/0050-man-make-bootup-graph-consistent.patch
index 35d03cd..c96d103 100644
--- a/SOURCES/0050-man-make-bootup-graph-consistent.patch
+++ b/SOURCES/0050-man-make-bootup-graph-consistent.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: make bootup graph consistent
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/bootup.xml b/man/bootup.xml
-index d97d55023..b92057af2 100644
+index d97d550236..b92057af29 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -134,7 +134,7 @@
diff --git a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
index b38325f..6373c1b 100644
--- a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
+++ b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] nspawn: fix whitespace and typo in partition table blurb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index fb672510b..7724df96b 100644
+index fb672510b4..7724df96bd 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2676,7 +2676,7 @@ static int setup_image(char **device_path, int *loop_nr) {
diff --git a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
index 84321a7..616571a 100644
--- a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
+++ b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
@@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1195294
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 8815bf997..4bd0fcf75 100644
+index 8815bf9970..4bd0fcf751 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -443,23 +443,22 @@
diff --git a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
index be25640..6241468 100644
--- a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
+++ b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] systemctl: check validity of PID we received
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 6b93ec844..3da4d3d4f 100644
+index 6b93ec8446..3da4d3d4f1 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2881,6 +2881,9 @@ static int check_inhibitors(sd_bus *bus, enum action a) {
diff --git a/SOURCES/0054-systemctl-support-auditd.service-better.patch b/SOURCES/0054-systemctl-support-auditd.service-better.patch
index 71dfcd4..679f672 100644
--- a/SOURCES/0054-systemctl-support-auditd.service-better.patch
+++ b/SOURCES/0054-systemctl-support-auditd.service-better.patch
@@ -17,7 +17,7 @@ a file.
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 3da4d3d4f..4ec0cff21 100644
+index 3da4d3d4f1..4ec0cff21d 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4555,6 +4555,23 @@ static int init_home_and_lookup_paths(char **user_home, char **user_runtime, Loo
diff --git a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
index 6a35a44..3845afe 100644
--- a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
+++ b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
@@ -17,7 +17,7 @@ src/shared/unit-name.c:102:34: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
-index 21b66913c..f728af4a8 100644
+index 21b66913c9..f728af4a81 100644
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -100,7 +100,7 @@ bool unit_name_is_valid(const char *n, enum template_valid template_ok) {
diff --git a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
index 8790fa0..5136e00 100644
--- a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
+++ b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
@@ -18,7 +18,7 @@ src/test/test-hashmap.c:76:79: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
-index 6900da9e8..351563b96 100644
+index 6900da9e89..351563b967 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -75,7 +75,7 @@ static void test_trivial_compare_func(void) {
diff --git a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
index bb838a9..cec7336 100644
--- a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
+++ b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
@@ -15,7 +15,7 @@ Test the same condition twice, pretty sure we mean
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/barrier.c b/src/shared/barrier.c
-index f65363a67..b7dca7509 100644
+index f65363a67b..b7dca75097 100644
--- a/src/shared/barrier.c
+++ b/src/shared/barrier.c
@@ -178,7 +178,7 @@ void barrier_set_role(Barrier *b, unsigned int role) {
diff --git a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index fca08a7..091c43c 100644
--- a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 42 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index fb789fd49..4fd951a58 100644
+index fb789fd495..4fd951a584 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -1430,3 +1430,45 @@ bluetooth:v01D9*
diff --git a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
index 7b188fa..f861327 100644
--- a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
+++ b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
@@ -30,7 +30,7 @@ except that:
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 0f28718b0..24c49b916 100644
+index 0f28718b0e..24c49b916a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2014,8 +2014,7 @@ void journal_file_reset_location(JournalFile *f) {
@@ -44,7 +44,7 @@ index 0f28718b0..24c49b916 100644
f->current_offset = offset;
f->current_seqnum = le64toh(o->entry.seqnum);
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 2526e14d6..403c8f760 100644
+index 2526e14d65..403c8f760c 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -199,7 +199,7 @@ int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t s
@@ -57,7 +57,7 @@ index 2526e14d6..403c8f760 100644
int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 94891cdf3..9b57e5945 100644
+index 94891cdf35..9b57e5945d 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -723,13 +723,17 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
diff --git a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
index 741690b..054a8c7 100644
--- a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
+++ b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
@@ -28,7 +28,7 @@ src/shared/condition.c:47:9: note: in expansion of macro ‘assert’
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/condition.c b/src/shared/condition.c
-index da7560f05..796cc520d 100644
+index da7560f05f..796cc520d7 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -46,7 +46,7 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger
diff --git a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
index ccf7ab1..ec3f25d 100644
--- a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
+++ b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
@@ -11,7 +11,7 @@ That part of functionality was removed in 7fb3ee51c1b377.
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
-index 9d796b1ae..e75ef11c4 100644
+index 9d796b1ae1..e75ef11c4e 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -55,13 +55,12 @@
diff --git a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
index 1e141bd..f3982bc 100644
--- a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
+++ b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89382
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 9c25c3c6f..3201428c4 100644
+index 9c25c3c6fc..3201428c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,13 +208,13 @@ AS_CASE([$CC], [*clang*],
diff --git a/SOURCES/0063-man-fix-typo.patch b/SOURCES/0063-man-fix-typo.patch
index 08edf6c..651613d 100644
--- a/SOURCES/0063-man-fix-typo.patch
+++ b/SOURCES/0063-man-fix-typo.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: fix typo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
-index 4480e1999..ef58887dc 100644
+index 4480e1999d..ef58887dc8 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -108,7 +108,7 @@
diff --git a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
index 4156898..7c1b294 100644
--- a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
+++ b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] bus-proxyd: avoid logging oom twice
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
-index b6b005636..b6550ed3c 100644
+index b6b0056362..b6550ed3cf 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -82,7 +82,7 @@ static int client_context_new(ClientContext **out) {
diff --git a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
index c376514..57410e0 100644
--- a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
+++ b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Do not run sysv-generator-test when sysv compat is disabled
1 file changed, 5 insertions(+)
diff --git a/Makefile.am b/Makefile.am
-index 2e6455f6e..4933f76bd 100644
+index 2e6455f6e3..4933f76bdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3789,9 +3789,14 @@ TESTS += \
diff --git a/SOURCES/0066-README-mention-ACLs-more.patch b/SOURCES/0066-README-mention-ACLs-more.patch
index 7785e09..8abe0bb 100644
--- a/SOURCES/0066-README-mention-ACLs-more.patch
+++ b/SOURCES/0066-README-mention-ACLs-more.patch
@@ -11,7 +11,7 @@ They are now useful for any fs used for journal storage.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
-index ac2a81c0c..ffc2cf9f2 100644
+index ac2a81c0cc..ffc2cf9f20 100644
--- a/README
+++ b/README
@@ -78,8 +78,8 @@ REQUIREMENTS:
diff --git a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
index 80f3c11..5fa65b9 100644
--- a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
+++ b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
@@ -31,7 +31,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89397
16 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
-index 8d9700d30..bf6ca0bf9 100644
+index 8d9700d300..bf6ca0bf9e 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -68,8 +68,7 @@
@@ -45,7 +45,7 @@ index 8d9700d30..bf6ca0bf9 100644
<refsect1>
<title>Options</title>
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
-index 3d325e6ad..0b7329bf5 100644
+index 3d325e6ad7..0b7329bf55 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -63,8 +63,7 @@
@@ -59,7 +59,7 @@ index 3d325e6ad..0b7329bf5 100644
<refsect1>
<title>Options</title>
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 364b58f07..85146b0d8 100644
+index 364b58f07e..85146b0d82 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -64,8 +64,7 @@
@@ -73,7 +73,7 @@ index 364b58f07..85146b0d8 100644
<refsect1>
<title>Options</title>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
-index ffaec5035..ca2b18783 100644
+index ffaec50351..ca2b18783c 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -58,11 +58,13 @@
@@ -94,7 +94,7 @@ index ffaec5035..ca2b18783 100644
<refsect1>
<title>Options</title>
diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
-index 36cae2706..8047a4ea7 100644
+index 36cae2706c..8047a4ea75 100644
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -63,8 +63,7 @@
@@ -108,7 +108,7 @@ index 36cae2706..8047a4ea7 100644
<refsect1>
<title>Options</title>
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
-index b87d7e955..36af45927 100644
+index b87d7e955b..36af45927d 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -33,13 +33,39 @@
@@ -160,7 +160,7 @@ index b87d7e955..36af45927 100644
</refsection>
</refsection>
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
-index 433f2f83a..bb17ec866 100644
+index 433f2f83a0..bb17ec8669 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -112,8 +112,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
@@ -174,7 +174,7 @@ index 433f2f83a..bb17ec866 100644
<refsect1>
<title>Options</title>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 7c3f23756..c7bcfaee4 100644
+index 7c3f237567..c7bcfaee4d 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -74,8 +74,7 @@
@@ -188,7 +188,7 @@ index 7c3f23756..c7bcfaee4 100644
<refsect1>
<title>Options</title>
diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
-index 1127970a1..89a651c66 100644
+index 1127970a18..89a651c662 100644
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -63,8 +63,7 @@
@@ -202,7 +202,7 @@ index 1127970a1..89a651c66 100644
<refsect1>
<title>Options</title>
diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf
-index 2d7cb6121..4f5e50936 100644
+index 2d7cb61217..4f5e50936e 100644
--- a/src/bootchart/bootchart.conf
+++ b/src/bootchart/bootchart.conf
@@ -5,10 +5,11 @@
@@ -221,7 +221,7 @@ index 2d7cb6121..4f5e50936 100644
[Bootchart]
#Samples=500
diff --git a/src/core/system.conf b/src/core/system.conf
-index a3727200d..231609033 100644
+index a3727200df..231609033b 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -5,10 +5,11 @@
@@ -240,7 +240,7 @@ index a3727200d..231609033 100644
[Manager]
#LogLevel=info
diff --git a/src/journal/coredump.conf b/src/journal/coredump.conf
-index 0fe9fe801..c2f0643e0 100644
+index 0fe9fe801a..c2f0643e03 100644
--- a/src/journal/coredump.conf
+++ b/src/journal/coredump.conf
@@ -5,10 +5,11 @@
@@ -259,7 +259,7 @@ index 0fe9fe801..c2f0643e0 100644
[Coredump]
#Storage=external
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 29bdf8f18..47eefe91c 100644
+index 29bdf8f183..47eefe91c1 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -5,10 +5,11 @@
@@ -278,7 +278,7 @@ index 29bdf8f18..47eefe91c 100644
[Journal]
#Storage=auto
diff --git a/src/login/logind.conf b/src/login/logind.conf
-index 6b1943a2d..834c4c2eb 100644
+index 6b1943a2d1..834c4c2ebf 100644
--- a/src/login/logind.conf
+++ b/src/login/logind.conf
@@ -5,10 +5,11 @@
@@ -297,7 +297,7 @@ index 6b1943a2d..834c4c2eb 100644
[Login]
#NAutoVTs=6
diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
-index e5a19ee47..3eb19e42b 100644
+index e5a19ee474..3eb19e42b7 100644
--- a/src/resolve/resolved.conf.in
+++ b/src/resolve/resolved.conf.in
@@ -5,8 +5,9 @@
@@ -313,7 +313,7 @@ index e5a19ee47..3eb19e42b 100644
# See resolved.conf(5) for details
diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in
-index fc3c6c49c..b6a2ada27 100644
+index fc3c6c49cf..b6a2ada273 100644
--- a/src/timesync/timesyncd.conf.in
+++ b/src/timesync/timesyncd.conf.in
@@ -5,10 +5,11 @@
diff --git a/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch b/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch
index 680602b..874c6b6 100644
--- a/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch
+++ b/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89411
1 file changed, 2 insertions(+)
diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb
-index bbf44db77..9fcb5fdb9 100644
+index bbf44db778..9fcb5fdb9b 100644
--- a/hwdb/70-touchpad.hwdb
+++ b/hwdb/70-touchpad.hwdb
@@ -36,4 +36,6 @@
diff --git a/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch b/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch
index fb5bd17..c74305b 100644
--- a/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch
+++ b/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch
@@ -16,7 +16,7 @@ be to simply make the kernel stop creating these devices as they are pretty usel
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
-index 8119205dd..7d193d088 100644
+index 8119205dde..7d193d088e 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -261,7 +261,7 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
diff --git a/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch b/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch
index 9bff772..cca1220 100644
--- a/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch
+++ b/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch
@@ -18,7 +18,7 @@ Subject: [PATCH] man: replace obsolete wiki link with man page
10 files changed, 18 insertions(+), 34 deletions(-)
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
-index 0e48e7934..1974cd7a2 100644
+index 0e48e79346..1974cd7a2d 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -59,10 +59,8 @@
@@ -35,7 +35,7 @@ index 0e48e7934..1974cd7a2 100644
<refsect1>
diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
-index 74c3b2620..5c5e9fc4a 100644
+index 74c3b2620e..5c5e9fc4a1 100644
--- a/man/systemd-debug-generator.xml
+++ b/man/systemd-debug-generator.xml
@@ -79,10 +79,8 @@
@@ -52,7 +52,7 @@ index 74c3b2620..5c5e9fc4a 100644
<refsect1>
diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
-index b2d8d65e3..fd7ba7983 100644
+index b2d8d65e3d..fd7ba79837 100644
--- a/man/systemd-efi-boot-generator.xml
+++ b/man/systemd-efi-boot-generator.xml
@@ -68,9 +68,7 @@
@@ -67,7 +67,7 @@ index b2d8d65e3..fd7ba7983 100644
<refsect1>
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
-index 8f82e3330..022efb413 100644
+index 8f82e33304..022efb4130 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -71,10 +71,8 @@
@@ -84,7 +84,7 @@ index 8f82e3330..022efb413 100644
<refsect1>
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
-index 0b5b2f2a7..338925964 100644
+index 0b5b2f2a71..338925964d 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -75,9 +75,8 @@
@@ -100,7 +100,7 @@ index 0b5b2f2a7..338925964 100644
<para>Further information about configuration of gettys you may
find in
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
-index 9c706df24..8d2eaca4f 100644
+index 9c706df246..8d2eaca4f6 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -157,9 +157,7 @@
@@ -115,7 +115,7 @@ index 9c706df24..8d2eaca4f 100644
<refsect1>
diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
-index 3eec1d7b9..e7fc95c74 100644
+index 3eec1d7b93..e7fc95c742 100644
--- a/man/systemd-system-update-generator.xml
+++ b/man/systemd-system-update-generator.xml
@@ -61,10 +61,8 @@
@@ -132,7 +132,7 @@ index 3eec1d7b9..e7fc95c74 100644
<refsect1>
diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
-index e619b1bc2..f2d56cbcd 100644
+index e619b1bc2e..f2d56cbcd2 100644
--- a/man/systemd-sysv-generator.xml
+++ b/man/systemd-sysv-generator.xml
@@ -81,10 +81,8 @@
@@ -149,7 +149,7 @@ index e619b1bc2..f2d56cbcd 100644
<refsect1>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 09e11b471..a452f87ba 100644
+index 09e11b4711..a452f87baf 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -357,8 +357,8 @@
@@ -164,7 +164,7 @@ index 09e11b471..a452f87ba 100644
</refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
-index 80591dc73..9b92140e6 100644
+index 80591dc732..9b92140e6b 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -415,9 +415,8 @@
diff --git a/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch b/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch
index 5140e7e..4b190c5 100644
--- a/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch
+++ b/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89421
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/architecture.c b/src/shared/architecture.c
-index 34c5a53fa..884abdd3e 100644
+index 34c5a53fa9..884abdd3ea 100644
--- a/src/shared/architecture.c
+++ b/src/shared/architecture.c
@@ -108,8 +108,12 @@ int uname_architecture(void) {
diff --git a/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch b/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch
index 6ed6bfc..1812ec3 100644
--- a/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch
+++ b/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=84437
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 2cb976923..88906655e 100644
+index 2cb976923d..88906655ef 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -259,7 +259,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*
diff --git a/SOURCES/0073-Remove-the-cap-on-epoll-events.patch b/SOURCES/0073-Remove-the-cap-on-epoll-events.patch
index 7ec345e..d03d0e7 100644
--- a/SOURCES/0073-Remove-the-cap-on-epoll-events.patch
+++ b/SOURCES/0073-Remove-the-cap-on-epoll-events.patch
@@ -14,7 +14,7 @@ avoiding this issue.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index 25089a033..c6350be9f 100644
+index 25089a0335..c6350be9f4 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -37,7 +37,6 @@
diff --git a/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch b/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch
index c2d7f99..674ae5a 100644
--- a/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch
+++ b/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch
@@ -16,7 +16,7 @@ This patch raises the limit to 4096.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/dbus.c b/src/core/dbus.c
-index 260775cd8..85b517486 100644
+index 260775cd85..85b5174868 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -44,7 +44,7 @@
diff --git a/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch b/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch
index bc2be59..b108f16 100644
--- a/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch
+++ b/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Logitech G5 Laser Mouse
1 file changed, 2 insertions(+)
diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
-index a62ebc497..93ee4d9fa 100644
+index a62ebc497d..93ee4d9fa6 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -196,6 +196,8 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:
diff --git a/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch b/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch
index f491d81..3ff137e 100644
--- a/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch
+++ b/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch
@@ -14,7 +14,7 @@ https://launchpad.net/bugs/1428540
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 187997e1f..1e1096816 100644
+index 187997e1f4..1e10968164 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1750,9 +1750,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
diff --git a/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch b/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch
index 5dcb3ec..417515f 100644
--- a/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch
+++ b/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Lenovo W451 to TOUCHPAD_HAS_TRACKPOINT_BUTTONS list
1 file changed, 2 insertions(+)
diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb
-index 9fcb5fdb9..8a324466b 100644
+index 9fcb5fdb9b..8a324466b3 100644
--- a/hwdb/70-touchpad.hwdb
+++ b/hwdb/70-touchpad.hwdb
@@ -36,6 +36,8 @@
diff --git a/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch b/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
index 19d04e4..3c6ee03 100644
--- a/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
+++ b/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch
@@ -23,7 +23,7 @@ into existence. (The font table is a per-vtcon property.)
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
-index 062009640..35b9ad515 100644
+index 062009640c..35b9ad5151 100644
--- a/src/vconsole/90-vconsole.rules.in
+++ b/src/vconsole/90-vconsole.rules.in
@@ -5,7 +5,6 @@
diff --git a/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch b/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
index 35f5273..1224ad5 100644
--- a/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
+++ b/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch
@@ -36,7 +36,7 @@ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=88401
16 files changed, 89 insertions(+), 33 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 9f6bd84b2..e4c79415d 100644
+index 9f6bd84b21..e4c79415d1 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -235,7 +235,7 @@ static void automount_set_state(Automount *a, AutomountState state) {
@@ -49,7 +49,7 @@ index 9f6bd84b2..e4c79415d 100644
int r;
diff --git a/src/core/busname.c b/src/core/busname.c
-index 1d77292f9..43d7607a3 100644
+index 1d77292f9b..43d7607a30 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -335,7 +335,7 @@ static void busname_set_state(BusName *n, BusNameState state) {
@@ -62,7 +62,7 @@ index 1d77292f9..43d7607a3 100644
int r;
diff --git a/src/core/device.c b/src/core/device.c
-index 1cc103c29..4ff882721 100644
+index 1cc103c290..4ff8827219 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -142,7 +142,7 @@ static void device_set_state(Device *d, DeviceState state) {
@@ -75,7 +75,7 @@ index 1cc103c29..4ff882721 100644
assert(d);
diff --git a/src/core/manager.c b/src/core/manager.c
-index bc9b7ec62..203a6a0a1 100644
+index bc9b7ec620..203a6a0a1a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -983,7 +983,28 @@ static int manager_coldplug(Manager *m) {
@@ -128,7 +128,7 @@ index bc9b7ec62..203a6a0a1 100644
r = q;
}
diff --git a/src/core/mount.c b/src/core/mount.c
-index c971330af..3ae0eb462 100644
+index c971330af2..3ae0eb4621 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -617,7 +617,7 @@ static void mount_set_state(Mount *m, MountState state) {
@@ -141,7 +141,7 @@ index c971330af..3ae0eb462 100644
MountState new_state = MOUNT_DEAD;
int r;
diff --git a/src/core/path.c b/src/core/path.c
-index e5ea79fec..51e36fa8b 100644
+index e5ea79fec7..51e36fa8be 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -440,7 +440,12 @@ static void path_set_state(Path *p, PathState state) {
@@ -173,7 +173,7 @@ index e5ea79fec..51e36fa8b 100644
}
diff --git a/src/core/scope.c b/src/core/scope.c
-index b41db7872..ae6614fbf 100644
+index b41db7872c..ae6614fbf0 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -173,7 +173,7 @@ static int scope_load(Unit *u) {
@@ -186,7 +186,7 @@ index b41db7872..ae6614fbf 100644
int r;
diff --git a/src/core/service.c b/src/core/service.c
-index 15e29be14..7781b4e62 100644
+index 15e29be149..7781b4e626 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -879,7 +879,7 @@ static void service_set_state(Service *s, ServiceState state) {
@@ -199,7 +199,7 @@ index 15e29be14..7781b4e62 100644
int r;
diff --git a/src/core/slice.c b/src/core/slice.c
-index ae9819d01..61ff9d331 100644
+index ae9819d015..61ff9d3314 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -153,7 +153,7 @@ static int slice_load(Unit *u) {
@@ -212,7 +212,7 @@ index ae9819d01..61ff9d331 100644
assert(t);
diff --git a/src/core/snapshot.c b/src/core/snapshot.c
-index b70c3beb6..b1d844877 100644
+index b70c3beb60..b1d8448771 100644
--- a/src/core/snapshot.c
+++ b/src/core/snapshot.c
@@ -75,7 +75,7 @@ static int snapshot_load(Unit *u) {
@@ -225,7 +225,7 @@ index b70c3beb6..b1d844877 100644
assert(s);
diff --git a/src/core/socket.c b/src/core/socket.c
-index 88aae4815..760de0203 100644
+index 88aae4815b..760de0203d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1326,7 +1326,7 @@ static void socket_set_state(Socket *s, SocketState state) {
@@ -238,7 +238,7 @@ index 88aae4815..760de0203 100644
int r;
diff --git a/src/core/swap.c b/src/core/swap.c
-index 5c19af5d9..369abf0f5 100644
+index 5c19af5d91..369abf0f53 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -513,7 +513,7 @@ static void swap_set_state(Swap *s, SwapState state) {
@@ -251,7 +251,7 @@ index 5c19af5d9..369abf0f5 100644
SwapState new_state = SWAP_DEAD;
int r;
diff --git a/src/core/target.c b/src/core/target.c
-index 33fb66bc3..2411a8e75 100644
+index 33fb66bc3f..2411a8e758 100644
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -107,7 +107,7 @@ static int target_load(Unit *u) {
@@ -264,7 +264,7 @@ index 33fb66bc3..2411a8e75 100644
assert(t);
diff --git a/src/core/timer.c b/src/core/timer.c
-index 45744c7de..48cf9c16a 100644
+index 45744c7de5..48cf9c16a8 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -268,7 +268,12 @@ static void timer_set_state(Timer *t, TimerState state) {
@@ -296,7 +296,7 @@ index 45744c7de..48cf9c16a 100644
}
diff --git a/src/core/unit.c b/src/core/unit.c
-index a6558ee23..565455bd6 100644
+index a6558ee23b..565455bd63 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2859,27 +2859,34 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
@@ -344,7 +344,7 @@ index a6558ee23..565455bd6 100644
return 0;
}
diff --git a/src/core/unit.h b/src/core/unit.h
-index 291bc77a7..7ebc489c8 100644
+index 291bc77a76..7ebc489c80 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -307,8 +307,14 @@ struct UnitVTable {
diff --git a/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch b/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch
index 7ed65ee..ad5b01f 100644
--- a/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch
+++ b/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] firstboot: set all spwd fields to -1 for consistency with
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a765d6d21..a37ca170f 100644
+index a765d6d219..a37ca170fb 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -525,9 +525,9 @@ static int process_root_password(void) {
diff --git a/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch b/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch
index 42754c7..d5de7bf 100644
--- a/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch
+++ b/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch
@@ -14,7 +14,7 @@ It's better to relax checks here than to duplicate functionality in firstboot.
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
-index e47bcb4dc..76b5962c5 100644
+index e47bcb4dca..76b5962c51 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -605,6 +605,8 @@ static int write_files(void) {
diff --git a/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch b/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch
index 365ea8c..2218e3f 100644
--- a/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch
+++ b/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch
@@ -11,7 +11,7 @@ CID #1257765.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 7724df96b..78bd58483 100644
+index 7724df96bd..78bd584834 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3627,7 +3627,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch b/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch
index 9b65c08..145aca1 100644
--- a/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch
+++ b/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch
@@ -11,7 +11,7 @@ CID #1256583.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
-index 44bda34af..88af23e35 100644
+index 44bda34aff..88af23e35c 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -260,7 +260,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch b/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch
index 76156cb..f031851 100644
--- a/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch
+++ b/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] journalctl: update hint now that we set ACL everywhere
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 55c778633..12c869f5a 100644
+index 55c7786331..12c869f5af 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1542,10 +1542,17 @@ static int access_check_var_log_journal(sd_journal *j) {
diff --git a/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch b/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch
index acb14c3..33f563e 100644
--- a/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch
+++ b/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch
@@ -12,7 +12,7 @@ properly when the user lacks permissions.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9b57e5945..9b9e8ac85 100644
+index 9b57e5945d..9b9e8ac859 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1248,7 +1248,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) {
diff --git a/SOURCES/0086-missing.h-add-NDA_.patch b/SOURCES/0086-missing.h-add-NDA_.patch
index 7a138df..f5b62d8 100644
--- a/SOURCES/0086-missing.h-add-NDA_.patch
+++ b/SOURCES/0086-missing.h-add-NDA_.patch
@@ -13,7 +13,7 @@ introduced in v3.9 and NDA_PORT, NDA_VNI and NDA_IFINDEX in v3.10
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 3201428c4..081ed0f6e 100644
+index 3201428c44..081ed0f6eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,7 +334,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
@@ -35,7 +35,7 @@ index 3201428c4..081ed0f6e 100644
# This makes sure pkg.m4 is available.
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 8cb0b2c96..6ef4dbdf4 100644
+index 8cb0b2c96e..6ef4dbdf43 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -35,6 +35,7 @@
diff --git a/SOURCES/0087-udevd-close-race-in-udev-settle.patch b/SOURCES/0087-udevd-close-race-in-udev-settle.patch
index f9c94c7..f431baf 100644
--- a/SOURCES/0087-udevd-close-race-in-udev-settle.patch
+++ b/SOURCES/0087-udevd-close-race-in-udev-settle.patch
@@ -33,7 +33,7 @@ Reported-by: Daniel Drake <drake@endlessm.com>
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 99d4c8983..e98c1fd6d 100644
+index 99d4c8983a..e98c1fd6da 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -909,6 +909,17 @@ static void handle_signal(struct udev *udev, int signo) {
diff --git a/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch b/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch
index 1c575a5..ed2d682 100644
--- a/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch
+++ b/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] man: document that ExecStartPre= is not the place to start
1 file changed, 5 insertions(+)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index c03b4e8a5..f59870563 100644
+index c03b4e8a54..f598705633 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -334,6 +334,11 @@
diff --git a/SOURCES/0089-journal-fix-return-code.patch b/SOURCES/0089-journal-fix-return-code.patch
index 181e296..0542075 100644
--- a/SOURCES/0089-journal-fix-return-code.patch
+++ b/SOURCES/0089-journal-fix-return-code.patch
@@ -14,7 +14,7 @@ recurse this deep.
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 24c49b916..f500568fe 100644
+index 24c49b916a..f500568fec 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2652,10 +2652,8 @@ int journal_file_open(
diff --git a/SOURCES/0090-console-fix-error-code-inversion.patch b/SOURCES/0090-console-fix-error-code-inversion.patch
index 9a1c797..794530e 100644
--- a/SOURCES/0090-console-fix-error-code-inversion.patch
+++ b/SOURCES/0090-console-fix-error-code-inversion.patch
@@ -13,7 +13,7 @@ instead of <0, which will not be detected as error by sysview-core.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
-index 9dd62f04a..25de0a218 100644
+index 9dd62f04a0..25de0a218f 100644
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -228,7 +228,7 @@ static int manager_sysview_session_control(Manager *m, sysview_event *event) {
diff --git a/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch b/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch
index 22e3e42..b953905 100644
--- a/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch
+++ b/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch
@@ -29,7 +29,7 @@ dbus-daemon does).
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
-index 3dea908f5..e13cf5e2e 100644
+index 3dea908f5b..e13cf5e2ea 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -729,13 +729,21 @@ static int proxy_process_destination_to_local(Proxy *p) {
@@ -59,7 +59,7 @@ index 3dea908f5..e13cf5e2e 100644
}
diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
-index 913d47071..782c4e60b 100644
+index 913d47071b..782c4e60b3 100644
--- a/src/bus-proxyd/proxy.h
+++ b/src/bus-proxyd/proxy.h
@@ -40,6 +40,7 @@ struct Proxy {
diff --git a/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch b/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch
index cf4fcf0..2452b37 100644
--- a/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch
+++ b/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch
@@ -17,7 +17,7 @@ Aborted (core dumped)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
-index 3c7ad4060..f951c37cb 100644
+index 3c7ad40605..f951c37cbc 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -447,7 +447,7 @@ static int display(Hashmap *a) {
diff --git a/SOURCES/0093-man-split-paragraph.patch b/SOURCES/0093-man-split-paragraph.patch
index 710bca8..92b4c86 100644
--- a/SOURCES/0093-man-split-paragraph.patch
+++ b/SOURCES/0093-man-split-paragraph.patch
@@ -12,7 +12,7 @@ paragraph to make it much easier to find.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 11b160e58..fdb157864 100644
+index 11b160e58f..fdb1578641 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -283,7 +283,9 @@
diff --git a/SOURCES/0094-hwdb-update.patch b/SOURCES/0094-hwdb-update.patch
index 949272f..dcc5811 100644
--- a/SOURCES/0094-hwdb-update.patch
+++ b/SOURCES/0094-hwdb-update.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] hwdb: update
4 files changed, 1060 insertions(+), 334 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 6976bdf64..deb323d34 100644
+index 6976bdf649..deb323d34c 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -28829,7 +28829,7 @@ OUI:0013EB*
@@ -844,7 +844,7 @@ index 6976bdf64..deb323d34 100644
ID_OUI_FROM_DATABASE=HBC-radiomatic
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 6c2208887..3b35b26e5 100644
+index 6c22088873..3b35b26e59 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -4361,6 +4361,9 @@ pci:v00001002d0000665Csv00001787sd00002329*
@@ -2631,7 +2631,7 @@ index 6c2208887..3b35b26e5 100644
ID_VENDOR_FROM_DATABASE=JusonTech Corporation
diff --git a/hwdb/20-sdio-vendor-model.hwdb b/hwdb/20-sdio-vendor-model.hwdb
-index 626d673c4..9cf34b2a3 100644
+index 626d673c4d..9cf34b2a39 100644
--- a/hwdb/20-sdio-vendor-model.hwdb
+++ b/hwdb/20-sdio-vendor-model.hwdb
@@ -80,6 +80,36 @@ sdio:c*v02D0*
@@ -2672,7 +2672,7 @@ index 626d673c4..9cf34b2a3 100644
ID_VENDOR_FROM_DATABASE=SyChip Inc.
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 94e0269ce..8867531a3 100644
+index 94e0269ce7..8867531a31 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -503,6 +503,9 @@ usb:v03F0p0217*
diff --git a/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch b/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch
index ee3b7cb..2f8f9ea 100644
--- a/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch
+++ b/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch
@@ -28,7 +28,7 @@ will fail with -EBUSY.
1 file changed, 5 insertions(+)
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
-index ae49c77e0..7cdcc5d96 100644
+index ae49c77e01..7cdcc5d96a 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
@@ -61,6 +61,11 @@ static int sd_rtnl_new(sd_rtnl **ret) {
diff --git a/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch b/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch
index e784add..dc961f9 100644
--- a/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch
+++ b/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch
@@ -13,7 +13,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89486
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index afded7e38..6c096de03 100644
+index afded7e380..6c096de03a 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -443,7 +443,7 @@ int process_source(RemoteSource *source, bool compress, bool seal) {
@@ -26,7 +26,7 @@ index afded7e38..6c096de03 100644
if (!source->iovw.count) {
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
-index df3004939..99820fa7b 100644
+index df30049397..99820fa7b8 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -156,7 +156,7 @@ int writer_write(Writer *w,
@@ -39,7 +39,7 @@ index df3004939..99820fa7b 100644
log_debug("Retrying write.");
r = journal_file_append_entry(w->journal, ts, iovw->iovec, iovw->count,
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index 8f32a9a98..d1486e7cd 100644
+index 8f32a9a988..d1486e7cda 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -207,7 +207,7 @@ static int open_output(Writer *w, const char* host) {
@@ -156,7 +156,7 @@ index 8f32a9a98..d1486e7cd 100644
*hostname = b;
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index a95fff18f..b45c38d68 100644
+index a95fff18f3..b45c38d682 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -178,7 +178,7 @@ static int verify_cert_authorized(gnutls_session_t session) {
diff --git a/SOURCES/0097-journal-remote-process-events-without-delay.patch b/SOURCES/0097-journal-remote-process-events-without-delay.patch
index 7c12799..eeebbe7 100644
--- a/SOURCES/0097-journal-remote-process-events-without-delay.patch
+++ b/SOURCES/0097-journal-remote-process-events-without-delay.patch
@@ -26,7 +26,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89516
3 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index 6c096de03..7e6295435 100644
+index 6c096de03a..7e62954351 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -41,6 +41,7 @@ void source_free(RemoteSource *source) {
@@ -38,7 +38,7 @@ index 6c096de03..7e6295435 100644
free(source);
}
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
-index 22db55091..06a50296a 100644
+index 22db550913..06a50296a1 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -54,6 +54,7 @@ typedef struct RemoteSource {
@@ -50,7 +50,7 @@ index 22db55091..06a50296a 100644
RemoteSource* source_new(int fd, bool passive_fd, char *name, Writer *writer);
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index d1486e7cd..b7cc6d717 100644
+index d1486e7cda..b7cc6d7172 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -289,6 +289,8 @@ static int dispatch_raw_source_event(sd_event_source *event,
diff --git a/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch b/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch
index 35908f5..b4e34b0 100644
--- a/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch
+++ b/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch
@@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89221
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
-index 485876b6a..24f8416ef 100644
+index 485876b6ac..24f8416ef9 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -643,7 +643,7 @@ Gateway=192.168.0.1</programlisting>
diff --git a/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch b/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch
index 3a73255..0ba7a03 100644
--- a/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch
+++ b/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89226
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 7d5a6c650..cceeeb845 100644
+index 7d5a6c6508..cceeeb845c 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -549,7 +549,7 @@ static int enumerate_partitions(dev_t devnum) {
diff --git a/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch b/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch
index 09542c2..75b62d7 100644
--- a/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch
+++ b/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch
@@ -14,7 +14,7 @@ Suggested by Richard Maw.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
-index 7cdcc5d96..5df39e117 100644
+index 7cdcc5d96a..5df39e1177 100644
--- a/src/libsystemd/sd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
@@ -262,7 +262,7 @@ static void rtnl_seal_message(sd_rtnl *rtnl, sd_rtnl_message *m) {
diff --git a/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch b/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch
index 0061d56..fd4d33d 100644
--- a/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch
+++ b/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch
@@ -12,7 +12,7 @@ the variable to NULL not to pass garbage on error.
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index cceeeb845..00a2141a5 100644
+index cceeeb845c..00a2141a58 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -291,7 +291,7 @@ static int probe_and_add_mount(
diff --git a/SOURCES/0102-man-fix-a-bunch-of-links.patch b/SOURCES/0102-man-fix-a-bunch-of-links.patch
index 656c647..015f2e8 100644
--- a/SOURCES/0102-man-fix-a-bunch-of-links.patch
+++ b/SOURCES/0102-man-fix-a-bunch-of-links.patch
@@ -64,7 +64,7 @@ Conflicts:
51 files changed, 151 insertions(+), 151 deletions(-)
diff --git a/man/busctl.xml b/man/busctl.xml
-index 251233bb9..cc1844b0a 100644
+index 251233bb96..cc1844b0a0 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -288,7 +288,7 @@
@@ -86,7 +86,7 @@ index 251233bb9..cc1844b0a 100644
</refsect1>
</refentry>
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index aeacc5797..3e249ad23 100644
+index aeacc57973..3e249ad23e 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -75,7 +75,7 @@
@@ -180,7 +180,7 @@ index aeacc5797..3e249ad23 100644
<citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml
-index e9c894f5c..364e13079 100644
+index e9c894f5c8..364e130790 100644
--- a/man/file-hierarchy.xml
+++ b/man/file-hierarchy.xml
@@ -397,7 +397,7 @@
@@ -193,7 +193,7 @@ index e9c894f5c..364e13079 100644
<literal>tmpfs</literal> file system. Since all users have
write access to this directory, special care should be taken
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
-index 3741cf9cc..919bd1374 100644
+index 3741cf9cc2..919bd13745 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -336,7 +336,7 @@
@@ -206,7 +206,7 @@ index 3741cf9cc..919bd1374 100644
<citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
</listitem>
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
-index 48c0006db..2c32d1609 100644
+index 48c0006db2..2c32d16094 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -91,7 +91,7 @@
@@ -239,7 +239,7 @@ index 48c0006db..2c32d1609 100644
<citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
diff --git a/man/localectl.xml b/man/localectl.xml
-index aae6e0629..7def047f6 100644
+index aae6e0629c..7def047f62 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -124,7 +124,7 @@
@@ -266,7 +266,7 @@ index aae6e0629..7def047f6 100644
<ulink url="http://www.x.org/releases/current/doc/xorg-docs/input/XKB-Config.html">
The XKB Configuration Guide
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
-index ca2b18783..d02d57356 100644
+index ca2b18783c..d02d573565 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -126,7 +126,7 @@
@@ -279,7 +279,7 @@ index ca2b18783..d02d57356 100644
<varlistentry>
diff --git a/man/machine-id.xml b/man/machine-id.xml
-index 83e0b26ce..92d67a386 100644
+index 83e0b26ced..92d67a3869 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -75,7 +75,7 @@
@@ -301,7 +301,7 @@ index 83e0b26ce..92d67a386 100644
<citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
-index 34a937db6..4b722aa12 100644
+index 34a937db68..4b722aa128 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -94,7 +94,7 @@ virtio-net</programlisting>
@@ -314,7 +314,7 @@ index 34a937db6..4b722aa12 100644
</refsect1>
diff --git a/man/os-release.xml b/man/os-release.xml
-index 1b71a49d0..8f4ab10fe 100644
+index 1b71a49d05..8f4ab10fed 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -316,7 +316,7 @@ BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>
@@ -327,7 +327,7 @@ index 1b71a49d0..8f4ab10fe 100644
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml
-index 0c49a0c7c..11fa07c63 100644
+index 0c49a0c7c9..11fa07c636 100644
--- a/man/sd_bus_message_append.xml
+++ b/man/sd_bus_message_append.xml
@@ -245,7 +245,7 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting>
@@ -340,7 +340,7 @@ index 0c49a0c7c..11fa07c63 100644
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
-index e7a765962..2bbb01069 100644
+index e7a765962a..2bbb010696 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -208,7 +208,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
@@ -353,7 +353,7 @@ index e7a765962..2bbb01069 100644
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml
-index 0299aa5a5..7c8df7df8 100644
+index 0299aa5a53..7c8df7df8d 100644
--- a/man/sd_event_add_signal.xml
+++ b/man/sd_event_add_signal.xml
@@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
@@ -375,7 +375,7 @@ index 0299aa5a5..7c8df7df8 100644
<para>Only a single handler may be installed for a specific
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
-index 1dcbadd18..c19eb11b2 100644
+index 1dcbadd186..c19eb11b20 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -130,7 +130,7 @@
@@ -388,7 +388,7 @@ index 1dcbadd18..c19eb11b2 100644
</refsect1>
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
-index 2b7f443f2..a400d8b1b 100644
+index 2b7f443f29..a400d8b1b5 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -84,7 +84,7 @@
@@ -401,7 +401,7 @@ index 2b7f443f2..a400d8b1b 100644
<citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
-index 068b10e7c..0cd0b45b9 100644
+index 068b10e7ca..0cd0b45b9a 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -119,7 +119,7 @@
@@ -456,7 +456,7 @@ index 068b10e7c..0cd0b45b9 100644
</refsect1>
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
-index 5a35cfe2c..8a131791a 100644
+index 5a35cfe2c8..8a131791a5 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -57,7 +57,7 @@
@@ -482,7 +482,7 @@ index 5a35cfe2c..8a131791a 100644
</refsect1>
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 6f30474c3..07eb43165 100644
+index 6f30474c39..07eb43165e 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1703,9 +1703,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
@@ -499,7 +499,7 @@ index 6f30474c3..07eb43165 100644
</varlistentry>
</variablelist>
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
-index e64894a28..cb68a79be 100644
+index e64894a28b..cb68a79be7 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -165,7 +165,7 @@
@@ -512,7 +512,7 @@ index e64894a28..cb68a79be 100644
</refsect1>
</refentry>
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
-index 1ff81d3d5..198315052 100644
+index 1ff81d3d5a..198315052f 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -145,7 +145,7 @@
@@ -534,7 +534,7 @@ index 1ff81d3d5..198315052 100644
left-hand and the right-hand, respectively, nodes of a
relationship.</para>
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
-index 38ddf66d2..9b1a8809d 100644
+index 38ddf66d27..9b1a8809dc 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -171,7 +171,7 @@
@@ -547,7 +547,7 @@ index 38ddf66d2..9b1a8809d 100644
</refsect1>
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
-index 1974cd7a2..b6270358e 100644
+index 1974cd7a2d..b6270358ea 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -185,7 +185,7 @@
@@ -560,7 +560,7 @@ index 1974cd7a2..b6270358e 100644
</para>
</refsect1>
diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml
-index bd03637de..ea524851e 100644
+index bd03637deb..ea524851eb 100644
--- a/man/systemd-cryptsetup@.service.xml
+++ b/man/systemd-cryptsetup@.service.xml
@@ -78,7 +78,7 @@
@@ -573,7 +573,7 @@ index bd03637de..ea524851e 100644
</refsect1>
diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
-index fd7ba7983..3431c3ce5 100644
+index fd7ba79837..3431c3ce5b 100644
--- a/man/systemd-efi-boot-generator.xml
+++ b/man/systemd-efi-boot-generator.xml
@@ -62,7 +62,7 @@
@@ -595,7 +595,7 @@ index fd7ba7983..3431c3ce5 100644
</refsect1>
diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml
-index 67d38ba31..67289daa2 100644
+index 67d38ba31f..67289daa26 100644
--- a/man/systemd-firstboot.xml
+++ b/man/systemd-firstboot.xml
@@ -91,7 +91,7 @@
@@ -652,7 +652,7 @@ index 67d38ba31..67289daa2 100644
<citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
-index 022efb413..bdc2dc1d0 100644
+index 022efb4130..bdc2dc1d0e 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -54,7 +54,7 @@
@@ -674,7 +674,7 @@ index 022efb413..bdc2dc1d0 100644
<citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
-index 8d2eaca4f..bcc64ec9b 100644
+index 8d2eaca4f6..bcc64ec9b5 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -66,7 +66,7 @@
@@ -700,7 +700,7 @@ index 8d2eaca4f..bcc64ec9b 100644
</refsect1>
diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml
-index a21782cbf..d811b9b55 100644
+index a21782cbf9..d811b9b551 100644
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/man/systemd-hibernate-resume-generator.xml
@@ -73,7 +73,7 @@
@@ -713,7 +713,7 @@ index a21782cbf..d811b9b55 100644
supported.</para></listitem>
</varlistentry>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
-index 6b250b65e..8280d6c87 100644
+index 6b250b65e6..8280d6c874 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -241,7 +241,7 @@
@@ -726,7 +726,7 @@ index 6b250b65e..8280d6c87 100644
<command>pydoc systemd.journal</command>.
</para>
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
-index 899916638..06aa78c0e 100644
+index 8999166383..06aa78c0e4 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -64,7 +64,7 @@
@@ -753,7 +753,7 @@ index 899916638..06aa78c0e 100644
</refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 4a936d326..65b4c2f29 100644
+index 4a936d326f..65b4c2f294 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -598,7 +598,7 @@
@@ -775,7 +775,7 @@ index 4a936d326..65b4c2f29 100644
</refsect1>
diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml
-index 2179f11e9..9d4976274 100644
+index 2179f11e95..9d4976274e 100644
--- a/man/systemd-quotacheck.service.xml
+++ b/man/systemd-quotacheck.service.xml
@@ -86,7 +86,7 @@
@@ -788,7 +788,7 @@ index 2179f11e9..9d4976274 100644
</para>
</refsect1>
diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml
-index 7b88ac3f3..8e60e31b5 100644
+index 7b88ac3f3c..8e60e31b5c 100644
--- a/man/systemd-remount-fs.service.xml
+++ b/man/systemd-remount-fs.service.xml
@@ -56,7 +56,7 @@
@@ -812,7 +812,7 @@ index 7b88ac3f3..8e60e31b5 100644
</refsect1>
diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml
-index 1c78b656e..0b852e6bc 100644
+index 1c78b656e1..0b852e6bc1 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/man/systemd-socket-proxyd.xml
@@ -72,7 +72,7 @@
@@ -838,7 +838,7 @@ index 1c78b656e..0b852e6bc 100644
</refsect1>
</refentry>
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
-index f35a18a4d..d4c1a7ebe 100644
+index f35a18a4d4..d4c1a7ebe3 100644
--- a/man/systemd-sysctl.service.xml
+++ b/man/systemd-sysctl.service.xml
@@ -56,11 +56,11 @@
@@ -867,7 +867,7 @@ index f35a18a4d..d4c1a7ebe 100644
</refsect1>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index c7bcfaee4..1b74ed38f 100644
+index c7bcfaee4d..1b74ed38f7 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -172,7 +172,7 @@
@@ -880,7 +880,7 @@ index c7bcfaee4..1b74ed38f 100644
others are removed. If the list of capabilities is prefixed
with ~, all but the listed capabilities will be included, the
diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml
-index b842d2972..c8a9cb7c9 100644
+index b842d29721..c8a9cb7c90 100644
--- a/man/systemd-update-utmp.service.xml
+++ b/man/systemd-update-utmp.service.xml
@@ -69,7 +69,7 @@
@@ -893,7 +893,7 @@ index b842d2972..c8a9cb7c9 100644
</refsect1>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
-index 59bb5e4e8..7c6ed0899 100644
+index 59bb5e4e8c..7c6ed08997 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -57,9 +57,9 @@
@@ -920,7 +920,7 @@ index 59bb5e4e8..7c6ed0899 100644
</para>
</refsect1>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
-index 3db65d988..b5b5885cd 100644
+index 3db65d988d..b5b5885cdf 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -96,7 +96,7 @@
@@ -944,7 +944,7 @@ index 3db65d988..b5b5885cd 100644
</para>
</refsect1>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index fdb157864..56b53e601 100644
+index fdb1578641..56b53e6015 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -663,7 +663,7 @@
@@ -1020,7 +1020,7 @@ index fdb157864..56b53e601 100644
</varlistentry>
diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml
-index ccb698752..9b39e732e 100644
+index ccb698752a..9b39e732e3 100644
--- a/man/systemd.generator.xml
+++ b/man/systemd.generator.xml
@@ -333,7 +333,7 @@ find $dir</programlisting>
@@ -1033,7 +1033,7 @@ index ccb698752..9b39e732e 100644
<citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
-index 1fd46de31..7d6c5c715 100644
+index 1fd46de31f..7d6c5c715f 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -134,7 +134,7 @@
@@ -1046,7 +1046,7 @@ index 1fd46de31..7d6c5c715 100644
</varlistentry>
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
-index c974e2248..e57f0e724 100644
+index c974e22489..e57f0e7242 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -135,7 +135,7 @@
@@ -1068,7 +1068,7 @@ index c974e2248..e57f0e724 100644
</refsect1>
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 5cbde8b84..fcb9a4416 100644
+index 5cbde8b84c..fcb9a44161 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -68,7 +68,7 @@
@@ -1135,7 +1135,7 @@ index 5cbde8b84..fcb9a4416 100644
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
-index 24f8416ef..97386271d 100644
+index 24f8416ef9..97386271d6 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -286,7 +286,7 @@
@@ -1175,7 +1175,7 @@ index 24f8416ef..97386271d 100644
given, it is derived from the <literal>Address</literal>
key.</para>
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
-index 08a7ec897..d02bc92ae 100644
+index 08a7ec8975..d02bc92ae6 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -74,7 +74,7 @@
@@ -1197,7 +1197,7 @@ index 08a7ec897..d02bc92ae 100644
</para>
</refsect1>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 3938345fa..2f541937f 100644
+index 3938345fac..2f541937f8 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -265,7 +265,7 @@
@@ -1339,7 +1339,7 @@ index 3938345fa..2f541937f 100644
</varlistentry>
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
-index 23b9c712e..5016f453d 100644
+index 23b9c712ed..5016f453d5 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -69,7 +69,7 @@
@@ -1388,7 +1388,7 @@ index 23b9c712e..5016f453d 100644
<citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
</para>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index a452f87ba..c2e374a94 100644
+index a452f87baf..c2e374a94e 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -826,7 +826,7 @@
@@ -1410,7 +1410,7 @@ index a452f87ba..c2e374a94 100644
</refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
-index 9b92140e6..d006b0bb9 100644
+index 9b92140e6b..d006b0bb99 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1012,9 +1012,9 @@
@@ -1435,7 +1435,7 @@ index 9b92140e6..d006b0bb9 100644
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd-notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
-index 17bea8b68..27196d44e 100644
+index 17bea8b682..27196d44e9 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -129,9 +129,9 @@ FONT=eurlatgr</programlisting>
diff --git a/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch b/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch
index ad0c8c1..f6e63fe 100644
--- a/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch
+++ b/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] man: link to fd.o for dbus stuff
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/man/busctl.xml b/man/busctl.xml
-index cc1844b0a..807fc78e8 100644
+index cc1844b0a0..807fc78e8f 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -465,7 +465,7 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting>
@@ -26,7 +26,7 @@ index cc1844b0a..807fc78e8 100644
<ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>,
<citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
-index 32299db71..706b95a1c 100644
+index 32299db710..706b95a1c4 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -91,6 +91,19 @@
@@ -50,7 +50,7 @@ index 32299db71..706b95a1c 100644
<!-- the ID is output in the block.object call for refsect1 -->
<h2>
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
-index 2c7764047..e0efe9985 100644
+index 2c7764047b..e0efe99854 100644
--- a/man/systemd-bus-proxyd.xml
+++ b/man/systemd-bus-proxyd.xml
@@ -101,7 +101,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
@@ -63,7 +63,7 @@ index 2c7764047..e0efe9985 100644
<ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
</para>
diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml
-index 141b43f6d..dc4f07ff1 100644
+index 141b43f6d9..dc4f07ff1b 100644
--- a/man/systemd-bus-proxyd@.service.xml
+++ b/man/systemd-bus-proxyd@.service.xml
@@ -73,7 +73,7 @@
@@ -76,7 +76,7 @@ index 141b43f6d..dc4f07ff1 100644
<ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>
</para>
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index 22bad3e5f..182717f52 100644
+index 22bad3e5f4..182717f524 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -122,7 +122,7 @@
diff --git a/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch b/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch
index 9b3e2ba..8397b01 100644
--- a/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch
+++ b/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: fix name of systemd.resource-control(5)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 07eb43165..3c4c9cb92 100644
+index 07eb43165e..3c4c9cb92c 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1732,7 +1732,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
diff --git a/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch b/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch
index 80d8d4f..46d4d06 100644
--- a/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch
+++ b/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch
@@ -24,7 +24,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1185604
1 file changed, 1 insertion(+)
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
-index a2233e0cf..a46ddf849 100644
+index a2233e0cfb..a46ddf8498 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -117,6 +117,7 @@ void mac_selinux_finish(void) {
diff --git a/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch b/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch
index 345a3be..0b3d269 100644
--- a/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch
+++ b/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] service: don't add After= dependencies on .busname units if
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 7781b4e62..ae5e61000 100644
+index 7781b4e626..ae5e610008 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -556,14 +556,16 @@ static int service_add_extras(Service *s) {
diff --git a/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch b/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch
index 4093a68..b9fefc0 100644
--- a/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch
+++ b/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch
@@ -11,7 +11,7 @@ Return -errno rather than -1 in case sendmsg() fails.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
-index 3f1fee7f7..d0486e3d1 100644
+index 3f1fee7f7e..d0486e3d1e 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -749,12 +749,20 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
diff --git a/SOURCES/0108-core-remove-left-over-debug-message.patch b/SOURCES/0108-core-remove-left-over-debug-message.patch
index 75fc9fa..e718dba 100644
--- a/SOURCES/0108-core-remove-left-over-debug-message.patch
+++ b/SOURCES/0108-core-remove-left-over-debug-message.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core: remove left-over debug message
1 file changed, 2 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 90bf5634c..f17a82fcd 100644
+index 90bf5634c8..f17a82fcdf 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -634,8 +634,6 @@ int config_parse_exec(const char *unit,
diff --git a/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch b/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch
index 8852242..763aeb9 100644
--- a/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch
+++ b/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] units: there is no systemd-udev-hwdb-update.service
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
-index f6acd6fe4..2791f73ac 100644
+index f6acd6fe4c..2791f73ac3 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -10,7 +10,7 @@ Description=udev Kernel Device Manager
diff --git a/SOURCES/0110-util-remove-redundant-debug-message.patch b/SOURCES/0110-util-remove-redundant-debug-message.patch
index ce4d068..860f535 100644
--- a/SOURCES/0110-util-remove-redundant-debug-message.patch
+++ b/SOURCES/0110-util-remove-redundant-debug-message.patch
@@ -14,7 +14,7 @@ The second line already says everything.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 85487230a..1e1bf944f 100644
+index 85487230a2..1e1bf944f2 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4115,8 +4115,7 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) {
diff --git a/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch b/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch
index ea7e02e..87e1284 100644
--- a/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch
+++ b/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch
@@ -12,7 +12,7 @@ Mar 13 19:48:30 adam.happyassassin.net systemd-tmpfiles[970]: /var/lib/machines
1 file changed, 2 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 1e1096816..73a9c9d5b 100644
+index 1e10968164..73a9c9d5b6 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1209,8 +1209,6 @@ static int create_item(Item *i) {
diff --git a/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch b/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch
index b80505e..d426139 100644
--- a/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch
+++ b/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch
@@ -19,7 +19,7 @@ and constify it everywhere.
5 files changed, 53 insertions(+), 31 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 65f1c245c..92b8d6e8e 100644
+index 65f1c245c6..92b8d6e8ef 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1084,7 +1084,7 @@ static int unit_file_load(
@@ -159,7 +159,7 @@ index 65f1c245c..92b8d6e8e 100644
_cleanup_strv_free_ char **files = NULL;
char **p;
diff --git a/src/shared/install.h b/src/shared/install.h
-index 357be0f92..3ca39397e 100644
+index 357be0f92d..3ca39397e6 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -23,6 +23,7 @@
@@ -188,7 +188,7 @@ index 357be0f92..3ca39397e 100644
int unit_file_get_list(UnitFileScope scope, const char *root_dir, Hashmap *h);
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 291a2f405..812730be1 100644
+index 291a2f4054..812730be1c 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -31,6 +31,7 @@
@@ -200,7 +200,7 @@ index 291a2f405..812730be1 100644
int user_config_home(char **config_home) {
const char *e;
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
-index 2ec888da8..f1925eef6 100644
+index 2ec888da81..f1925eef69 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -22,7 +22,8 @@
@@ -214,7 +214,7 @@ index 2ec888da8..f1925eef6 100644
typedef struct LookupPaths {
char **unit_path;
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 6e39b449e..0125ca27d 100644
+index 6e39b449eb..0125ca27d9 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -723,10 +723,10 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
diff --git a/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch b/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch
index 5d3073d..b03a0e4 100644
--- a/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch
+++ b/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch
@@ -12,7 +12,7 @@ confusing. Not possible with those two.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index ba2de85bd..fd527d4d6 100644
+index ba2de85bd3..fd527d4d63 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1537,11 +1537,11 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch b/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch
index bae47f1..d85dc63 100644
--- a/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch
+++ b/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch
@@ -14,7 +14,7 @@ of debug output during boot and are rather useless.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index 9863901a3..e40894222 100644
+index 9863901a33..e408942221 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -613,7 +613,7 @@ int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
diff --git a/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch b/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch
index 4b5bf95..287a505 100644
--- a/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch
+++ b/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch
@@ -17,7 +17,7 @@ the device tree anyway.
1 file changed, 7 deletions(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index dfbca8754..d191def5f 100644
+index dfbca8754f..d191def5f8 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -377,13 +377,6 @@ static int add_crypttab_devices(void) {
diff --git a/SOURCES/0116-sysctl-tweak-debug-message.patch b/SOURCES/0116-sysctl-tweak-debug-message.patch
index d3cc3ec..f170885 100644
--- a/SOURCES/0116-sysctl-tweak-debug-message.patch
+++ b/SOURCES/0116-sysctl-tweak-debug-message.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] sysctl: tweak debug message
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index b6945eda5..4fb293b9b 100644
+index b6945eda54..4fb293b9b5 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -121,7 +121,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
diff --git a/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch b/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch
index 944f448..15e2cd2 100644
--- a/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch
+++ b/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch
@@ -14,7 +14,7 @@ Also specify AUTH as facility... This seems to be the closest match
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index 151097a6e..77abe2e63 100644
+index 151097a6e6..77abe2e63c 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -373,7 +373,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s
diff --git a/SOURCES/0118-core-remove-useless-debug-message.patch b/SOURCES/0118-core-remove-useless-debug-message.patch
index 493a3f2..4a97702 100644
--- a/SOURCES/0118-core-remove-useless-debug-message.patch
+++ b/SOURCES/0118-core-remove-useless-debug-message.patch
@@ -17,7 +17,7 @@ Mar 13 19:48:28 adam.happyassassin.net systemd[1]: Collecting (null)
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 203a6a0a1..7483a96ec 100644
+index 203a6a0a1a..7483a96ec6 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -844,7 +844,8 @@ static unsigned manager_dispatch_gc_queue(Manager *m) {
diff --git a/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch b/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch
index 557ffdb..370173c 100644
--- a/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch
+++ b/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: standard-conf: change directory reference to wildcard
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
-index 36af45927..004f53f70 100644
+index 36af45927d..004f53f70c 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -54,7 +54,7 @@
diff --git a/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch b/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch
index 13f6b13..e788357 100644
--- a/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch
+++ b/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch
@@ -19,7 +19,7 @@ so change the device state back to "dead" as before 628c89c.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 4ff882721..cc4ebd2c8 100644
+index 4ff8827219..cc4ebd2c87 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -421,7 +421,7 @@ static void device_update_found_one(Device *d, bool add, DeviceFound found, bool
diff --git a/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch b/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch
index 82f48c4..bd4beb8 100644
--- a/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch
+++ b/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch
@@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1204336
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 5662b5fde..8e2f522bd 100644
+index 5662b5fde1..8e2f522bd0 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -54,9 +54,10 @@ static int add_swap(
diff --git a/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch b/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch
index ba9e326..1eefb39 100644
--- a/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch
+++ b/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] missing.h: add more btrfs types and defines
1 file changed, 151 insertions(+)
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 6ef4dbdf4..4b36a9c93 100644
+index 6ef4dbdf43..4b36a9c93a 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -294,12 +294,59 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) {
diff --git a/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch b/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch
index 762c23d..207caca 100644
--- a/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch
+++ b/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] build-sys: add configure option to disableLTO/gold
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 081ed0f6e..9103f9b92 100644
+index 081ed0f6eb..9103f9b923 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,10 +208,15 @@ AS_CASE([$CC], [*clang*],
diff --git a/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch b/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch
index d296b2d..3d62a2f 100644
--- a/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch
+++ b/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] rules: bring back 80-net-name-slot.rules
create mode 100644 rules/80-net-name-slot.rules
diff --git a/Makefile.am b/Makefile.am
-index 4933f76bd..bec32c39e 100644
+index 4933f76bdd..bec32c39e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3570,7 +3570,8 @@ dist_udevrules_DATA += \
@@ -25,7 +25,7 @@ index 4933f76bd..bec32c39e 100644
rules/99-systemd.rules
diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules
new file mode 100644
-index 000000000..c5f1b3885
+index 0000000000..c5f1b3885b
--- /dev/null
+++ b/rules/80-net-name-slot.rules
@@ -0,0 +1,14 @@
diff --git a/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch b/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch
index abdea6f..9471953 100644
--- a/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch
+++ b/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch
@@ -13,7 +13,7 @@ This reverts commit 13790add4bf648fed816361794d8277a75253410.
4 files changed, 61 insertions(+), 345 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 7ee8174ea..04839c950 100644
+index 7ee8174ea2..04839c950c 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1455,7 +1455,6 @@ static int server_open_hostname(Server *s) {
@@ -68,7 +68,7 @@ index 7ee8174ea..04839c950 100644
return r;
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 942a85780..11b852d39 100644
+index 942a857803..11b852d39d 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -28,11 +28,8 @@
@@ -536,7 +536,7 @@ index 942a85780..11b852d39 100644
return 0;
}
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
-index 94bf955d7..8cad01296 100644
+index 94bf955d78..8cad012967 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -21,9 +21,8 @@
@@ -551,7 +551,7 @@ index 94bf955d7..8cad01296 100644
void stdout_stream_free(StdoutStream *s);
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index a3540c65d..87704bb9c 100644
+index a3540c65d2..87704bb9c1 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -23,7 +23,6 @@ NotifyAccess=all
diff --git a/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch b/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch
index bb8eab2..72b1a0e 100644
--- a/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch
+++ b/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch
@@ -13,7 +13,7 @@ Conflicts:
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
-index 706b95a1c..1df824cbb 100644
+index 706b95a1c4..1df824cbbc 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -60,18 +60,6 @@
@@ -36,7 +36,7 @@ index 706b95a1c..1df824cbb 100644
<a>
<xsl:attribute name="href">
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 65b4c2f29..cbd44d4ab 100644
+index 65b4c2f294..cbd44d4aba 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -98,7 +98,6 @@
diff --git a/SOURCES/0127-journal-remove-audit-socket-unit-files.patch b/SOURCES/0127-journal-remove-audit-socket-unit-files.patch
index 2d4ab83..6eec65e 100644
--- a/SOURCES/0127-journal-remove-audit-socket-unit-files.patch
+++ b/SOURCES/0127-journal-remove-audit-socket-unit-files.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] journal: remove audit socket unit-files
delete mode 100644 units/systemd-journald-audit.socket
diff --git a/Makefile.am b/Makefile.am
-index bec32c39e..6d6b650f2 100644
+index bec32c39e5..6d6b650f24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4518,8 +4518,7 @@ bin_PROGRAMS += \
@@ -36,7 +36,7 @@ index bec32c39e..6d6b650f2 100644
systemd-journald.service \
diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
deleted file mode 100644
-index 35397aaeb..000000000
+index 35397aaeb8..0000000000
--- a/units/systemd-journald-audit.socket
+++ /dev/null
@@ -1,19 +0,0 @@
@@ -60,7 +60,7 @@ index 35397aaeb..000000000
-ListenNetlink=audit 1
-PassCredentials=yes
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 87704bb9c..1bcc290ec 100644
+index 87704bb9c1..1bcc290ec4 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -10,12 +10,12 @@ Description=Journal Service
diff --git a/SOURCES/0128-factory-we-don-t-want-that.patch b/SOURCES/0128-factory-we-don-t-want-that.patch
index 3e4c373..3f3619d 100644
--- a/SOURCES/0128-factory-we-don-t-want-that.patch
+++ b/SOURCES/0128-factory-we-don-t-want-that.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] factory: we don't want that
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 6d6b650f2..8474b2912 100644
+index 6d6b650f24..8474b29129 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2288,14 +2288,14 @@ INSTALL_DIRS += \
@@ -36,7 +36,7 @@ index 6d6b650f2..8474b2912 100644
# ------------------------------------------------------------------------------
if ENABLE_FIRSTBOOT
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
-index 125d6e0a1..4937719bd 100644
+index 125d6e0a17..4937719bd6 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -10,5 +10,3 @@
diff --git a/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch b/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch
index f072529..9c0f32d 100644
--- a/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch
+++ b/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch
@@ -15,7 +15,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1014315
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 66097ef74..c3113b081 100644
+index 66097ef741..c3113b081e 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -679,8 +679,6 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus
diff --git a/SOURCES/0130-timedated-fix-enable-disable-reversal.patch b/SOURCES/0130-timedated-fix-enable-disable-reversal.patch
index 9e08cfe..e39c537 100644
--- a/SOURCES/0130-timedated-fix-enable-disable-reversal.patch
+++ b/SOURCES/0130-timedated-fix-enable-disable-reversal.patch
@@ -16,7 +16,7 @@ state directly, so the Context parameter can be removed.
1 file changed, 18 insertions(+), 32 deletions(-)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index c3113b081..f87514936 100644
+index c3113b081e..f875149364 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -280,39 +280,26 @@ static int context_read_ntp(Context *c, sd_bus *bus) {
diff --git a/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch b/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch
index f33144c..30cff26 100644
--- a/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch
+++ b/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch
@@ -19,7 +19,7 @@ Conflicts:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 8ba665dc3..2bc37ba60 100644
+index 8ba665dc3d..2bc37ba60e 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1772,15 +1772,15 @@ static int method_disable_unit_files_generic(
diff --git a/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch b/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch
index e517a72..89dde96 100644
--- a/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch
+++ b/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] shared: add path_compare(), an ordering path comparison
3 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 70bc1caa2..d5510bf56 100644
+index 70bc1caa2a..d5510bf56f 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -403,12 +403,18 @@ char* path_startswith(const char *path, const char *prefix) {
@@ -83,7 +83,7 @@ index 70bc1caa2..d5510bf56 100644
return path_equal(a, b) || files_same(a, b) > 0;
}
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index bcf116ed3..ca81b49cb 100644
+index bcf116ed3d..ca81b49cbf 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -44,6 +44,7 @@ char* path_make_absolute_cwd(const char *p);
@@ -95,7 +95,7 @@ index bcf116ed3..ca81b49cb 100644
bool path_equal_or_files_same(const char *a, const char *b);
char* path_join(const char *root, const char *path, const char *rest);
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
-index 11aa52aae..6396fcb39 100644
+index 11aa52aaed..6396fcb398 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -27,23 +27,37 @@
diff --git a/SOURCES/0133-core-namespace-fix-path-sorting.patch b/SOURCES/0133-core-namespace-fix-path-sorting.patch
index 49a47e6..98c12c4 100644
--- a/SOURCES/0133-core-namespace-fix-path-sorting.patch
+++ b/SOURCES/0133-core-namespace-fix-path-sorting.patch
@@ -25,7 +25,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1184016
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 4fecd3236..d4f1c8621 100644
+index 4fecd32363..d4f1c86211 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -91,9 +91,11 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) {
diff --git a/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch b/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch
index 6b99b79..9415509 100644
--- a/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch
+++ b/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch
@@ -12,7 +12,7 @@ We use the return value not the arg everywhere, and should we do here.
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
-index b0f0f66e0..624a99f4e 100644
+index b0f0f66e09..624a99f4e9 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -438,6 +438,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
diff --git a/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch b/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch
index 003982d..786aa3f 100644
--- a/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch
+++ b/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] some compilators don't support __INCLUDE_LEVEL__
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h
-index 896a027eb..e9426a450 100644
+index 896a027eb5..e9426a450e 100644
--- a/src/systemd/_sd-common.h
+++ b/src/systemd/_sd-common.h
@@ -24,7 +24,7 @@
diff --git a/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch b/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch
index 7a4763a..0482545 100644
--- a/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch
+++ b/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch
@@ -11,7 +11,7 @@ as we can.
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 99caa0a2a..6a5ada688 100644
+index 99caa0a2ab..6a5ada6883 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -35,7 +35,7 @@
diff --git a/SOURCES/0137-udev-net_id-improve-comments.patch b/SOURCES/0137-udev-net_id-improve-comments.patch
index fb67f9a..1954659 100644
--- a/SOURCES/0137-udev-net_id-improve-comments.patch
+++ b/SOURCES/0137-udev-net_id-improve-comments.patch
@@ -12,7 +12,7 @@ Conflicts:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 6a5ada688..2cc1fd409 100644
+index 6a5ada6883..2cc1fd409b 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -146,7 +146,7 @@ static int dev_pci_onboard(struct udev_device *dev, struct netnames *names) {
diff --git a/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch b/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch
index 32103df..92538db 100644
--- a/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch
+++ b/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch
@@ -21,7 +21,7 @@ Resolves: #1210981
1 file changed, 6 insertions(+)
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
-index fff5de7a8..e60c4623b 100644
+index fff5de7a8b..e60c4623bd 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -56,6 +56,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
diff --git a/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch b/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch
index 426c8d7..0dcde5c 100644
--- a/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch
+++ b/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch
@@ -24,7 +24,7 @@ Resolves: #1210981
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
-index e60c4623b..40e3e28b1 100644
+index e60c4623bd..40e3e28b1e 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -149,7 +149,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
diff --git a/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch b/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch
index 60da977..87eb671 100644
--- a/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch
+++ b/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch
@@ -16,7 +16,7 @@ Resolves: #1210981
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
-index 40e3e28b1..33597bc20 100644
+index 40e3e28b1e..33597bc209 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -114,7 +114,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
diff --git a/SOURCES/0141-detect-virt-use-proc-device-tree.patch b/SOURCES/0141-detect-virt-use-proc-device-tree.patch
index 04a3a33..50f12a4 100644
--- a/SOURCES/0141-detect-virt-use-proc-device-tree.patch
+++ b/SOURCES/0141-detect-virt-use-proc-device-tree.patch
@@ -15,7 +15,7 @@ Resolves: #1207773
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 7c1381f4b..aa3501f42 100644
+index 7c1381f4b8..aa3501f429 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -106,7 +106,7 @@ static int detect_vm_devicetree(const char **_id) {
diff --git a/SOURCES/0142-ARM-detect-virt-detect-Xen.patch b/SOURCES/0142-ARM-detect-virt-detect-Xen.patch
index 1948e9a..0ff318f 100644
--- a/SOURCES/0142-ARM-detect-virt-detect-Xen.patch
+++ b/SOURCES/0142-ARM-detect-virt-detect-Xen.patch
@@ -10,7 +10,7 @@ Resolves: #1207773
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index aa3501f42..712523210 100644
+index aa3501f429..712523210d 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -102,7 +102,7 @@ static int detect_vm_cpuid(const char **_id) {
diff --git a/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch b/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch
index 4dc9a04..94285ea 100644
--- a/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch
+++ b/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch
@@ -26,7 +26,7 @@ Resolves: #1207773
1 file changed, 17 insertions(+)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 712523210..54c465520 100644
+index 712523210d..54c465520d 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -115,6 +115,23 @@ static int detect_vm_devicetree(const char **_id) {
diff --git a/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch b/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch
index daf26a8..bcbaf61 100644
--- a/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch
+++ b/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch
@@ -31,7 +31,7 @@ Resolves: #1045498
1 file changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index b6749aab7..bb0a6242a 100644
+index b6749aab76..bb0a6242ac 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -426,6 +426,46 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char *
diff --git a/SOURCES/0145-man-document-forwarding-to-syslog-better.patch b/SOURCES/0145-man-document-forwarding-to-syslog-better.patch
index 5000c1d..ee75802 100644
--- a/SOURCES/0145-man-document-forwarding-to-syslog-better.patch
+++ b/SOURCES/0145-man-document-forwarding-to-syslog-better.patch
@@ -12,7 +12,7 @@ Resolves: #1177336
1 file changed, 44 insertions(+), 26 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 85146b0d8..abfe3130d 100644
+index 85146b0d82..abfe3130dd 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -97,7 +97,7 @@
diff --git a/SOURCES/0146-man-fix-typos-in-previous-comimt.patch b/SOURCES/0146-man-fix-typos-in-previous-comimt.patch
index 82736f8..84e4b55 100644
--- a/SOURCES/0146-man-fix-typos-in-previous-comimt.patch
+++ b/SOURCES/0146-man-fix-typos-in-previous-comimt.patch
@@ -10,7 +10,7 @@ Resolves: #1177336
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index abfe3130d..2cbe58bc1 100644
+index abfe3130dd..2cbe58bc15 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -361,7 +361,7 @@
diff --git a/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch b/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch
index 54b3098..541a0a2 100644
--- a/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch
+++ b/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch
@@ -12,7 +12,7 @@ Resolves: #1189253
1 file changed, 7 insertions(+)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 0125ca27d..cfc4a99e4 100644
+index 0125ca27d9..cfc4a99e4a 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -692,6 +692,13 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
diff --git a/SOURCES/0148-rules-enable-memory-hotplug.patch b/SOURCES/0148-rules-enable-memory-hotplug.patch
index 2b3aad8..185fc21 100644
--- a/SOURCES/0148-rules-enable-memory-hotplug.patch
+++ b/SOURCES/0148-rules-enable-memory-hotplug.patch
@@ -11,7 +11,7 @@ Resolves: #1105020
1 file changed, 4 insertions(+)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 2b494e57c..8231caae9 100644
+index 2b494e57cf..8231caae98 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -1,3 +1,7 @@
diff --git a/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch b/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch
index cc7d237..690ace6 100644
--- a/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch
+++ b/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch
@@ -10,7 +10,7 @@ Resolves: #1182105
1 file changed, 3 insertions(+)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 8231caae9..556a3a3a9 100644
+index 8231caae98..556a3a3a90 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -5,3 +5,6 @@ SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}
diff --git a/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch b/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch
index 16c4488..235e085 100644
--- a/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch
+++ b/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch
@@ -41,7 +41,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+)
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
-index 8ac51a471..413d94094 100644
+index 8ac51a471b..413d94094b 100644
--- a/units/console-getty.service.m4.in
+++ b/units/console-getty.service.m4.in
@@ -9,6 +9,7 @@
diff --git a/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch b/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch
index 8309569..cf4107d 100644
--- a/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch
+++ b/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch
@@ -16,7 +16,7 @@ Resolves: #1222517
rename units/{systemd-resolved.service.in => systemd-resolved.service.m4.in} (96%)
diff --git a/Makefile.am b/Makefile.am
-index 8474b2912..604eaf2f1 100644
+index 8474b29129..604eaf2f17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5520,7 +5520,7 @@ dist_dbussystemservice_DATA += \
@@ -29,7 +29,7 @@ index 8474b2912..604eaf2f1 100644
SYSTEM_UNIT_ALIASES += \
systemd-resolved.service dbus-org.freedesktop.resolve1.service
diff --git a/units/.gitignore b/units/.gitignore
-index 638a7abc4..7f3e0d093 100644
+index 638a7abc4c..7f3e0d093c 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -58,6 +58,7 @@
@@ -44,7 +44,7 @@ diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.
similarity index 96%
rename from units/systemd-resolved.service.in
rename to units/systemd-resolved.service.m4.in
-index b643da9a7..d133847d5 100644
+index b643da9a73..d133847d5e 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.m4.in
@@ -10,11 +10,13 @@ Description=Network Name Resolution
diff --git a/SOURCES/0152-man-add-journal-remote.conf-5.patch b/SOURCES/0152-man-add-journal-remote.conf-5.patch
index 770d25b..6d2ba6d 100644
--- a/SOURCES/0152-man-add-journal-remote.conf-5.patch
+++ b/SOURCES/0152-man-add-journal-remote.conf-5.patch
@@ -15,7 +15,7 @@ Resolves: #1222517
create mode 100644 man/journal-remote.conf.xml
diff --git a/Makefile-man.am b/Makefile-man.am
-index ac6f69af7..084df754a 100644
+index ac6f69af70..084df754a2 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1358,14 +1358,20 @@ endif
@@ -49,7 +49,7 @@ index ac6f69af7..084df754a 100644
man/kernel-command-line.xml \
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
new file mode 100644
-index 000000000..a7b222718
+index 0000000000..a7b2227182
--- /dev/null
+++ b/man/journal-remote.conf.xml
@@ -0,0 +1,114 @@
@@ -168,7 +168,7 @@ index 000000000..a7b222718
+
+</refentry>
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
-index 2687662a1..d5bda635c 100644
+index 2687662a14..d5bda635c4 100644
--- a/man/systemd-journal-remote.xml
+++ b/man/systemd-journal-remote.xml
@@ -310,6 +310,7 @@ systemd-journal-remote --url http://some.host:19531/
diff --git a/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch b/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch
index 8ed9da9..0546978 100644
--- a/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch
+++ b/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch
@@ -16,7 +16,7 @@ Resolves: #1222517
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 3ae0eb462..335922025 100644
+index 3ae0eb4621..3359220251 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -107,7 +107,9 @@ static bool mount_is_auto(const MountParameters *p) {
diff --git a/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch b/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch
index 5eb315c..d43c338 100644
--- a/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch
+++ b/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 335922025..fd4fb6f1b 100644
+index 3359220251..fd4fb6f1b2 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -108,7 +108,7 @@ static bool needs_quota(const MountParameters *p) {
diff --git a/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch b/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch
index 9c4f603..5d17d3b 100644
--- a/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch
+++ b/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 2cc1fd409..66474f772 100644
+index 2cc1fd409b..66474f7728 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -271,7 +271,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
diff --git a/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch b/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch
index a1fed43..243b17c 100644
--- a/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch
+++ b/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 5 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index 770cf9bb2..08de0ff06 100644
+index 770cf9bb29..08de0ff068 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -817,11 +817,6 @@
diff --git a/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch b/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch
index b4b496f..fa351de 100644
--- a/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch
+++ b/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch
@@ -19,7 +19,7 @@ Resolves: #1222517
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
-index 0c33909ce..1e04d11fe 100644
+index 0c33909cee..1e04d11fe3 100644
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service.in
@@ -10,7 +10,7 @@ Description=udev Coldplug all Devices
@@ -32,7 +32,7 @@ index 0c33909ce..1e04d11fe 100644
ConditionPathIsReadWrite=/sys
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
-index 2791f73ac..a13304400 100644
+index 2791f73ac3..a133044005 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -10,7 +10,7 @@ Description=udev Kernel Device Manager
diff --git a/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch b/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch
index 2b46fc8..bb7ff65 100644
--- a/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch
+++ b/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch
@@ -15,7 +15,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
-index 0869e7399..c09c05d4d 100644
+index 0869e73991..c09c05d4d5 100644
--- a/units/systemd-user-sessions.service.in
+++ b/units/systemd-user-sessions.service.in
@@ -8,7 +8,7 @@
diff --git a/SOURCES/0159-zsh-completion-update-loginctl.patch b/SOURCES/0159-zsh-completion-update-loginctl.patch
index 63511f1..94e7a7e 100644
--- a/SOURCES/0159-zsh-completion-update-loginctl.patch
+++ b/SOURCES/0159-zsh-completion-update-loginctl.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
-index 0de66e191..bd33b66fa 100644
+index 0de66e191f..bd33b66fae 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -102,10 +102,11 @@ _arguments -s \
diff --git a/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch b/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch
index 4236c61..9d7e144 100644
--- a/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch
+++ b/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+)
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
-index a469bbc9a..863348e05 100644
+index a469bbc9a7..863348e050 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -76,6 +76,7 @@ _arguments -s \
diff --git a/SOURCES/0161-zsh-completion-update-hostnamectl.patch b/SOURCES/0161-zsh-completion-update-hostnamectl.patch
index 2aa0b86..eb4da5c 100644
--- a/SOURCES/0161-zsh-completion-update-hostnamectl.patch
+++ b/SOURCES/0161-zsh-completion-update-hostnamectl.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
-index a7217a199..7528e0649 100644
+index a7217a1999..7528e0649d 100644
--- a/shell-completion/zsh/_hostnamectl
+++ b/shell-completion/zsh/_hostnamectl
@@ -33,6 +33,14 @@ _hostnamectl_set-deployment() {
diff --git a/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch b/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch
index c83141e..907eadb 100644
--- a/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch
+++ b/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch
@@ -16,7 +16,7 @@ Resolves: #1222517
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
-index 8063316ec..3d787cdb7 100644
+index 8063316ec6..3d787cdb77 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -160,7 +160,7 @@ _systemctl () {
@@ -29,7 +29,7 @@ index 8063316ec..3d787cdb7 100644
)
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
-index 7f2d5ac0f..82edfd3d7 100644
+index 7f2d5ac0fa..82edfd3d74 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -59,6 +59,7 @@
diff --git a/SOURCES/0163-core-automount-beef-up-error-message.patch b/SOURCES/0163-core-automount-beef-up-error-message.patch
index 19a415d..4059165 100644
--- a/SOURCES/0163-core-automount-beef-up-error-message.patch
+++ b/SOURCES/0163-core-automount-beef-up-error-message.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index e4c79415d..b391f6198 100644
+index e4c79415d1..b391f6198e 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -734,7 +734,8 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
diff --git a/SOURCES/0164-man-remove-fs-from-rootfsflags.patch b/SOURCES/0164-man-remove-fs-from-rootfsflags.patch
index e95be72..db12da7 100644
--- a/SOURCES/0164-man-remove-fs-from-rootfsflags.patch
+++ b/SOURCES/0164-man-remove-fs-from-rootfsflags.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
-index 919bd1374..eb7372702 100644
+index 919bd13745..eb73727027 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -295,7 +295,7 @@
diff --git a/SOURCES/0165-shared-fix-memleak.patch b/SOURCES/0165-shared-fix-memleak.patch
index 87de156..1e2563e 100644
--- a/SOURCES/0165-shared-fix-memleak.patch
+++ b/SOURCES/0165-shared-fix-memleak.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 92b8d6e8e..efd489ec0 100644
+index 92b8d6e8ef..efd489ec08 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -515,7 +515,7 @@ static int find_symlinks_in_scope(
diff --git a/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch b/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch
index 6bbc795..e0993ea 100644
--- a/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch
+++ b/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch
@@ -41,7 +41,7 @@ Resolves: #1222517
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index e98c1fd6d..87a3f69e9 100644
+index e98c1fd6da..87a3f69e90 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1502,9 +1502,22 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch b/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch
index e92f9e3..88e4ca6 100644
--- a/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch
+++ b/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch
@@ -15,7 +15,7 @@ Resolves: #1222517
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c
-index 65cfec7ce..7c5f1b2bb 100644
+index 65cfec7ce8..7c5f1b2bb6 100644
--- a/src/python-systemd/_daemon.c
+++ b/src/python-systemd/_daemon.c
@@ -225,7 +225,7 @@ static PyObject* is_socket_inet(PyObject *self, PyObject *args) {
@@ -28,7 +28,7 @@ index 65cfec7ce..7c5f1b2bb 100644
return NULL;
}
diff --git a/src/python-systemd/daemon.py b/src/python-systemd/daemon.py
-index 1c386bb6f..82011ca60 100644
+index 1c386bb6fc..82011ca606 100644
--- a/src/python-systemd/daemon.py
+++ b/src/python-systemd/daemon.py
@@ -26,7 +26,7 @@ def is_socket(fileobj, family=_AF_UNSPEC, type=0, listening=-1):
diff --git a/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch b/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch
index d0c9c0e..f7977ac 100644
--- a/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch
+++ b/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 4bd0fcf75..9b4e11c1b 100644
+index 4bd0fcf751..9b4e11c1b9 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -504,15 +504,15 @@
diff --git a/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch b/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch
index 1346a64..715039d 100644
--- a/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch
+++ b/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch
@@ -16,7 +16,7 @@ Resolves: #1222517
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 4ec0cff21..089c25f83 100644
+index 4ec0cff21d..089c25f83f 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4449,6 +4449,12 @@ static int show(sd_bus *bus, char **args) {
diff --git a/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch b/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch
index c57af31..504cad8 100644
--- a/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch
+++ b/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
-index 5c73b4d3c..90c83a47a 100644
+index 5c73b4d3c0..90c83a47a8 100644
--- a/src/shared/exit-status.c
+++ b/src/shared/exit-status.c
@@ -167,7 +167,7 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
diff --git a/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch b/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch
index 6d9c226..24bed67 100644
--- a/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch
+++ b/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tmpfiles.d/systemd-nologin.conf b/tmpfiles.d/systemd-nologin.conf
-index d61232b53..a30a8da60 100644
+index d61232b534..a30a8da604 100644
--- a/tmpfiles.d/systemd-nologin.conf
+++ b/tmpfiles.d/systemd-nologin.conf
@@ -5,7 +5,7 @@
diff --git a/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch b/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch
index a2eaebd..ff7fa17 100644
--- a/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch
+++ b/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch
@@ -20,7 +20,7 @@ Resolves: #1222517
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
-index c0a05b97a..97f3b9b34 100644
+index c0a05b97aa..97f3b9b34a 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -63,16 +63,19 @@ int kmod_setup(void) {
diff --git a/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch b/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch
index 732df71..a9ca0dc 100644
--- a/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch
+++ b/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch
@@ -28,7 +28,7 @@ Resolves: #1222517
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 1e1bf944f..649344d88 100644
+index 1e1bf944f2..649344d88f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -571,13 +571,12 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo
@@ -47,7 +47,7 @@ index 1e1bf944f..649344d88 100644
} else if (quoted) {
*l = strcspn_escaped(current, separator);
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index e517f571d..9f3e3a227 100644
+index e517f571d6..9f3e3a227e 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -92,6 +92,7 @@ static void check_execcommand(ExecCommand *c,
diff --git a/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch b/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch
index a9e1286..fb724cd 100644
--- a/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch
+++ b/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
2 files changed, 2 insertions(+)
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
-index 26759ea0f..5534a49ed 100644
+index 26759ea0fb..5534a49ede 100644
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -18,3 +18,4 @@ WatchdogSec=1min
@@ -27,7 +27,7 @@ index 26759ea0f..5534a49ed 100644
ProtectHome=yes
+KillMode=mixed
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
-index a13304400..32f04d901 100644
+index a133044005..32f04d901a 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -22,3 +22,4 @@ Restart=always
diff --git a/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch b/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch
index e257d61..c4ebafa 100644
--- a/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch
+++ b/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 565455bd6..b9e1f13ea 100644
+index 565455bd63..b9e1f13eaf 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2830,14 +2830,18 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
diff --git a/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch b/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch
index 5d04190..733d08a 100644
--- a/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch
+++ b/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
-index 561963e5e..cb5cd6f4a 100644
+index 561963e5eb..cb5cd6f4ab 100644
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -36,9 +36,15 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
diff --git a/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch b/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch
index 1032877..e4b21d3 100644
--- a/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch
+++ b/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch
@@ -20,7 +20,7 @@ Resolves: #1222517
1 file changed, 27 insertions(+), 34 deletions(-)
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
-index 22a3a5347..1474321c9 100644
+index 22a3a5347a..1474321c95 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -352,12 +352,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
diff --git a/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch b/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch
index 692ee98..4bf3d9c 100644
--- a/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch
+++ b/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch
@@ -51,7 +51,7 @@ Resolves: #1164334
4 files changed, 138 insertions(+)
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index fcb9a4416..8e652e133 100644
+index fcb9a44161..8e652e1332 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -138,6 +138,36 @@
@@ -92,7 +92,7 @@ index fcb9a4416..8e652e133 100644
<term><option>x-systemd.automount</option></term>
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 8e2f522bd..65ed20579 100644
+index 8e2f522bd0..65ed205799 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -155,6 +155,64 @@ static bool mount_in_initrd(struct mntent *me) {
@@ -193,7 +193,7 @@ index 8e2f522bd..65ed20579 100644
"[Automount]\n"
"Where=%s\n",
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index cf317e17b..e231a0ff8 100644
+index cf317e17bd..e231a0ff80 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -125,6 +125,36 @@ answer:
@@ -234,7 +234,7 @@ index cf317e17b..e231a0ff8 100644
_cleanup_free_ char *opt = NULL;
int r;
diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
-index 9f6b32eaf..387c562a9 100644
+index 9f6b32eaf4..387c562a96 100644
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -28,6 +28,8 @@
diff --git a/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch b/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch
index 472092e..c365958 100644
--- a/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch
+++ b/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch
@@ -28,7 +28,7 @@ Resolves: #1222517
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index f17a82fcd..ec4cf4eef 100644
+index f17a82fcdf..ec4cf4eefa 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -604,7 +604,11 @@ int config_parse_exec(const char *unit,
@@ -45,7 +45,7 @@ index f17a82fcd..ec4cf4eef 100644
} else if (strneq(word, ";", MAX(l, 1U)))
/* new commandline */
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 9f3e3a227..550098332 100644
+index 9f3e3a227e..5500983322 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -318,6 +318,27 @@ static void test_config_parse_exec(void) {
diff --git a/SOURCES/0180-rules-load-sg-module.patch b/SOURCES/0180-rules-load-sg-module.patch
index 75f5835..4b81266 100644
--- a/SOURCES/0180-rules-load-sg-module.patch
+++ b/SOURCES/0180-rules-load-sg-module.patch
@@ -12,7 +12,7 @@ Resolves: #1186462
1 file changed, 3 insertions(+)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 556a3a3a9..305e75228 100644
+index 556a3a3a90..305e752285 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -8,3 +8,6 @@ SUBSYSTEM=="memory", ACTION=="add", ATTR{state}=="offline", ATTR{state}="online"
diff --git a/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch b/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch
index 77eb6d1..fd657f2 100644
--- a/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch
+++ b/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch
@@ -25,7 +25,7 @@ Resolves: #1016680
5 files changed, 74 insertions(+), 15 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 4740ff18c..7416386a1 100644
+index 4740ff18cb..7416386a18 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -679,15 +679,13 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
@@ -48,7 +48,7 @@ index 4740ff18c..7416386a1 100644
}
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 52d4ebe61..b0a5a7592 100644
+index 52d4ebe611..b0a5a7592a 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1709,16 +1709,15 @@ static int check_wait_response(BusWaitForJobs *d, bool quiet) {
@@ -76,7 +76,7 @@ index 52d4ebe61..b0a5a7592 100644
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 649344d88..778c2b0e0 100644
+index 649344d88f..778c2b0e04 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1329,7 +1329,8 @@ char *cescape(const char *s) {
@@ -143,7 +143,7 @@ index 649344d88..778c2b0e0 100644
+ return r;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index a83b58822..7ecfd8571 100644
+index a83b588221..7ecfd8571d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1078,3 +1078,5 @@ void sigkill_wait(pid_t *pid);
@@ -153,7 +153,7 @@ index a83b58822..7ecfd8571 100644
+
+char *shell_maybe_quote(const char *s);
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index 9515a8cbf..9ae347b43 100644
+index 9515a8cbf1..9ae347b434 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1512,6 +1512,24 @@ static void test_sparse_write(void) {
diff --git a/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch b/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch
index 7b311a2..cf7ed4c 100644
--- a/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch
+++ b/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch
@@ -16,7 +16,7 @@ Resolves: #1016680
1 file changed, 72 insertions(+), 7 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index b0a5a7592..2e6d88962 100644
+index b0a5a7592a..2e6d889620 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -30,6 +30,7 @@
diff --git a/SOURCES/0183-notify-fix-badly-backported-help-message.patch b/SOURCES/0183-notify-fix-badly-backported-help-message.patch
index cbb7045..47c21e1 100644
--- a/SOURCES/0183-notify-fix-badly-backported-help-message.patch
+++ b/SOURCES/0183-notify-fix-badly-backported-help-message.patch
@@ -11,7 +11,7 @@ Related: #1199644
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/notify/notify.c b/src/notify/notify.c
-index e4a128b0b..c89a6cc06 100644
+index e4a128b0b2..c89a6cc063 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -49,7 +49,7 @@ static void help(void) {
diff --git a/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch b/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch
index 813870f..70862ec 100644
--- a/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch
+++ b/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch
@@ -26,7 +26,7 @@ Resolves: #1226333
1 file changed, 58 insertions(+), 32 deletions(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 3f613d9b6..5dedb073e 100644
+index 3f613d9b65..5dedb073e4 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -217,6 +217,23 @@ static void log_glue(int level, const char *msg, void *usrptr) {
diff --git a/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch b/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch
index c516c37..836d1fa 100644
--- a/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch
+++ b/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch
@@ -24,7 +24,7 @@ Resolves: #1233081
8 files changed, 114 insertions(+), 72 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 604eaf2f1..d3fb398fe 100644
+index 604eaf2f17..d3fb398fe5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5253,6 +5253,7 @@ machinectl_LDADD = \
@@ -36,7 +36,7 @@ index 604eaf2f1..d3fb398fe 100644
rootbin_PROGRAMS += \
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 3c4c9cb92..44ec0d7bc 100644
+index 3c4c9cb92c..44ec0d7bcf 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -455,6 +455,18 @@
@@ -101,7 +101,7 @@ index 3c4c9cb92..44ec0d7bc 100644
</varlistentry>
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 2e6d88962..fff00d9f9 100644
+index 2e6d889620..fff00d9f93 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1849,7 +1849,7 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) {
@@ -125,7 +125,7 @@ index 2e6d88962..fff00d9f9 100644
if (r < 0)
return bus_log_parse_error(r);
diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h
-index e8a97cef9..21db98228 100644
+index e8a97cef9e..21db982280 100644
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@ -24,6 +24,7 @@
@@ -143,7 +143,7 @@ index e8a97cef9..21db98228 100644
-int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet);
+int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, UnitFileChange **changes, unsigned *n_changes);
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index 9f8c68b18..f1910709d 100644
+index 9f8c68b184..f1910709d2 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1709,7 +1709,7 @@ static int enable_machine(int argc, char *argv[], void *userdata) {
@@ -156,7 +156,7 @@ index 9f8c68b18..f1910709d 100644
return r;
diff --git a/src/shared/install.c b/src/shared/install.c
-index efd489ec0..b62065be5 100644
+index efd489ec08..b62065be5c 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -113,51 +113,6 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d
@@ -342,7 +342,7 @@ index efd489ec0..b62065be5 100644
return 0;
}
diff --git a/src/shared/install.h b/src/shared/install.h
-index 3ca39397e..d729e6ed1 100644
+index 3ca39397e6..d729e6ed15 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -112,6 +112,7 @@ UnitFileState unit_file_get_state(
@@ -354,7 +354,7 @@ index 3ca39397e..d729e6ed1 100644
int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 089c25f83..9898694d7 100644
+index 089c25f83f..9898694d75 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -138,6 +138,7 @@ static char *arg_host = NULL;
diff --git a/SOURCES/0186-udev-also-create-old-sas-paths.patch b/SOURCES/0186-udev-also-create-old-sas-paths.patch
index e0fc7d0..a2fd594 100644
--- a/SOURCES/0186-udev-also-create-old-sas-paths.patch
+++ b/SOURCES/0186-udev-also-create-old-sas-paths.patch
@@ -12,7 +12,7 @@ Resolves: #957112
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 25b44a55c..71ab97484 100644
+index 25b44a55cb..71ab974844 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -54,7 +54,9 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+=
@@ -26,7 +26,7 @@ index 25b44a55c..71ab97484 100644
# skip unpartitioned removable media devices from drivers which do not send "change" events
ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index bb0a6242a..025392df5 100644
+index bb0a6242ac..025392df5b 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -154,7 +154,7 @@ out:
diff --git a/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch b/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch
index b6a12b9..c1cc0ee 100644
--- a/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch
+++ b/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch
@@ -19,7 +19,7 @@ Resolves: #1227396
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index 7d545ca31..ba80941d7 100644
+index 7d545ca31d..ba80941d7b 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -232,7 +232,8 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
diff --git a/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch b/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
index d558493..39dde91 100644
--- a/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
+++ b/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
@@ -17,7 +17,7 @@ Resolves: #1199644
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index b9e1f13ea..fa17567dd 100644
+index b9e1f13eaf..fa17567dd3 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3546,15 +3546,7 @@ int unit_kill_context(
diff --git a/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch b/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch
index 57550ea..f70fd51 100644
--- a/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch
+++ b/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch
@@ -14,7 +14,7 @@ Related: #1230190
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index 18888747f..ce4f39459 100644
+index 18888747f2..ce4f394596 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -240,7 +240,7 @@ int mac_selinux_generic_access_check(
@@ -27,7 +27,7 @@ index 18888747f..ce4f39459 100644
r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "SELinux policy denies access.");
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
-index ea8a619c5..5b87fa950 100644
+index ea8a619c5a..5b87fa950a 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -698,21 +698,18 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
diff --git a/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch b/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch
index bc982a0..f2a309d 100644
--- a/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch
+++ b/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch
@@ -20,7 +20,7 @@ Related: #1230190
1 file changed, 12 insertions(+), 58 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index 52883fa8c..abd9ece01 100644
+index 52883fa8cd..abd9ece016 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -501,9 +501,7 @@ static int bus_socket_read_auth(sd_bus *b) {
diff --git a/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch b/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch
index 0574bce..aaefb07 100644
--- a/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch
+++ b/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch
@@ -21,7 +21,7 @@ Related: #1230190
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
-index 06e5b4fd9..8b84b9496 100644
+index 06e5b4fd9a..8b84b9496f 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -945,8 +945,10 @@ static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds **
@@ -46,7 +46,7 @@ index 06e5b4fd9..8b84b9496 100644
if (!c->label)
return -ENOMEM;
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
-index e9f1a816a..071b3da79 100644
+index e9f1a816aa..071b3da790 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -262,7 +262,7 @@ struct sd_bus {
@@ -59,7 +59,7 @@ index e9f1a816a..071b3da79 100644
uint64_t creds_mask;
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index abd9ece01..d00cd014e 100644
+index abd9ece016..d00cd014eb 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -600,10 +600,17 @@ void bus_socket_setup(sd_bus *b) {
@@ -81,7 +81,7 @@ index abd9ece01..d00cd014e 100644
static int bus_socket_start_auth_client(sd_bus *b) {
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
-index cac9b6560..b0a323792 100644
+index cac9b65601..b0a323792b 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -121,6 +121,7 @@ static void bus_free(sd_bus *b) {
diff --git a/SOURCES/0192-journald-simplify-context-handling.patch b/SOURCES/0192-journald-simplify-context-handling.patch
index 79adcd3..9f9325d 100644
--- a/SOURCES/0192-journald-simplify-context-handling.patch
+++ b/SOURCES/0192-journald-simplify-context-handling.patch
@@ -12,7 +12,7 @@ Related: #1230190
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 11b852d39..15a554c34 100644
+index 11b852d39d..15a554c34d 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -57,10 +57,7 @@ struct StdoutStream {
diff --git a/SOURCES/0193-bash-completion-add-verb-set-property.patch b/SOURCES/0193-bash-completion-add-verb-set-property.patch
index a65df94..0db4200 100644
--- a/SOURCES/0193-bash-completion-add-verb-set-property.patch
+++ b/SOURCES/0193-bash-completion-add-verb-set-property.patch
@@ -11,7 +11,7 @@ Resolves: #1235635
1 file changed, 14 insertions(+)
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
-index 3d787cdb7..496c756a4 100644
+index 3d787cdb77..496c756a43 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -96,6 +96,12 @@ _systemctl () {
diff --git a/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch b/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch
index a111ab0..8bac0a2 100644
--- a/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch
+++ b/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch
@@ -17,7 +17,7 @@ Related: #1230190
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index d00cd014e..a3c3a45b4 100644
+index d00cd014eb..a3c3a45b46 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -900,8 +900,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
diff --git a/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch b/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch
index d69b355..972ae80 100644
--- a/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch
+++ b/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch
@@ -11,7 +11,7 @@ Resolves: #957112
1 file changed, 4 insertions(+)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 025392df5..9ca608468 100644
+index 025392df5b..9ca608468c 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -737,6 +737,10 @@ out:
diff --git a/SOURCES/0196-sysv-generator-test-Fix-assertion.patch b/SOURCES/0196-sysv-generator-test-Fix-assertion.patch
index a5bc4cf..167a379 100644
--- a/SOURCES/0196-sysv-generator-test-Fix-assertion.patch
+++ b/SOURCES/0196-sysv-generator-test-Fix-assertion.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
-index 09f5c0176..509899e0a 100644
+index 09f5c01762..509899e0a5 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -323,7 +323,7 @@ class SysvGeneratorTest(unittest.TestCase):
diff --git a/SOURCES/0197-man-avoid-line-break-in-url.patch b/SOURCES/0197-man-avoid-line-break-in-url.patch
index 16fc3a1..8df5dc0 100644
--- a/SOURCES/0197-man-avoid-line-break-in-url.patch
+++ b/SOURCES/0197-man-avoid-line-break-in-url.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/man/os-release.xml b/man/os-release.xml
-index 8f4ab10fe..4f57323d4 100644
+index 8f4ab10fed..4f57323d49 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -104,8 +104,7 @@
diff --git a/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch b/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch
index 01cd5f1..3353d65 100644
--- a/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch
+++ b/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch
@@ -28,7 +28,7 @@ Resolves: #1222517
1 file changed, 35 insertions(+)
diff --git a/man/os-release.xml b/man/os-release.xml
-index 4f57323d4..4ca2e5970 100644
+index 4f57323d49..4ca2e59706 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -273,6 +273,41 @@
diff --git a/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch b/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch
index 4539e64..2609036 100644
--- a/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch
+++ b/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch
@@ -21,7 +21,7 @@ Resolves: #1222517
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index 8d61507e8..c02ee814c 100644
+index 8d61507e84..c02ee814c4 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -601,7 +601,7 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
diff --git a/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch b/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch
index 9d0b748..42d83b1 100644
--- a/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch
+++ b/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch
@@ -25,7 +25,7 @@ Resolves: #1222517
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 65ed20579..029eb1638 100644
+index 65ed205799..029eb16380 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -250,10 +250,14 @@ static int add_mount(
@@ -78,7 +78,7 @@ index 65ed20579..029eb1638 100644
/* Honour /etc/fstab only when that's enabled */
diff --git a/src/shared/generator.c b/src/shared/generator.c
-index 7f16d5cbe..cd37812f8 100644
+index 7f16d5cbef..cd37812f86 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -33,13 +33,13 @@
@@ -137,7 +137,7 @@ index 7f16d5cbe..cd37812f8 100644
/* Allow configuration how long we wait for a device that
* backs a mount point to show up. This is useful to support
diff --git a/src/shared/generator.h b/src/shared/generator.h
-index 64bd28f59..6c3f38abb 100644
+index 64bd28f596..6c3f38abba 100644
--- a/src/shared/generator.h
+++ b/src/shared/generator.h
@@ -23,7 +23,16 @@
diff --git a/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch b/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch
index 2542a69..3bb86e8 100644
--- a/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch
+++ b/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch
@@ -24,7 +24,7 @@ Resolves: #1222517
1 file changed, 59 insertions(+), 4 deletions(-)
diff --git a/src/shared/generator.c b/src/shared/generator.c
-index cd37812f8..148a0b077 100644
+index cd37812f86..148a0b077b 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -29,8 +29,51 @@
diff --git a/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch b/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch
index 5682d39..9ac5b78 100644
--- a/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch
+++ b/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch
@@ -19,7 +19,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
-index d133847d5..98ae564af 100644
+index d133847d5e..98ae564af6 100644
--- a/units/systemd-resolved.service.m4.in
+++ b/units/systemd-resolved.service.m4.in
@@ -8,7 +8,7 @@
diff --git a/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch b/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch
index 23ac116..056c5e0 100644
--- a/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch
+++ b/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 3 deletions(-)
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
-index 6806c5115..a6289eb50 100644
+index 6806c51158..a6289eb50f 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -117,9 +117,6 @@ int socket_address_listen(
diff --git a/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch b/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch
index d1f88ab..34bcb17 100644
--- a/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch
+++ b/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch
@@ -57,7 +57,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index f87514936..09d0dbabc 100644
+index f875149364..09d0dbabcd 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -245,7 +245,7 @@ static int context_read_ntp(Context *c, sd_bus *bus) {
diff --git a/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch b/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch
index fc13b3b..c0ef82e 100644
--- a/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch
+++ b/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
-index 0b7329bf5..fd54c59e6 100644
+index 0b7329bf55..fd54c59e6b 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -134,7 +134,9 @@
@@ -33,7 +33,7 @@ index 0b7329bf5..fd54c59e6 100644
</variablelist>
diff --git a/src/journal/coredump-vacuum.c b/src/journal/coredump-vacuum.c
-index 9b73795e5..c0347ef56 100644
+index 9b73795e5b..c0347ef569 100644
--- a/src/journal/coredump-vacuum.c
+++ b/src/journal/coredump-vacuum.c
@@ -103,8 +103,7 @@ static bool vacuum_necessary(int fd, off_t sum, off_t keep_free, off_t max_use)
diff --git a/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch b/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch
index a8fd11a..a5dc175 100644
--- a/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch
+++ b/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 73a9c9d5b..d0e6567d8 100644
+index 73a9c9d5b6..d0e6567d8a 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1002,20 +1002,25 @@ static int create_item(Item *i) {
diff --git a/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch b/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch
index 0a28c9b..2828bb5 100644
--- a/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch
+++ b/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch
@@ -23,7 +23,7 @@ Resolves: #1222517
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
-index 33ca4d1a4..874207cfb 100644
+index 33ca4d1a45..874207cfb8 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -93,9 +93,7 @@ void dns_cache_flush(DnsCache *c) {
@@ -38,7 +38,7 @@ index 33ca4d1a4..874207cfb 100644
static void dns_cache_remove(DnsCache *c, DnsResourceKey *key) {
diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
-index caf06fe45..9a62a6325 100644
+index caf06fe450..9a62a63258 100644
--- a/src/resolve/resolved-dns-server.c
+++ b/src/resolve/resolved-dns-server.c
@@ -78,23 +78,24 @@ DnsServer* dns_server_free(DnsServer *s) {
@@ -74,7 +74,7 @@ index caf06fe45..9a62a6325 100644
return NULL;
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
-index f94e4bb6f..27d9129e0 100644
+index f94e4bb6f0..27d9129e00 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -68,13 +68,13 @@ Link *link_free(Link *l) {
@@ -95,7 +95,7 @@ index f94e4bb6f..27d9129e0 100644
return NULL;
}
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index b5ad70161..7c253aa13 100644
+index b5ad701611..7c253aa13f 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -536,11 +536,11 @@ Manager *manager_free(Manager *m) {
@@ -113,7 +113,7 @@ index b5ad70161..7c253aa13 100644
hashmap_free(m->dns_transactions);
diff --git a/src/shared/prioq.c b/src/shared/prioq.c
-index 8af4c51c2..b89888be0 100644
+index 8af4c51c2f..b89888be0e 100644
--- a/src/shared/prioq.c
+++ b/src/shared/prioq.c
@@ -45,12 +45,14 @@ Prioq *prioq_new(compare_func_t compare_func) {
@@ -134,7 +134,7 @@ index 8af4c51c2..b89888be0 100644
int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) {
diff --git a/src/shared/prioq.h b/src/shared/prioq.h
-index d836b36cd..1c044b135 100644
+index d836b36cd9..1c044b135c 100644
--- a/src/shared/prioq.h
+++ b/src/shared/prioq.h
@@ -28,7 +28,7 @@ typedef struct Prioq Prioq;
diff --git a/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch b/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch
index 0603cc1..752ef9e 100644
--- a/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch
+++ b/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch
@@ -16,7 +16,7 @@ Resolves: #1222517
1 file changed, 2 deletions(-)
diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
-index 7c4ab18b5..e08eb667c 100644
+index 7c4ab18b58..e08eb667cc 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -25,8 +25,6 @@
diff --git a/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch b/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch
index 25f0d07..0a81aff 100644
--- a/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch
+++ b/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 4 insertions(+)
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
-index 48fd87671..9f445278b 100644
+index 48fd87671b..9f445278bb 100644
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -106,6 +106,10 @@ _sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) {
diff --git a/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch b/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch
index 425cd83..97e2664 100644
--- a/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch
+++ b/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch
@@ -33,7 +33,7 @@ Resolves: #1222517
1 file changed, 174 insertions(+), 101 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 12c869f5a..c26cc00f5 100644
+index 12c869f5af..c26cc00f51 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -131,6 +131,7 @@ typedef struct boot_id_t {
diff --git a/SOURCES/0211-test-hashmap-fix-an-assert.patch b/SOURCES/0211-test-hashmap-fix-an-assert.patch
index 13170b6..7373335 100644
--- a/SOURCES/0211-test-hashmap-fix-an-assert.patch
+++ b/SOURCES/0211-test-hashmap-fix-an-assert.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
-index 84b508f87..c1a5ccf1f 100644
+index 84b508f874..c1a5ccf1f5 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -682,7 +682,7 @@ static void test_hashmap_get2(void) {
diff --git a/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch b/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch
index b8574b6..5e5d90b 100644
--- a/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch
+++ b/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+)
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
-index 3e26b53fd..5e8612113 100644
+index 3e26b53fd6..5e86121130 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -17,6 +17,7 @@ KillMode=mixed
diff --git a/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch b/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch
index 59b2d07..265ecd8 100644
--- a/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch
+++ b/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index 77abe2e63..46eb82fa3 100644
+index 77abe2e63c..46eb82fa34 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -533,10 +533,8 @@ int server_open_audit(Server *s) {
diff --git a/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch b/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch
index 575c51c..a17562b 100644
--- a/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch
+++ b/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index 46eb82fa3..0e739a23a 100644
+index 46eb82fa34..0e739a23af 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -532,9 +532,14 @@ int server_open_audit(Server *s) {
diff --git a/SOURCES/0215-udev-link-config-fix-corruption.patch b/SOURCES/0215-udev-link-config-fix-corruption.patch
index 4d66798..ef4de0d 100644
--- a/SOURCES/0215-udev-link-config-fix-corruption.patch
+++ b/SOURCES/0215-udev-link-config-fix-corruption.patch
@@ -19,7 +19,7 @@ Resolves: #1222517
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
-index 8b3dc45d4..489593f4f 100644
+index 8b3dc45d4e..489593f4fd 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -177,6 +177,9 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
@@ -56,7 +56,7 @@ index 8b3dc45d4..489593f4f 100644
return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name);
diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
-index cb434d1ae..f2e917488 100644
+index cb434d1aee..f2e9174887 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -67,8 +67,8 @@ struct link_config {
diff --git a/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch b/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch
index 2c73bd6..db42537 100644
--- a/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch
+++ b/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch
@@ -26,7 +26,7 @@ Resolves: #1222517
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 66474f772..dd2886caf 100644
+index 66474f7728..dd2886caf2 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -91,6 +91,7 @@
diff --git a/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch b/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch
index 717005a..523d6ab 100644
--- a/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch
+++ b/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index d3fb398fe..a81d3c131 100644
+index d3fb398fe5..a81d3c131e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,6 +177,7 @@ AM_CPPFLAGS = \
@@ -30,7 +30,7 @@ index d3fb398fe..a81d3c131 100644
-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
diff --git a/src/shared/generator.c b/src/shared/generator.c
-index 148a0b077..3af84a325 100644
+index 148a0b077b..3af84a325c 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -61,7 +61,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
diff --git a/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch b/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch
index 7934dff..59f7e67 100644
--- a/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch
+++ b/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch
@@ -34,7 +34,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 8b0bafd49..fb84e92e5 100644
+index 8b0bafd49e..fb84e92e5d 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2124,6 +2124,7 @@ int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_b
diff --git a/SOURCES/0219-small-fix-ru-translation.patch b/SOURCES/0219-small-fix-ru-translation.patch
index fc3c0af..c5219d7 100644
--- a/SOURCES/0219-small-fix-ru-translation.patch
+++ b/SOURCES/0219-small-fix-ru-translation.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/catalog/systemd.ru.catalog b/catalog/systemd.ru.catalog
-index f99532469..03eea04c9 100644
+index f99532469a..03eea04c9f 100644
--- a/catalog/systemd.ru.catalog
+++ b/catalog/systemd.ru.catalog
@@ -81,7 +81,7 @@ Documentation: man:core(5)
diff --git a/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch b/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch
index 50a966e..b8b6afd 100644
--- a/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch
+++ b/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch
@@ -19,7 +19,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
-index 97f3b9b34..6b2f29585 100644
+index 97f3b9b34a..6b2f29585d 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -66,7 +66,7 @@ int kmod_setup(void) {
diff --git a/SOURCES/0221-Partially-revert-ma-setup-simplify.patch b/SOURCES/0221-Partially-revert-ma-setup-simplify.patch
index 7adc24d..b254212 100644
--- a/SOURCES/0221-Partially-revert-ma-setup-simplify.patch
+++ b/SOURCES/0221-Partially-revert-ma-setup-simplify.patch
@@ -19,7 +19,7 @@ Resolves: #1222517
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
-index 0e0d16a7c..1d4acfa3b 100644
+index 0e0d16a7c9..1d4acfa3b1 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -27,9 +27,10 @@
diff --git a/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch b/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch
index ba92b4d..ca76fbf 100644
--- a/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch
+++ b/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
1 file changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
-index 1d4acfa3b..81ce2cda9 100644
+index 1d4acfa3b1..81ce2cda90 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -24,11 +24,6 @@
diff --git a/SOURCES/0223-ata_id-unbotch-format-specifier.patch b/SOURCES/0223-ata_id-unbotch-format-specifier.patch
index 902564c..ecbadef 100644
--- a/SOURCES/0223-ata_id-unbotch-format-specifier.patch
+++ b/SOURCES/0223-ata_id-unbotch-format-specifier.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
-index 9e4f674a9..b6f28c6f5 100644
+index 9e4f674a9e..b6f28c6f53 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -639,8 +639,8 @@ int main(int argc, char *argv[])
diff --git a/SOURCES/0224-install-explicitly-return-0-on-success.patch b/SOURCES/0224-install-explicitly-return-0-on-success.patch
index 8fb15c1..d4363b1 100644
--- a/SOURCES/0224-install-explicitly-return-0-on-success.patch
+++ b/SOURCES/0224-install-explicitly-return-0-on-success.patch
@@ -21,7 +21,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index b62065be5..aa197e91b 100644
+index b62065be5c..aa197e91b9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2265,7 +2265,7 @@ int unit_file_get_list(
diff --git a/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch b/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch
index a1a653e..b7aa831 100644
--- a/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch
+++ b/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index f59870563..a274db480 100644
+index f598705633..a274db4803 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -226,7 +226,10 @@
diff --git a/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch b/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch
index 95faaa2..6370df4 100644
--- a/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch
+++ b/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch
@@ -15,7 +15,7 @@ Resolves: #1222517
1 file changed, 4 insertions(+)
diff --git a/src/core/main.c b/src/core/main.c
-index fd527d4d6..1c8d67dac 100644
+index fd527d4d63..1c8d67dac2 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2001,6 +2001,10 @@ finish:
diff --git a/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch b/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch
index 9ca7371..4f7b253 100644
--- a/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch
+++ b/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 56b53e601..5b93aa71e 100644
+index 56b53e6015..5b93aa71ef 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -858,9 +858,10 @@
diff --git a/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch b/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch
index 4ba38fe..b3c5639 100644
--- a/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch
+++ b/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch
@@ -12,7 +12,7 @@ Resolves: #1222517
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
-index 4d8988673..1accccb68 100644
+index 4d89886736..1accccb688 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -190,11 +190,12 @@ static void print_status_info(const StatusInfo *i) {
diff --git a/SOURCES/0229-escape-fix-exit-code.patch b/SOURCES/0229-escape-fix-exit-code.patch
index da36667..3a48942 100644
--- a/SOURCES/0229-escape-fix-exit-code.patch
+++ b/SOURCES/0229-escape-fix-exit-code.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/escape/escape.c b/src/escape/escape.c
-index f2a072186..766a2c2c6 100644
+index f2a0721861..766a2c2c61 100644
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -232,5 +232,5 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0230-man-information-about-available-properties.patch b/SOURCES/0230-man-information-about-available-properties.patch
index 2987ae7..3c31213 100644
--- a/SOURCES/0230-man-information-about-available-properties.patch
+++ b/SOURCES/0230-man-information-about-available-properties.patch
@@ -13,7 +13,7 @@ Resolves: #1222517
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 44ec0d7bc..6b29b8cd0 100644
+index 44ec0d7bcf..6b29b8cd03 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -111,12 +111,30 @@
diff --git a/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch b/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch
index 45a5e2a..19371b2 100644
--- a/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch
+++ b/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch
@@ -22,7 +22,7 @@ Resolves: #1222517
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 04839c950..d692c06ef 100644
+index 04839c950c..d692c06ef7 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -942,7 +942,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
diff --git a/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch b/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch
index 84b2206..3977368 100644
--- a/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch
+++ b/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch
@@ -22,7 +22,7 @@ Resolves: #1222517
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index cfc4a99e4..3c6cb8f10 100644
+index cfc4a99e4a..3c6cb8f10e 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -166,7 +166,7 @@ static int generate_unit_file(SysvStub *s) {
@@ -35,7 +35,7 @@ index cfc4a99e4..3c6cb8f10 100644
(void) unlink(unit);
}
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
-index 509899e0a..e716d705c 100644
+index 509899e0a5..e716d705c0 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -178,6 +178,8 @@ class SysvGeneratorTest(unittest.TestCase):
diff --git a/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch b/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch
index 7378faa..a9fcf65 100644
--- a/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch
+++ b/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch
@@ -18,7 +18,7 @@ Resolves: #1222517
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index fd4fb6f1b..fa63f2426 100644
+index fd4fb6f1b2..fa63f2426f 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1698,7 +1698,10 @@ fail:
diff --git a/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch b/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch
index a7d8fe5..47e2d20 100644
--- a/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch
+++ b/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch
@@ -14,7 +14,7 @@ Resolves: #1222517
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index fa63f2426..1f1a41ab6 100644
+index fa63f2426f..1f1a41ab66 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1768,7 +1768,18 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
diff --git a/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch b/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch
index 79ac5ab..91fcab1 100644
--- a/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch
+++ b/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch
@@ -13,7 +13,7 @@ Resolves: #1199644
1 file changed, 4 insertions(+)
diff --git a/units/tmp.mount b/units/tmp.mount
-index 00a0d2872..af0cf4a55 100644
+index 00a0d28722..af0cf4a551 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -19,3 +19,7 @@ What=tmpfs
diff --git a/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch b/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch
index d802365..2d703c5 100644
--- a/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch
+++ b/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch
@@ -16,7 +16,7 @@ Related: #1016680
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index fff00d9f9..017fbaf2a 100644
+index fff00d9f93..017fbaf2a3 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1714,13 +1714,13 @@ static int bus_job_get_service_result(BusWaitForJobs *d, char **result) {
diff --git a/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch b/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch
index d29462e..939ac60 100644
--- a/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch
+++ b/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch
@@ -11,7 +11,7 @@ Related: #1016680
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 017fbaf2a..e48abf55a 100644
+index 017fbaf2a3..e48abf55a3 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1724,28 +1724,34 @@ static const struct {
diff --git a/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch b/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch
index 6c292ce..bba6c7c 100644
--- a/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch
+++ b/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch
@@ -22,7 +22,7 @@ Resolves: #1249968
delete mode 100644 units/systemd-journald-dev-log.socket
diff --git a/Makefile-man.am b/Makefile-man.am
-index 084df754a..497be6612 100644
+index 084df754a2..497be6612c 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -214,7 +214,6 @@ MANPAGES_ALIAS += \
@@ -52,7 +52,7 @@ index 084df754a..497be6612 100644
$(html-alias)
diff --git a/Makefile.am b/Makefile.am
-index a81d3c131..58bcc2c42 100644
+index a81d3c131e..58bcc2c429 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4518,8 +4518,7 @@ bin_PROGRAMS += \
@@ -77,7 +77,7 @@ index a81d3c131..58bcc2c42 100644
systemd-journald.service \
systemd-journal-flush.service \
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
-index 8280d6c87..fe99ce9bc 100644
+index 8280d6c874..fe99ce9bc6 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -45,7 +45,6 @@
@@ -97,7 +97,7 @@ index 8280d6c87..fe99ce9bc 100644
</refsynopsisdiv>
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index d4f1c8621..ebd5fb334 100644
+index d4f1c86211..ebd5fb3347 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -187,7 +187,8 @@ static int mount_dev(BindMount *m) {
@@ -111,7 +111,7 @@ index d4f1c8621..ebd5fb334 100644
NULSTR_FOREACH(d, devnodes) {
_cleanup_free_ char *dn = NULL;
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index d692c06ef..fb7aae309 100644
+index d692c06ef7..fb7aae3096 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1531,8 +1531,7 @@ int server_init(Server *s) {
@@ -125,7 +125,7 @@ index d692c06ef..fb7aae309 100644
if (s->syslog_fd >= 0) {
log_error("Too many /dev/log sockets passed.");
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index ba80941d7..4e118aabc 100644
+index ba80941d7b..4e118aabc0 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -384,7 +384,7 @@ int server_open_syslog_socket(Server *s) {
@@ -139,7 +139,7 @@ index ba80941d7..4e118aabc 100644
s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
deleted file mode 100644
-index ffd44bb50..000000000
+index ffd44bb507..0000000000
--- a/units/systemd-journald-dev-log.socket
+++ /dev/null
@@ -1,32 +0,0 @@
@@ -176,7 +176,7 @@ index ffd44bb50..000000000
-ReceiveBuffer=8M
-SendBuffer=8M
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 1bcc290ec..9d4462283 100644
+index 1bcc290ec4..9d44622837 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -10,12 +10,12 @@ Description=Journal Service
@@ -195,7 +195,7 @@ index 1bcc290ec..9d4462283 100644
Restart=always
RestartSec=0
diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
-index 71737014c..fbeb10baa 100644
+index 71737014ca..fbeb10baae 100644
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -19,8 +19,8 @@ IgnoreOnIsolate=yes
diff --git a/SOURCES/0239-journald-server-don-t-read-audit-events.patch b/SOURCES/0239-journald-server-don-t-read-audit-events.patch
index ee0deb1..f1f7a2a 100644
--- a/SOURCES/0239-journald-server-don-t-read-audit-events.patch
+++ b/SOURCES/0239-journald-server-don-t-read-audit-events.patch
@@ -9,7 +9,7 @@ Resolves: #1252409
1 file changed, 4 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index fb7aae309..f13147f65 100644
+index fb7aae3096..f13147f659 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1577,10 +1577,6 @@ int server_init(Server *s) {
diff --git a/SOURCES/0240-everything-remove-traces-of-user.patch b/SOURCES/0240-everything-remove-traces-of-user.patch
index 201809e..df0c396 100644
--- a/SOURCES/0240-everything-remove-traces-of-user.patch
+++ b/SOURCES/0240-everything-remove-traces-of-user.patch
@@ -32,7 +32,7 @@ Resolves: #1071363
24 files changed, 40 insertions(+), 290 deletions(-)
diff --git a/man/busctl.xml b/man/busctl.xml
-index 807fc78e8..0635280ea 100644
+index 807fc78e8f..0635280ead 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -75,9 +75,8 @@
@@ -56,7 +56,7 @@ index 807fc78e8..0635280ea 100644
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index 08de0ff06..2764f66ed 100644
+index 08de0ff068..2764f66ed4 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -469,20 +469,6 @@
@@ -81,7 +81,7 @@ index 08de0ff06..2764f66ed 100644
<term><option>-p</option></term>
<term><option>--priority=</option></term>
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
-index b4a3f502b..a448aed02 100644
+index b4a3f502b4..a448aed02c 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -78,9 +78,7 @@
@@ -106,7 +106,7 @@ index b4a3f502b..a448aed02 100644
<listitem><para>If the last concurrent session of a user ends,
the <varname>$XDG_RUNTIME_DIR</varname> directory and all its
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 6b29b8cd0..c6f584278 100644
+index 6b29b8cd03..c6f5842786 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -339,7 +339,6 @@
@@ -221,7 +221,7 @@ index 6b29b8cd0..c6f584278 100644
<term><command>switch-root <replaceable>ROOT</replaceable> <optional><replaceable>INIT</replaceable></optional></command></term>
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
-index 198315052..b2e0f42d5 100644
+index 198315052f..b2e0f42d50 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -188,12 +188,6 @@
@@ -238,7 +238,7 @@ index 198315052..b2e0f42d5 100644
<varlistentry>
<term><option>--system</option></term>
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
-index febcdb026..f46fc3abf 100644
+index febcdb0262..f46fc3abf4 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -294,7 +294,6 @@
@@ -250,7 +250,7 @@ index febcdb026..f46fc3abf 100644
<xi:include href="user-system-options.xml" xpointer="host" />
<xi:include href="user-system-options.xml" xpointer="machine" />
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 1b74ed38f..ca25c93a1 100644
+index 1b74ed38f7..ca25c93a1f 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -66,10 +66,7 @@
@@ -266,7 +266,7 @@ index 1b74ed38f..ca25c93a1 100644
operations.</para>
</refsect1>
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
-index ac6deafb1..d6b6a7ce4 100644
+index ac6deafb18..d6b6a7ce45 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -97,11 +97,9 @@
@@ -283,7 +283,7 @@ index ac6deafb1..d6b6a7ce4 100644
becomes available.</para>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 5b93aa71e..6af7c7ae5 100644
+index 5b93aa71ef..6af7c7ae5d 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1148,9 +1148,7 @@
@@ -332,7 +332,7 @@ index 5b93aa71e..6af7c7ae5 100644
<term><varname>$LISTEN_FDS</varname></term>
<term><varname>$LISTEN_PID</varname></term>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index cf76aaf60..553197d66 100644
+index cf76aaf607..553197d66e 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -772,47 +772,6 @@
@@ -396,7 +396,7 @@ index cf76aaf60..553197d66 100644
</varlistentry>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index c2e374a94..414749bae 100644
+index c2e374a94e..414749bae9 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -263,14 +263,6 @@
@@ -494,7 +494,7 @@ index c2e374a94..414749bae 100644
<filename>/usr/lib/systemd/system/httpd.service</filename> with
the following contents:</para>
diff --git a/man/systemd.xml b/man/systemd.xml
-index d006b0bb9..eb289f03b 100644
+index d006b0bb99..eb289f03b7 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -77,10 +77,7 @@
@@ -621,7 +621,7 @@ index d006b0bb9..eb289f03b 100644
<term><constant>SIGRTMIN+26</constant></term>
<term><constant>SIGRTMIN+27</constant></term>
diff --git a/man/user-system-options.xml b/man/user-system-options.xml
-index 8616c5424..ae911a975 100644
+index 8616c54249..ae911a975e 100644
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -3,15 +3,6 @@
@@ -641,7 +641,7 @@ index 8616c5424..ae911a975 100644
<term><option>--system</option></term>
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl
-index 6a770b1b8..027dfdf67 100644
+index 6a770b1b84..027dfdf678 100644
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -75,7 +75,7 @@ _busctl() {
@@ -654,7 +654,7 @@ index 6a770b1b8..027dfdf67 100644
--quiet --verbose --expect-reply=no --auto-start=no
--allow-interactive-authorization=yes --augment-creds=no'
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
-index 1387524a8..91cb369ec 100644
+index 1387524a85..91cb369ecd 100644
--- a/shell-completion/bash/journalctl
+++ b/shell-completion/bash/journalctl
@@ -49,7 +49,7 @@ _journalctl() {
@@ -677,7 +677,7 @@ index 1387524a8..91cb369ec 100644
return 0
;;
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
-index 496c756a4..0a022c4cf 100644
+index 496c756a43..0a022c4cf4 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -92,7 +92,7 @@ _systemctl () {
@@ -690,7 +690,7 @@ index 496c756a4..0a022c4cf 100644
)
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
-index 00947029c..1c4fe4017 100644
+index 00947029c6..1c4fe40174 100644
--- a/shell-completion/bash/systemd-analyze
+++ b/shell-completion/bash/systemd-analyze
@@ -35,7 +35,7 @@ _systemd_analyze() {
@@ -738,7 +738,7 @@ index 00947029c..1c4fe4017 100644
comps=$( compgen -A file -- "$cur" )
compopt -o filenames
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
-index 712655caf..5145cd3f2 100644
+index 712655caf4..5145cd3f29 100644
--- a/shell-completion/bash/systemd-run
+++ b/shell-completion/bash/systemd-run
@@ -32,7 +32,7 @@ __get_machines() {
@@ -760,7 +760,7 @@ index 712655caf..5145cd3f2 100644
done
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index 591b4ab14..ff84f6894 100644
+index 591b4ab14e..ff84f6894f 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1170,7 +1170,6 @@ static void help(void) {
@@ -772,7 +772,7 @@ index 591b4ab14..ff84f6894 100644
" -M --machine=CONTAINER Operate on local container\n"
" --order Show only order in the graph\n"
diff --git a/src/core/main.c b/src/core/main.c
-index 1c8d67dac..2aec40b0b 100644
+index 1c8d67dac2..2aec40b0bb 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -956,7 +956,6 @@ static int help(void) {
@@ -784,7 +784,7 @@ index 1c8d67dac..2aec40b0b 100644
" --crash-shell[=0|1] Run shell on crash\n"
" --confirm-spawn[=0|1] Ask for confirmation when spawning processes\n"
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index c26cc00f5..8236d0810 100644
+index c26cc00f51..8236d0810b 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -204,7 +204,6 @@ static void help(void) {
@@ -796,7 +796,7 @@ index c26cc00f5..8236d0810 100644
" -p --priority=RANGE Show entries with the specified priority\n"
" -e --pager-end Immediately jump to the end in the pager\n"
diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
-index d3c177201..bffbf4a0e 100644
+index d3c1772019..bffbf4a0ef 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -1688,7 +1688,6 @@ static int help(void) {
@@ -808,7 +808,7 @@ index d3c177201..bffbf4a0e 100644
" -M --machine=CONTAINER Operate on local container\n"
" --address=ADDRESS Connect to bus specified by address\n"
diff --git a/src/run/run.c b/src/run/run.c
-index 0661b3bee..0e5bde23d 100644
+index 0661b3bee9..0e5bde23d2 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -68,7 +68,6 @@ static void help(void) {
@@ -820,7 +820,7 @@ index 0661b3bee..0e5bde23d 100644
" -M --machine=CONTAINER Operate on local container\n"
" --scope Run this as scope rather than service\n"
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 9898694d7..89d0b3b39 100644
+index 9898694d75..89d0b3b399 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6050,7 +6050,6 @@ static void systemctl_help(void) {
diff --git a/SOURCES/0241-selinux-fix-check-for-transient-units.patch b/SOURCES/0241-selinux-fix-check-for-transient-units.patch
index 5a3e6d9..160db42 100644
--- a/SOURCES/0241-selinux-fix-check-for-transient-units.patch
+++ b/SOURCES/0241-selinux-fix-check-for-transient-units.patch
@@ -21,7 +21,7 @@ Resolves: #1255129
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 2bc37ba60..1ec350e03 100644
+index 2bc37ba60e..1ec350e034 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -734,7 +734,7 @@ static int method_start_transient_unit(sd_bus *bus, sd_bus_message *message, voi
@@ -43,7 +43,7 @@ index 2bc37ba60..1ec350e03 100644
return r;
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index ce4f39459..91460b8af 100644
+index ce4f394596..91460b8af9 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -175,6 +175,7 @@ void mac_selinux_access_free(void) {
@@ -85,7 +85,7 @@ index ce4f39459..91460b8af 100644
sd_bus_creds_get_cmdline(creds, &cmdline);
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
-index dd1e8bb9d..7dc271b35 100644
+index dd1e8bb9d0..7dc271b35d 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -28,21 +28,24 @@
diff --git a/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch b/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch
index 2766dd7..f880ed7 100644
--- a/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch
+++ b/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch
@@ -10,7 +10,7 @@ Resolves: #1135599
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/socket.c b/src/core/socket.c
-index 760de0203..7022e77b5 100644
+index 760de0203d..7022e77b53 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -833,7 +833,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
diff --git a/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch b/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch
index e497457..1d32447 100644
--- a/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch
+++ b/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch
@@ -16,7 +16,7 @@ Resolves: #1185120
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index 91460b8af..f11247c09 100644
+index 91460b8af9..f11247c092 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -272,12 +272,12 @@ int mac_selinux_unit_access_check_strv(char **units,
diff --git a/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch b/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch
index 496d57a..eae78b9 100644
--- a/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch
+++ b/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch
@@ -23,7 +23,7 @@ Resolves: #1256888
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index f11247c09..297372d12 100644
+index f11247c092..297372d126 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -219,13 +219,13 @@ int mac_selinux_generic_access_check(
@@ -43,7 +43,7 @@ index f11247c09..297372d12 100644
r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get current context.");
goto finish;
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
-index a46ddf849..4c2e1b0b4 100644
+index a46ddf8498..4c2e1b0b47 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -200,11 +200,11 @@ int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {
diff --git a/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch b/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch
index 4c3b63b..32b045b 100644
--- a/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch
+++ b/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch
@@ -15,7 +15,7 @@ Resolves: #1259015
1 file changed, 8 insertions(+)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index dd2886caf..ddd83d4f1 100644
+index dd2886caf2..ddd83d4f1b 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -283,8 +283,16 @@ static int names_pci(struct udev_device *dev, struct netnames *names) {
diff --git a/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch b/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch
index ba8a8dd..3a772be 100644
--- a/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch
+++ b/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch
@@ -13,7 +13,7 @@ Resolves: #1263158
2 files changed, 15 deletions(-)
diff --git a/NEWS b/NEWS
-index d78874924..ee976d44b 100644
+index d788749240..ee976d44ba 100644
--- a/NEWS
+++ b/NEWS
@@ -619,18 +619,6 @@ CHANGES WITH 217:
@@ -36,7 +36,7 @@ index d78874924..ee976d44b 100644
available for service units, that allows locking all service
processes into a stricter bus policy, in order to limit
diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
-index def151bb8..44c48236c 100644
+index def151bb84..44c48236cc 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -32,9 +32,6 @@ net.ipv4.conf.all.accept_source_route = 0
diff --git a/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch b/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch
index 026f7fe..a28a362 100644
--- a/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch
+++ b/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch
@@ -11,7 +11,7 @@ Resolves: #1260465
2 files changed, 162 insertions(+), 3 deletions(-)
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
-index b0eede9a3..6c8a59e7c 100644
+index b0eede9a34..6c8a59e7c9 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -657,19 +657,165 @@ finish:
@@ -184,7 +184,7 @@ index b0eede9a3..6c8a59e7c 100644
static int show_session(int argc, char *argv[], void *userdata) {
diff --git a/src/shared/macro.h b/src/shared/macro.h
-index 7f89951d6..9d857dc8d 100644
+index 7f89951d62..9d857dc8d7 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -26,6 +26,7 @@
diff --git a/SOURCES/0248-login-fix-label-on-run-nologin.patch b/SOURCES/0248-login-fix-label-on-run-nologin.patch
index 9f9578b..e3fac0c 100644
--- a/SOURCES/0248-login-fix-label-on-run-nologin.patch
+++ b/SOURCES/0248-login-fix-label-on-run-nologin.patch
@@ -12,7 +12,7 @@ Resolves: #1264073
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 58bcc2c42..0fcb73750 100644
+index 58bcc2c429..0fcb737509 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5829,7 +5829,8 @@ systemd_user_sessions_SOURCES = \
@@ -26,7 +26,7 @@ index 58bcc2c42..0fcb73750 100644
rootlibexec_PROGRAMS += \
systemd-logind \
diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
-index 6edb823e8..d1d429c0d 100644
+index 6edb823e8c..d1d429c0d2 100644
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -26,6 +26,7 @@
diff --git a/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch b/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch
index 196532a..05a10e3 100644
--- a/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch
+++ b/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch
@@ -10,7 +10,7 @@ Resolves: #1264112
1 file changed, 3 insertions(+)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 305e75228..9a48adde1 100644
+index 305e752285..9a48adde19 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -11,3 +11,6 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/sys
diff --git a/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch b/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch
index 374b9e8..37a3caa 100644
--- a/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch
+++ b/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch
@@ -9,7 +9,7 @@ Related: #1264073
1 file changed, 1 insertion(+)
diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
-index d1d429c0d..9710524da 100644
+index d1d429c0d2..9710524daf 100644
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -26,6 +26,7 @@
diff --git a/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch b/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch
index 3e7c818..5267228 100644
--- a/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch
+++ b/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch
@@ -11,7 +11,7 @@ Related: #1264073
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
-index 701882b96..e1917a626 100644
+index 701882b96d..e1917a626f 100644
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -39,6 +39,8 @@
diff --git a/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch b/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch
index 1df2e5a..2cd97e8 100644
--- a/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch
+++ b/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch
@@ -15,7 +15,7 @@ Resolves: #1266479
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index c6350be9f..1f1e6fe91 100644
+index c6350be9f4..1f1e6fe917 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -231,6 +231,12 @@ static int prepare_prioq_compare(const void *a, const void *b) {
diff --git a/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch b/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch
index 7822a6f..0f869e7 100644
--- a/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch
+++ b/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch
@@ -10,7 +10,7 @@ Resolves: #1265539
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/units/ldconfig.service b/units/ldconfig.service
-index 43c145b72..8600b1327 100644
+index 43c145b726..8600b13275 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -12,7 +12,8 @@ DefaultDependencies=no
diff --git a/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch b/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch
index f4089fe..b6759d2 100644
--- a/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch
+++ b/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch
@@ -52,7 +52,7 @@ Related: #1185120
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index 297372d12..6cc0a49b9 100644
+index 297372d126..6cc0a49b92 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -42,6 +42,7 @@
diff --git a/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch b/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch
index 848f76c..191ccd8 100644
--- a/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch
+++ b/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch
@@ -13,7 +13,7 @@ Resolves: #1186044
create mode 100644 tmpfiles.d/sap.conf
diff --git a/Makefile.am b/Makefile.am
-index 0fcb73750..887e70a95 100644
+index 0fcb737509..887e70a95f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2220,7 +2220,8 @@ dist_tmpfiles_DATA = \
@@ -28,7 +28,7 @@ index 0fcb73750..887e70a95 100644
dist_tmpfiles_DATA += \
diff --git a/tmpfiles.d/sap.conf b/tmpfiles.d/sap.conf
new file mode 100644
-index 000000000..01ace42c4
+index 0000000000..01ace42c43
--- /dev/null
+++ b/tmpfiles.d/sap.conf
@@ -0,0 +1,3 @@
diff --git a/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch b/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch
index 6c8b5b5..151eae4 100644
--- a/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch
+++ b/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch
@@ -12,7 +12,7 @@ Resolves: #1269216
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index ddd83d4f1..ffd6ea416 100644
+index ddd83d4f1b..ffd6ea4166 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -281,14 +281,29 @@ out:
@@ -48,7 +48,7 @@ index ddd83d4f1..ffd6ea416 100644
if (!parent)
return -ENOENT;
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 87a3f69e9..21e7e7f9a 100644
+index 87a3f69e90..21e7e7f9a9 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1003,10 +1003,10 @@ static void kernel_cmdline_options(struct udev *udev) {
diff --git a/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch b/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch
index 1a5980f..f86b39a 100644
--- a/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch
+++ b/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch
@@ -11,7 +11,7 @@ Resolves: #1186044
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tmpfiles.d/sap.conf b/tmpfiles.d/sap.conf
-index 01ace42c4..1cdca5263 100644
+index 01ace42c43..1cdca5263c 100644
--- a/tmpfiles.d/sap.conf
+++ b/tmpfiles.d/sap.conf
@@ -1,3 +1,9 @@
diff --git a/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch b/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch
index 419fa7a..df37976 100644
--- a/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch
+++ b/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch
@@ -19,7 +19,7 @@ Resolves: #1272368
3 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index e48abf55a..6d5615082 100644
+index e48abf55a3..6d56150825 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1854,6 +1854,16 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) {
@@ -40,7 +40,7 @@ index e48abf55a..6d5615082 100644
const char *type, *path, *source;
int r;
diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h
-index 21db98228..8c8846c6e 100644
+index 21db982280..8c8846c6ee 100644
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@ -209,6 +209,7 @@ int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret);
@@ -52,7 +52,7 @@ index 21db98228..8c8846c6e 100644
DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free);
diff --git a/src/run/run.c b/src/run/run.c
-index 0e5bde23d..dd1338f3b 100644
+index 0e5bde23d2..dd1338f3b4 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -806,14 +806,20 @@ static int start_transient_scope(
diff --git a/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch b/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch
index eda6bb6..168108b 100644
--- a/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch
+++ b/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch
@@ -18,7 +18,7 @@ Resolves: #1283579
2 files changed, 69 insertions(+), 12 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index cc4ebd2c8..8a6855dfc 100644
+index cc4ebd2c87..8a6855dfc3 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -151,14 +151,47 @@ static int device_coldplug(Unit *u, Hashmap *deferred_work) {
@@ -144,7 +144,7 @@ index cc4ebd2c8..8a6855dfc 100644
.active_state = device_active_state,
diff --git a/src/core/device.h b/src/core/device.h
-index 0609b20fd..6724ab21e 100644
+index 0609b20fdb..6724ab21ea 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -53,7 +53,7 @@ struct Device {
diff --git a/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch b/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch
index cbc8f7c..91ce689 100644
--- a/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch
+++ b/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch
@@ -52,7 +52,7 @@ Resolves: #1283579
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 1f1a41ab6..23f63ce32 100644
+index 1f1a41ab66..23f63ce32c 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -321,7 +321,7 @@ static int mount_add_device_links(Mount *m) {
@@ -65,7 +65,7 @@ index 1f1a41ab6..23f63ce32 100644
return r;
diff --git a/src/core/socket.c b/src/core/socket.c
-index 7022e77b5..bc677a20f 100644
+index 7022e77b53..bc677a20f8 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -267,7 +267,7 @@ static int socket_add_device_link(Socket *s) {
@@ -78,7 +78,7 @@ index 7022e77b5..bc677a20f 100644
static int socket_add_default_dependencies(Socket *s) {
diff --git a/src/core/swap.c b/src/core/swap.c
-index 369abf0f5..34a2c406d 100644
+index 369abf0f53..34a2c406d8 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -201,7 +201,7 @@ static int swap_add_device_links(Swap *s) {
@@ -91,7 +91,7 @@ index 369abf0f5..34a2c406d 100644
/* File based swap devices need to be ordered after
* systemd-remount-fs.service, since they might need a
diff --git a/src/core/unit.c b/src/core/unit.c
-index fa17567dd..ae47a2876 100644
+index fa17567dd3..ae47a28765 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2823,7 +2823,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
@@ -113,7 +113,7 @@ index fa17567dd..ae47a2876 100644
return r;
diff --git a/src/core/unit.h b/src/core/unit.h
-index 7ebc489c8..0eebc0b89 100644
+index 7ebc489c80..0eebc0b891 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -548,7 +548,7 @@ void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *v
diff --git a/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch b/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch
index 5bfbff0..69d7997 100644
--- a/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch
+++ b/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch
@@ -12,7 +12,7 @@ Resolves: #1284588
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/login/logind.c b/src/login/logind.c
-index b44f37642..3afbf34a1 100644
+index b44f376427..3afbf34a13 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -49,7 +49,7 @@ Manager *manager_new(void) {
@@ -25,7 +25,7 @@ index b44f37642..3afbf34a1 100644
m->handle_power_key = HANDLE_POWEROFF;
m->handle_suspend_key = HANDLE_SUSPEND;
diff --git a/src/login/logind.conf b/src/login/logind.conf
-index 834c4c2eb..be8d7dff2 100644
+index 834c4c2ebf..be8d7dff29 100644
--- a/src/login/logind.conf
+++ b/src/login/logind.conf
@@ -30,4 +30,4 @@
diff --git a/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch b/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch
index 9d8d834..807f766 100644
--- a/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch
+++ b/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch
@@ -17,7 +17,7 @@ Resolves: #1285492
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 3c6cb8f10..0a8a528bd 100644
+index 3c6cb8f10e..0a8a528bdc 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -753,7 +753,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
diff --git a/SOURCES/0263-sysv-generator-test-always-log-to-console.patch b/SOURCES/0263-sysv-generator-test-always-log-to-console.patch
index 455c5a5..82f31f2 100644
--- a/SOURCES/0263-sysv-generator-test-always-log-to-console.patch
+++ b/SOURCES/0263-sysv-generator-test-always-log-to-console.patch
@@ -15,7 +15,7 @@ Resolves: #1279034
1 file changed, 1 insertion(+)
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
-index e716d705c..153786417 100644
+index e716d705c0..153786417a 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -60,6 +60,7 @@ class SysvGeneratorTest(unittest.TestCase):
diff --git a/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch b/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch
index 3a39f2b..db10d01 100644
--- a/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch
+++ b/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch
@@ -11,7 +11,7 @@ Related: #1284588
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
-index d02d57356..54651f07d 100644
+index d02d573565..54651f07d2 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -276,7 +276,7 @@
diff --git a/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch b/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
index c5026c5..09b258f 100644
--- a/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
+++ b/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch
@@ -14,7 +14,7 @@ Resolves: #1298109
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index ae47a2876..4fb2fd300 100644
+index ae47a28765..4fb2fd3001 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -807,7 +807,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
diff --git a/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch b/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch
index 86e73cc..7464227 100644
--- a/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch
+++ b/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch
@@ -9,7 +9,7 @@ Resolves: #1279034
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
-index 153786417..2060ad754 100644
+index 153786417a..2060ad754e 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -225,21 +225,27 @@ class SysvGeneratorTest(unittest.TestCase):
diff --git a/SOURCES/0267-makefile-disable-udev-tests.patch b/SOURCES/0267-makefile-disable-udev-tests.patch
index d914f35..99f44ff 100644
--- a/SOURCES/0267-makefile-disable-udev-tests.patch
+++ b/SOURCES/0267-makefile-disable-udev-tests.patch
@@ -9,7 +9,7 @@ RHEL-only
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 887e70a95..2645f66bc 100644
+index 887e70a95f..2645f66bc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3785,9 +3785,9 @@ hwdb-remove-hook:
diff --git a/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch b/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch
index 5d58977..51074ec 100644
--- a/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch
+++ b/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch
@@ -16,7 +16,7 @@ Resolves: #1278165
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 54c465520..d3ce8dda7 100644
+index 54c465520d..d3ce8dda7f 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -29,7 +29,7 @@
diff --git a/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch b/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch
index a3a6fc8..c4b73c6 100644
--- a/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch
+++ b/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch
@@ -20,7 +20,7 @@ Resolves: #1278165
1 file changed, 2 insertions(+)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index d3ce8dda7..55a6ca90f 100644
+index d3ce8dda7f..55a6ca90fb 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -142,12 +142,14 @@ static int detect_vm_dmi(const char **_id) {
diff --git a/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch b/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch
index c36129e..e353ff2 100644
--- a/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch
+++ b/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch
@@ -15,7 +15,7 @@ Resolves: #1285642
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 2cbe58bc1..c4f71e887 100644
+index 2cbe58bc15..c4f71e8873 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -302,7 +302,7 @@
@@ -28,7 +28,7 @@ index 2cbe58bc1..c4f71e887 100644
<literal>systemd.journald.forward_to_syslog=</literal>,
<literal>systemd.journald.forward_to_kmsg=</literal>,
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index f13147f65..6a35ebbde 100644
+index f13147f659..6a35ebbde0 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1470,6 +1470,7 @@ int server_init(Server *s) {
@@ -40,7 +40,7 @@ index f13147f65..6a35ebbde 100644
s->max_file_usec = DEFAULT_MAX_FILE_USEC;
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 47eefe91c..3907dfb7f 100644
+index 47eefe91c1..3907dfb7ff 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -27,7 +27,7 @@
diff --git a/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch b/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch
index c711f5b..bfa9197 100644
--- a/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch
+++ b/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch
@@ -21,7 +21,7 @@ Resolves: #1266745
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 778c2b0e0..50925888d 100644
+index 778c2b0e04..50925888df 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1713,7 +1713,7 @@ bool fstype_is_network(const char *fstype) {
diff --git a/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch b/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch
index b41cccd..da4dcbf 100644
--- a/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch
+++ b/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch
@@ -21,7 +21,7 @@ Resolves: #1247963
7 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/man/systemd.xml b/man/systemd.xml
-index eb289f03b..30005b1ef 100644
+index eb289f03b7..30005b1ef2 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -754,6 +754,13 @@
@@ -39,7 +39,7 @@ index eb289f03b..30005b1ef 100644
<term><varname>$LISTEN_PID</varname></term>
<term><varname>$LISTEN_FDS</varname></term>
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 8236d0810..7058788ef 100644
+index 8236d0810b..7058788efa 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2140,7 +2140,7 @@ int main(int argc, char *argv[]) {
@@ -52,7 +52,7 @@ index 8236d0810..7058788ef 100644
arg_utc * OUTPUT_UTC;
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
-index 6c8a59e7c..8e3bfbea8 100644
+index 6c8a59e7c9..8e3bfbea8a 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -83,7 +83,7 @@ static OutputFlags get_output_flags(void) {
@@ -65,7 +65,7 @@ index 6c8a59e7c..8e3bfbea8 100644
static int list_sessions(int argc, char *argv[], void *userdata) {
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index f1910709d..ef1214a66 100644
+index f1910709d2..ef1214a666 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -105,7 +105,7 @@ static OutputFlags get_output_flags(void) {
@@ -78,7 +78,7 @@ index f1910709d..ef1214a66 100644
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 50925888d..dc5185269 100644
+index 50925888df..dc51852699 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -8146,3 +8146,16 @@ char *shell_maybe_quote(const char *s) {
@@ -99,7 +99,7 @@ index 50925888d..dc5185269 100644
+ return parse_boolean(colors) != 0;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index 7ecfd8571..b4a4a491f 100644
+index 7ecfd8571d..b4a4a491f9 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -485,29 +485,30 @@ unsigned lines(void);
@@ -140,7 +140,7 @@ index 7ecfd8571..b4a4a491f 100644
int files_same(const char *filea, const char *fileb);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 89d0b3b39..5d3a85fd9 100644
+index 89d0b3b399..5d3a85fd95 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -197,7 +197,7 @@ static OutputFlags get_output_flags(void) {
diff --git a/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch b/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch
index 2befa76..e3fef53 100644
--- a/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch
+++ b/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch
@@ -17,7 +17,7 @@ Resolves: #1261136
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
-index 0a61dafc5..19baa6b55 100644
+index 0a61dafc59..19baa6b55d 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -70,9 +70,11 @@ int ask_password_tty(
diff --git a/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch b/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch
index 2e11a73..5c599c2 100644
--- a/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch
+++ b/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch
@@ -18,7 +18,7 @@ Resolves: #1288600
2 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 0a8a528bd..d60e75a06 100644
+index 0a8a528bdc..d60e75a06b 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -134,34 +134,14 @@ static int add_alias(const char *service, const char *alias) {
@@ -84,7 +84,7 @@ index 0a8a528bd..d60e75a06 100644
fprintf(f,
"\n[Service]\n"
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
-index 2060ad754..25a35da47 100644
+index 2060ad754e..25a35da47f 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -23,6 +23,7 @@ import subprocess
diff --git a/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch b/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch
index eb148fc..419bcd9 100644
--- a/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch
+++ b/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch
@@ -23,7 +23,7 @@ Resolves: #1266934
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 9ca608468..695ac7fc1 100644
+index 9ca608468c..695ac7fc1f 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -92,6 +92,9 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
diff --git a/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch b/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch
index a76c549..c99d805 100644
--- a/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch
+++ b/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch
@@ -15,7 +15,7 @@ Resolves: #1273306
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
-index b6f28c6f5..4adec4496 100644
+index b6f28c6f53..4adec44960 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -638,10 +638,20 @@ int main(int argc, char *argv[])
diff --git a/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch b/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch
index 31b1885..d65cf95 100644
--- a/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch
+++ b/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch
@@ -10,7 +10,7 @@ Resolves: #1273306
1 file changed, 4 insertions(+)
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
-index 4adec4496..ef05fba26 100644
+index 4adec44960..ef05fba263 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -485,6 +485,10 @@ int main(int argc, char *argv[])
diff --git a/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch b/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch
index 6158bb1..2cb40f3 100644
--- a/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch
+++ b/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch
@@ -22,7 +22,7 @@ Resolves: #1082179
create mode 100644 man/sd_journal_has_runtime_files.xml
diff --git a/Makefile-man.am b/Makefile-man.am
-index 497be6612..7ec709c8b 100644
+index 497be6612c..7ec709c8b8 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -40,6 +40,7 @@ MANPAGES += \
@@ -68,7 +68,7 @@ index 497be6612..7ec709c8b 100644
man/sd_journal_open.xml \
man/sd_journal_print.xml \
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
-index 9b1a52207..a1185d372 100644
+index 9b1a52207f..a1185d372b 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -81,9 +81,11 @@
@@ -96,7 +96,7 @@ index 9b1a52207..a1185d372 100644
<citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml
new file mode 100644
-index 000000000..237e64920
+index 0000000000..237e649206
--- /dev/null
+++ b/man/sd_journal_has_runtime_files.xml
@@ -0,0 +1,95 @@
@@ -196,7 +196,7 @@ index 000000000..237e64920
+
+</refentry>
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
-index b51ecdb60..115d7776d 100644
+index b51ecdb600..115d7776da 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -115,6 +115,8 @@ struct sd_journal {
@@ -209,7 +209,7 @@ index b51ecdb60..115d7776d 100644
size_t data_threshold;
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9b9e8ac85..20456c3a1 100644
+index 9b9e8ac859..20456c3a12 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1230,8 +1230,7 @@ static int add_any_file(sd_journal *j, const char *path) {
@@ -261,7 +261,7 @@ index 9b9e8ac85..20456c3a1 100644
+ return j->has_persistent_files;
+}
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
-index 00237a215..d5fd46eea 100644
+index 00237a2158..d5fd46eea4 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -138,6 +138,9 @@ int sd_journal_reliable_fd(sd_journal *j);
diff --git a/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch b/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch
index f6355dd..e22b9a4 100644
--- a/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch
+++ b/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch
@@ -11,7 +11,7 @@ Resolves: #1082179
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 7058788ef..964f849ee 100644
+index 7058788efa..964f849ee0 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1090,10 +1090,11 @@ static int add_boot(sd_journal *j) {
diff --git a/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch b/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch
index 3275d86..faa5adc 100644
--- a/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch
+++ b/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch
@@ -14,7 +14,7 @@ Resolves: #1082179
1 file changed, 7 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 964f849ee..836d7d214 100644
+index 964f849ee0..836d7d2141 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1905,6 +1905,13 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch b/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch
index 305ef5b..bac4dbb 100644
--- a/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch
+++ b/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch
@@ -23,7 +23,7 @@ Resolves: #947636
2 files changed, 97 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 2645f66bc..255937643 100644
+index 2645f66bc1..255937643e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4245,7 +4245,8 @@ journalctl_LDADD = \
@@ -37,7 +37,7 @@ index 2645f66bc..255937643 100644
if HAVE_ACL
journalctl_LDADD += \
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 836d7d214..3db1cd24e 100644
+index 836d7d2141..3db1cd24ef 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -63,6 +63,8 @@
diff --git a/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch b/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch
index 5ac2fc2..ae1795c 100644
--- a/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch
+++ b/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch
@@ -11,7 +11,7 @@ Related: #947636
1 file changed, 4 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 3db1cd24e..6948ed689 100644
+index 3db1cd24ef..6948ed689d 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -207,6 +207,10 @@ static int add_matches_for_device(sd_journal *j, const char *devpath) {
diff --git a/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch b/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch
index 741a3fe..954fd29 100644
--- a/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch
+++ b/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch
@@ -11,7 +11,7 @@ Related: #947636
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index 2764f66ed..0981fba72 100644
+index 2764f66ed4..0981fba729 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -91,8 +91,14 @@
diff --git a/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch b/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch
index 3cbc9d0..df609e5 100644
--- a/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch
+++ b/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch
@@ -12,7 +12,7 @@ Resolves: #1296249
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 8a6855dfc..1995e3c0b 100644
+index 8a6855dfc3..1995e3c0b4 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -317,7 +317,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
diff --git a/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch b/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch
index 00a87c3..790b753 100644
--- a/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch
+++ b/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch
@@ -13,7 +13,7 @@ Resolves: #1289461
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
-index 89995831b..2b2c3dad6 100644
+index 89995831b1..2b2c3dad66 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -263,7 +263,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
@@ -26,7 +26,7 @@ index 89995831b..2b2c3dad6 100644
}
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
-index ab0d96e37..64b763c1e 100644
+index ab0d96e377..64b763c1e1 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -168,10 +168,8 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
diff --git a/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch b/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch
index cef6b48..8fb6fa2 100644
--- a/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch
+++ b/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch
@@ -12,7 +12,7 @@ Resolves: #1268336
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
-index b2e0f42d5..e58d9a74e 100644
+index b2e0f42d50..e58d9a74ef 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -93,7 +93,7 @@
diff --git a/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch b/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch
index b10569c..6bc7d86 100644
--- a/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch
+++ b/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch
@@ -11,7 +11,7 @@ Related: #1266934
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 695ac7fc1..9ca608468 100644
+index 695ac7fc1f..9ca608468c 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -92,9 +92,6 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
diff --git a/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch b/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch
index 49fd8ad..d1419c6 100644
--- a/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch
+++ b/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch
@@ -75,7 +75,7 @@ Resolves: #1266934
1 file changed, 30 insertions(+)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 9ca608468..3b72922d4 100644
+index 9ca608468c..3b72922d48 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -92,7 +92,11 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s
diff --git a/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch b/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch
index ddea68f..f995a6e 100644
--- a/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch
+++ b/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch
@@ -15,7 +15,7 @@ Resolves: #1254650
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 5d3a85fd9..bf5bb398b 100644
+index 5d3a85fd95..bf5bb398b7 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3002,6 +3002,7 @@ static int check_unit_generic(sd_bus *bus, int code, const char *good_states, ch
diff --git a/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch b/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch
index 2f35ee2..ae090f9 100644
--- a/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch
+++ b/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch
@@ -20,7 +20,7 @@ Resolves: #1312011
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index b66d727a4..a4f4bf3df 100644
+index b66d727a48..a4f4bf3dfd 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -12,7 +12,7 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*|ttysclp*|sclp_line*|3270
diff --git a/SOURCES/0291-s390-add-personality-support.patch b/SOURCES/0291-s390-add-personality-support.patch
index d751c1c..2556d37 100644
--- a/SOURCES/0291-s390-add-personality-support.patch
+++ b/SOURCES/0291-s390-add-personality-support.patch
@@ -17,7 +17,7 @@ Resolves: #1300344
create mode 100644 test/exec-personality-s390.service
diff --git a/Makefile.am b/Makefile.am
-index 255937643..3af720bda 100644
+index 255937643e..3af720bdae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1483,6 +1483,7 @@ EXTRA_DIST += \
@@ -29,7 +29,7 @@ index 255937643..3af720bda 100644
test/exec-privatedevices-yes.service \
test/exec-privatetmp-no.service \
diff --git a/src/shared/util.c b/src/shared/util.c
-index dc5185269..a24aa7f93 100644
+index dc51852699..a24aa7f93a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -6748,6 +6748,19 @@ unsigned long personality_from_string(const char *p) {
@@ -74,7 +74,7 @@ index dc5185269..a24aa7f93 100644
return NULL;
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 91ccaf72b..00f3607b4 100644
+index 91ccaf72b8..00f3607b49 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -77,10 +77,14 @@ static void test_exec_workingdirectory(Manager *m) {
@@ -96,7 +96,7 @@ index 91ccaf72b..00f3607b4 100644
diff --git a/test/exec-personality-s390.service b/test/exec-personality-s390.service
new file mode 100644
-index 000000000..f3c3b03e3
+index 0000000000..f3c3b03e3d
--- /dev/null
+++ b/test/exec-personality-s390.service
@@ -0,0 +1,7 @@
diff --git a/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch b/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch
index 07aec58..2eb2f44 100644
--- a/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch
+++ b/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch
@@ -20,7 +20,7 @@ Resolves: #1316452
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
-index a6289eb50..713e71ba3 100644
+index a6289eb50f..713e71ba3c 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -119,7 +119,7 @@ int socket_address_listen(
diff --git a/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch b/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch
index e637af4..b5d38d1 100644
--- a/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch
+++ b/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch
@@ -30,7 +30,7 @@ Resolves: #952567
1 file changed, 6 insertions(+)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 3b72922d4..8359e236a 100644
+index 3b72922d48..8359e236a1 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -698,6 +698,12 @@ restart:
diff --git a/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch b/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch
index e397d6c..d049572 100644
--- a/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch
+++ b/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch
@@ -18,7 +18,7 @@ Resolves: #1292447
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index f500568fe..a8f92e23a 100644
+index f500568fec..a8f92e23a9 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1051,23 +1051,25 @@ static int journal_file_append_data(
@@ -53,7 +53,7 @@ index f500568fe..a8f92e23a 100644
r = journal_file_link_data(f, o, p, hash);
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 403c8f760..0f29b092b 100644
+index 403c8f760c..0f29b092b7 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -229,3 +229,8 @@ int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t *
diff --git a/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch b/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch
index 15a6c33..8a8d8f0 100644
--- a/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch
+++ b/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch
@@ -11,7 +11,7 @@ Related: #1292447
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/journal/compress.c b/src/journal/compress.c
-index 6923753f8..c9a3399cc 100644
+index 6923753f89..c9a3399cca 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -51,10 +51,11 @@ int compress_blob_xz(const void *src, uint64_t src_size, void *dst, size_t *dst_
@@ -31,7 +31,7 @@ index 6923753f8..c9a3399cc 100644
lzma_ret ret;
size_t out_pos = 0;
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index a8f92e23a..892fe4734 100644
+index a8f92e23a9..892fe47340 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1032,7 +1032,7 @@ static int journal_file_append_data(
diff --git a/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch b/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch
index 29d9614..dddb2c9 100644
--- a/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch
+++ b/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch
@@ -86,7 +86,7 @@ Resolves: #1159308
create mode 100644 src/test/test-install-root.c
diff --git a/Makefile.am b/Makefile.am
-index 3af720bda..3a09e0a62 100644
+index 3af720bdae..3a09e0a62b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1427,7 +1427,8 @@ tests += \
@@ -116,7 +116,7 @@ index 3af720bda..3a09e0a62 100644
libsystemd-core.la
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index c6f584278..2d0678d18 100644
+index c6f5842786..2d0678d18d 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -905,10 +905,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
@@ -148,7 +148,7 @@ index c6f584278..2d0678d18 100644
</tgroup>
</table>
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 1ec350e03..faa124d92 100644
+index 1ec350e034..faa124d926 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1530,9 +1530,9 @@ static int method_get_unit_file_state(sd_bus *bus, sd_bus_message *message, void
@@ -165,7 +165,7 @@ index 1ec350e03..faa124d92 100644
return sd_bus_reply_method_return(message, "s", unit_file_state_to_string(state));
}
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 625d21ab8..227915efc 100644
+index 625d21ab8b..227915efc2 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -919,7 +919,7 @@ static int bus_unit_set_transient_property(
@@ -187,7 +187,7 @@ index 625d21ab8..227915efc 100644
if (mode != UNIT_CHECK) {
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index ec4cf4eef..70c09188a 100644
+index ec4cf4eefa..70c09188a3 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3409,7 +3409,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
@@ -200,7 +200,7 @@ index ec4cf4eef..70c09188a 100644
id = set_get(names, name);
if (!id) {
diff --git a/src/core/manager.c b/src/core/manager.c
-index 7483a96ec..bde17ce0b 100644
+index 7483a96ec6..bde17ce0be 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1328,7 +1328,7 @@ int manager_load_unit_prepare(
@@ -213,7 +213,7 @@ index 7483a96ec..bde17ce0b 100644
ret = manager_get_unit(m, name);
diff --git a/src/core/snapshot.c b/src/core/snapshot.c
-index b1d844877..f222ec232 100644
+index b1d8448771..f222ec232f 100644
--- a/src/core/snapshot.c
+++ b/src/core/snapshot.c
@@ -201,7 +201,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e,
@@ -226,7 +226,7 @@ index b1d844877..f222ec232 100644
if (unit_name_to_type(name) != UNIT_SNAPSHOT)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 4fb2fd300..db5aa987e 100644
+index 4fb2fd3001..db5aa987ec 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -158,7 +158,7 @@ int unit_add_name(Unit *u, const char *text) {
@@ -272,7 +272,7 @@ index 4fb2fd300..db5aa987e 100644
return u->unit_file_preset;
}
diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
-index 2e08af2df..c909a4b1d 100644
+index 2e08af2df2..c909a4b1da 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -188,7 +188,7 @@ static int add_dbus(const char *path, const char *fname, const char *type) {
@@ -285,7 +285,7 @@ index 2e08af2df..c909a4b1d 100644
return 0;
}
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a37ca170f..b77c1d887 100644
+index a37ca170fb..b77c1d8879 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -50,8 +50,6 @@ static bool arg_copy_locale = false;
@@ -368,7 +368,7 @@ index a37ca170f..b77c1d887 100644
return 0;
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index dfd8689b7..cf757d2b2 100644
+index dfd8689b72..cf757d2b23 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1147,7 +1147,7 @@ int cg_path_decode_unit(const char *cgroup, char **unit){
@@ -399,7 +399,7 @@ index dfd8689b7..cf757d2b2 100644
escaped = cg_escape(n);
diff --git a/src/shared/install.c b/src/shared/install.c
-index aa197e91b..5288bb450 100644
+index aa197e91b9..5288bb4501 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -39,15 +39,24 @@
@@ -3124,7 +3124,7 @@ index aa197e91b..5288bb450 100644
DEFINE_STRING_TABLE_LOOKUP(unit_file_state, UnitFileState);
diff --git a/src/shared/install.h b/src/shared/install.h
-index d729e6ed1..87a40b67c 100644
+index d729e6ed15..87a40b67c1 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -24,6 +24,7 @@
@@ -3214,7 +3214,7 @@ index d729e6ed1..87a40b67c 100644
void unit_file_changes_free(UnitFileChange *changes, unsigned n_changes);
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index d5510bf56..1181ffb9d 100644
+index d5510bf56f..1181ffb9d4 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -704,3 +704,37 @@ int fsck_exists(const char *fstype) {
@@ -3256,7 +3256,7 @@ index d5510bf56..1181ffb9d 100644
+ return n;
+}
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index ca81b49cb..71bb740e9 100644
+index ca81b49cbf..71bb740e98 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -63,6 +63,33 @@ bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool
@@ -3294,7 +3294,7 @@ index ca81b49cb..71bb740e9 100644
* the tree, to root. Also returns "" (and not "/"!) for the root
* directory. Excludes the specified directory itself */
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
-index f728af4a8..b7827d14b 100644
+index f728af4a81..b7827d14bb 100644
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -63,16 +63,13 @@ static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
@@ -3349,7 +3349,7 @@ index f728af4a8..b7827d14b 100644
bool unit_instance_is_valid(const char *i) {
diff --git a/src/shared/unit-name.h b/src/shared/unit-name.h
-index 6f139cc4c..436486062 100644
+index 6f139cc4c4..4364860623 100644
--- a/src/shared/unit-name.h
+++ b/src/shared/unit-name.h
@@ -107,6 +107,13 @@ enum UnitDependency {
@@ -3381,7 +3381,7 @@ index 6f139cc4c..436486062 100644
bool unit_instance_is_valid(const char *i) _pure_;
diff --git a/src/shared/util.c b/src/shared/util.c
-index a24aa7f93..036677eb4 100644
+index a24aa7f93a..036677eb46 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1094,6 +1094,27 @@ int readlink_and_canonicalize(const char *p, char **r) {
@@ -3413,7 +3413,7 @@ index a24aa7f93..036677eb4 100644
int sig, r = 0;
diff --git a/src/shared/util.h b/src/shared/util.h
-index b4a4a491f..a441e44ff 100644
+index b4a4a491f9..a441e44ff9 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -281,6 +281,7 @@ int readlink_malloc(const char *p, char **r);
@@ -3425,7 +3425,7 @@ index b4a4a491f..a441e44ff 100644
int reset_all_signal_handlers(void);
int reset_signal_mask(void);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index bf5bb398b..95ddf3be7 100644
+index bf5bb398b7..95ddf3be76 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1304,7 +1304,7 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) {
@@ -3449,7 +3449,7 @@ index bf5bb398b..95ddf3be7 100644
if (state == UNIT_FILE_ENABLED ||
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index d60e75a06..7e0e7fc28 100644
+index d60e75a06b..7e0e7fc283 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -712,6 +712,7 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
@@ -3485,7 +3485,7 @@ index d60e75a06..7e0e7fc28 100644
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
new file mode 100644
-index 000000000..89d91d3d6
+index 0000000000..89d91d3d64
--- /dev/null
+++ b/src/test/test-install-root.c
@@ -0,0 +1,663 @@
@@ -4153,7 +4153,7 @@ index 000000000..89d91d3d6
+ return 0;
+}
diff --git a/src/test/test-install.c b/src/test/test-install.c
-index 467970b00..08a1faf2c 100644
+index 467970b007..08a1faf2c4 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -50,17 +50,19 @@ int main(int argc, char* argv[]) {
diff --git a/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch b/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch
index b57ba56..f73aeee 100644
--- a/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch
+++ b/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch
@@ -17,7 +17,7 @@ Related: #1159308
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 70c09188a..b188ec99d 100644
+index 70c09188a3..b188ec99d9 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3472,8 +3472,17 @@ static int merge_by_names(Unit **u, Set *names, const char *id) {
diff --git a/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch b/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch
index 2f32bf3..f70ed5b 100644
--- a/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch
+++ b/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch
@@ -11,7 +11,7 @@ Resolves: #1142369
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index bde17ce0b..bb5050303 100644
+index bde17ce0be..bb5050303c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1328,8 +1328,12 @@ int manager_load_unit_prepare(
diff --git a/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch b/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch
index a57bd86..bd0daad 100644
--- a/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch
+++ b/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch
@@ -13,7 +13,7 @@ Resolves: #1296288
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 9b4e11c1b..fc1fe13ac 100644
+index 9b4e11c1b9..fc1fe13aca 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -187,7 +187,8 @@
diff --git a/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch b/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch
index cb445ed..4f73336 100644
--- a/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch
+++ b/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch
@@ -11,7 +11,7 @@ Resolves: #1296288
1 file changed, 74 insertions(+), 38 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index d0e6567d8..64c733aaa 100644
+index d0e6567d8a..64c733aaa0 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -570,51 +570,69 @@ finish:
diff --git a/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch b/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch
index dac2bc6..35df390 100644
--- a/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch
+++ b/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch
@@ -15,7 +15,7 @@ Resolves: #1230210
1 file changed, 9 insertions(+)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index ffd6ea416..19e1f2631 100644
+index ffd6ea4166..19e1f2631a 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -101,6 +101,8 @@
diff --git a/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch b/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch
index b54b6ea..1ef025f 100644
--- a/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch
+++ b/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch
@@ -14,7 +14,7 @@ Resolves: #1324826
create mode 100644 test/exec-runtimedirectory.service
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 00f3607b4..90b1c871c 100644
+index 00f3607b49..90b1c871cc 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -141,6 +141,11 @@ static void test_exec_umask(Manager *m) {
@@ -47,7 +47,7 @@ index 00f3607b4..90b1c871c 100644
r = manager_new(SYSTEMD_USER, true, &m);
diff --git a/test/exec-runtimedirectory-mode.service b/test/exec-runtimedirectory-mode.service
new file mode 100644
-index 000000000..ba6d7ee39
+index 0000000000..ba6d7ee39f
--- /dev/null
+++ b/test/exec-runtimedirectory-mode.service
@@ -0,0 +1,8 @@
@@ -61,7 +61,7 @@ index 000000000..ba6d7ee39
+RuntimeDirectoryMode=0750
diff --git a/test/exec-runtimedirectory.service b/test/exec-runtimedirectory.service
new file mode 100644
-index 000000000..c12a6c63d
+index 0000000000..c12a6c63d6
--- /dev/null
+++ b/test/exec-runtimedirectory.service
@@ -0,0 +1,7 @@
diff --git a/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch b/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch
index 6fdf04a..8cd03aa 100644
--- a/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch
+++ b/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch
@@ -19,7 +19,7 @@ Resolves: #1324826
create mode 100644 test/exec-runtimedirectory-owner.service
diff --git a/src/core/execute.c b/src/core/execute.c
-index 1815e3de2..8172c8b44 100644
+index 1815e3de2d..8172c8b442 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -629,14 +629,6 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_
@@ -56,7 +56,7 @@ index 1815e3de2..8172c8b44 100644
* must sure to drop O_NONBLOCK */
if (socket_fd >= 0)
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 90b1c871c..38522a168 100644
+index 90b1c871cc..38522a168d 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -144,6 +144,7 @@ static void test_exec_umask(Manager *m) {
@@ -69,7 +69,7 @@ index 90b1c871c..38522a168 100644
int main(int argc, char *argv[]) {
diff --git a/test/exec-runtimedirectory-owner.service b/test/exec-runtimedirectory-owner.service
new file mode 100644
-index 000000000..077e08d1c
+index 0000000000..077e08d1c5
--- /dev/null
+++ b/test/exec-runtimedirectory-owner.service
@@ -0,0 +1,9 @@
diff --git a/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch b/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch
index e3d3237..24a6088 100644
--- a/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch
+++ b/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch
@@ -15,7 +15,7 @@ Resolves: #1306126
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/shared/generator.c b/src/shared/generator.c
-index 3af84a325..be8e24eb4 100644
+index 3af84a325c..be8e24eb49 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -35,8 +35,13 @@
diff --git a/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch b/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch
index 7431827..85028da 100644
--- a/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch
+++ b/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch
@@ -18,7 +18,7 @@ Resolves: #1305279
6 files changed, 100 insertions(+), 6 deletions(-)
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
-index 20890f227..bdd14d888 100644
+index 20890f2270..bdd14d8883 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -180,13 +180,12 @@
@@ -80,7 +80,7 @@ index 20890f227..bdd14d888 100644
<term><varname>Unit=</varname></term>
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
-index 43e785246..cd7bf44ba 100644
+index 43e785246c..cd7bf44baa 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -181,6 +181,7 @@ const sd_bus_vtable bus_timer_vtable[] = {
@@ -115,7 +115,7 @@ index 43e785246..cd7bf44ba 100644
int b;
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 53059845e..5106a98ee 100644
+index 53059845e3..5106a98eec 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -336,6 +336,7 @@ Timer.OnUnitInactiveSec, config_parse_timer, 0,
@@ -127,7 +127,7 @@ index 53059845e..5106a98ee 100644
m4_dnl
Path.PathExists, config_parse_path_spec, 0, 0
diff --git a/src/core/timer.c b/src/core/timer.c
-index 48cf9c16a..972dd73df 100644
+index 48cf9c16a8..972dd73dfb 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -29,6 +29,7 @@
@@ -187,7 +187,7 @@ index 48cf9c16a..972dd73df 100644
if (t->realtime_event_source) {
diff --git a/src/core/timer.h b/src/core/timer.h
-index de412a043..b97724525 100644
+index de412a043e..b977245250 100644
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -69,6 +69,7 @@ struct Timer {
@@ -199,7 +199,7 @@ index de412a043..b97724525 100644
LIST_HEAD(TimerValue, values);
usec_t next_elapse_realtime;
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 6d5615082..5ecb3bea4 100644
+index 6d56150825..5ecb3bea42 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1360,6 +1360,22 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
diff --git a/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch b/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch
index 82753db..7d41d4a 100644
--- a/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch
+++ b/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch
@@ -18,7 +18,7 @@ Resolves: #1305279
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
-index bdd14d888..ab83b2c9c 100644
+index bdd14d8883..ab83b2c9cf 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -195,7 +195,7 @@
@@ -51,7 +51,7 @@ index bdd14d888..ab83b2c9c 100644
</varlistentry>
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
-index cd7bf44ba..478905acc 100644
+index cd7bf44baa..478905accb 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -181,7 +181,7 @@ const sd_bus_vtable bus_timer_vtable[] = {
@@ -82,7 +82,7 @@ index cd7bf44ba..478905acc 100644
return 1;
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 5106a98ee..85d979751 100644
+index 5106a98eec..85d9797514 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -336,7 +336,7 @@ Timer.OnUnitInactiveSec, config_parse_timer, 0,
@@ -95,7 +95,7 @@ index 5106a98ee..85d979751 100644
m4_dnl
Path.PathExists, config_parse_path_spec, 0, 0
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 5ecb3bea4..3a918361b 100644
+index 5ecb3bea42..3a918361b5 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1364,14 +1364,14 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
diff --git a/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch b/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch
index 8e9eb5c..968e821 100644
--- a/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch
+++ b/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch
@@ -11,7 +11,7 @@ Resolves: #1327303
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tmpfiles.d/systemd-remote.conf b/tmpfiles.d/systemd-remote.conf
-index 1b8973a88..e19230f64 100644
+index 1b8973a889..e19230f648 100644
--- a/tmpfiles.d/systemd-remote.conf
+++ b/tmpfiles.d/systemd-remote.conf
@@ -7,5 +7,7 @@
diff --git a/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch b/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch
index cdbbaef..17463ef 100644
--- a/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch
+++ b/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch
@@ -16,7 +16,7 @@ Resolves: #1329233
3 files changed, 9 insertions(+)
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
-index a7b222718..9a385c7e5 100644
+index a7b2227182..9a385c7e5e 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -72,6 +72,13 @@
@@ -34,7 +34,7 @@ index a7b222718..9a385c7e5 100644
<varlistentry>
<term><varname>SplitMode=</varname></term>
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index b7cc6d717..9c515f9c8 100644
+index b7cc6d7172..9c515f9c8f 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1174,6 +1174,7 @@ static DEFINE_CONFIG_PARSE_ENUM(config_parse_write_split_mode,
@@ -46,7 +46,7 @@ index b7cc6d717..9c515f9c8 100644
{ "Remote", "ServerKeyFile", config_parse_path, 0, &arg_key },
{ "Remote", "ServerCertificateFile", config_parse_path, 0, &arg_cert },
diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in
-index 3e32f34de..7122d6336 100644
+index 3e32f34def..7122d63362 100644
--- a/src/journal-remote/journal-remote.conf.in
+++ b/src/journal-remote/journal-remote.conf.in
@@ -1,4 +1,5 @@
diff --git a/SOURCES/0309-tests-fix-make-check-failure.patch b/SOURCES/0309-tests-fix-make-check-failure.patch
index 289ab1e..10d02f1 100644
--- a/SOURCES/0309-tests-fix-make-check-failure.patch
+++ b/SOURCES/0309-tests-fix-make-check-failure.patch
@@ -12,7 +12,7 @@ Related: #1159308
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
-index 89d91d3d6..667c3748c 100644
+index 89d91d3d64..667c3748c5 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -657,7 +657,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch b/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch
index 2aeabaa..86eedcf 100644
--- a/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch
+++ b/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch
@@ -35,7 +35,7 @@ Resolves: #1332606
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 1995e3c0b..fc73e263a 100644
+index 1995e3c0b4..fc73e263ab 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -314,11 +314,19 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
diff --git a/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch b/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch
index 30fbfd5..e1f496c 100644
--- a/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch
+++ b/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch
@@ -19,7 +19,7 @@ Resolves: #1332606
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index fc73e263a..bdc8466ab 100644
+index fc73e263ab..bdc8466abc 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -319,7 +319,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa
diff --git a/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch b/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch
index 9d3cef1..5fd1463 100644
--- a/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch
+++ b/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch
@@ -10,7 +10,7 @@ Related: #1331667
1 file changed, 1 insertion(+)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index faa124d92..1a5525e50 100644
+index faa124d926..1a5525e50f 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1621,6 +1621,7 @@ static int reply_unit_file_changes_and_free(
diff --git a/SOURCES/0313-nspawn-fix-minor-memory-leak.patch b/SOURCES/0313-nspawn-fix-minor-memory-leak.patch
index 400089c..ffa44d3 100644
--- a/SOURCES/0313-nspawn-fix-minor-memory-leak.patch
+++ b/SOURCES/0313-nspawn-fix-minor-memory-leak.patch
@@ -13,7 +13,7 @@ Related: #1331667
1 file changed, 1 insertion(+)
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
-index 31274a141..88b3f4e3c 100644
+index 31274a1418..88b3f4e3c4 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -388,6 +388,7 @@ PTYForward *pty_forward_free(PTYForward *f) {
diff --git a/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch b/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch
index 8f7cfa2..454ba41 100644
--- a/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch
+++ b/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch
@@ -14,7 +14,7 @@ Related: #1331667
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index a4e26b1d8..407d0afee 100644
+index a4e26b1d8c..407d0afee3 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -544,7 +544,7 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
diff --git a/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch b/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch
index a72a99b..a9bcc27 100644
--- a/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch
+++ b/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch
@@ -38,7 +38,7 @@ Related: #1331667
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index bb5050303..a1504bf17 100644
+index bb5050303c..a1504bf17b 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2827,7 +2827,7 @@ static void trim_generator_dir(Manager *m, char **generator) {
diff --git a/SOURCES/0316-modules-load-fix-memory-leak.patch b/SOURCES/0316-modules-load-fix-memory-leak.patch
index 756fd76..2459caa 100644
--- a/SOURCES/0316-modules-load-fix-memory-leak.patch
+++ b/SOURCES/0316-modules-load-fix-memory-leak.patch
@@ -27,7 +27,7 @@ Related: #1331667
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 5f678789c..bab9246a3 100644
+index 5f678789ce..bab9246a3e 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch b/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch
index 7d2b32b..d5507bb 100644
--- a/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch
+++ b/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch
@@ -49,7 +49,7 @@ Related: #1331667
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 1a5525e50..9eef290ca 100644
+index 1a5525e50f..9eef290ca7 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1875,8 +1875,10 @@ static int method_preset_all_unit_files(sd_bus *bus, sd_bus_message *message, vo
diff --git a/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch b/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch
index 444d226..55e7e65 100644
--- a/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch
+++ b/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch
@@ -14,7 +14,7 @@ Related: #1331667
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
-index 8625ee6d8..a80aaaeef 100644
+index 8625ee6d89..a80aaaeefe 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -264,7 +264,7 @@ fail:
diff --git a/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch b/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch
index 72aec5c..5289d19 100644
--- a/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch
+++ b/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch
@@ -40,7 +40,7 @@ Related: #1331667
1 file changed, 3 insertions(+)
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
-index 8be190040..42cf00572 100644
+index 8be190040e..42cf00572f 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -68,6 +68,9 @@ int unit_load_dropin(Unit *u) {
diff --git a/SOURCES/0320-bus-fix-leak-in-error-path.patch b/SOURCES/0320-bus-fix-leak-in-error-path.patch
index 3a61e88..bbb168a 100644
--- a/SOURCES/0320-bus-fix-leak-in-error-path.patch
+++ b/SOURCES/0320-bus-fix-leak-in-error-path.patch
@@ -12,7 +12,7 @@ Related: #1331667
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
-index 295930303..c8402a23a 100644
+index 2959303033..c8402a23a9 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -441,7 +441,7 @@ int bus_message_from_header(
diff --git a/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch b/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch
index d3b9d3a..248b8dc 100644
--- a/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch
+++ b/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch
@@ -10,7 +10,7 @@ Related: #1331667
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index c2495056d..8c374116a 100644
+index c2495056d7..8c374116ad 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1060,7 +1060,7 @@ int add_matches_for_unit(sd_journal *j, const char *unit) {
diff --git a/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch b/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch
index 75f6f61..bc0c6fe 100644
--- a/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch
+++ b/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch
@@ -16,7 +16,7 @@ Resolves: #1335499
4 files changed, 75 insertions(+)
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index 4e7edef52..75b7186e8 100644
+index 4e7edef52d..75b7186e8f 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -180,6 +180,24 @@ static int property_get_idle_since_hint(
@@ -98,7 +98,7 @@ index 4e7edef52..75b7186e8 100644
SD_BUS_METHOD("ReleaseControl", NULL, NULL, method_release_control, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("TakeDevice", "uu", "hb", method_take_device, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index d2e7b4012..dc24539f1 100644
+index d2e7b40124..dc24539f12 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -843,6 +843,23 @@ void session_set_idle_hint(Session *s, bool b) {
@@ -126,7 +126,7 @@ index d2e7b4012..dc24539f1 100644
Session *s = userdata;
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
-index a007fb5e8..5002b6868 100644
+index a007fb5e84..5002b68689 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -111,6 +111,8 @@ struct Session {
@@ -148,7 +148,7 @@ index a007fb5e8..5002b6868 100644
int session_start(Session *s);
int session_stop(Session *s, bool force);
diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
-index 1318328aa..dc7e0bec2 100644
+index 1318328aa0..dc7e0bec20 100644
--- a/src/login/org.freedesktop.login1.conf
+++ b/src/login/org.freedesktop.login1.conf
@@ -160,6 +160,10 @@
diff --git a/SOURCES/0323-import-use-the-old-curl-api.patch b/SOURCES/0323-import-use-the-old-curl-api.patch
index fb63cd9..be48bf4 100644
--- a/SOURCES/0323-import-use-the-old-curl-api.patch
+++ b/SOURCES/0323-import-use-the-old-curl-api.patch
@@ -13,7 +13,7 @@ Resolves: #1284974
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/import/import-job.c b/src/import/import-job.c
-index 809486500..5f9cfd366 100644
+index 809486500b..5f9cfd366d 100644
--- a/src/import/import-job.c
+++ b/src/import/import-job.c
@@ -587,7 +587,7 @@ fail:
diff --git a/SOURCES/0324-importd-drop-dkr-support.patch b/SOURCES/0324-importd-drop-dkr-support.patch
index a268ee3..db54c0f 100644
--- a/SOURCES/0324-importd-drop-dkr-support.patch
+++ b/SOURCES/0324-importd-drop-dkr-support.patch
@@ -29,7 +29,7 @@ Related: #1284974
delete mode 100644 src/import/import-dkr.h
diff --git a/Makefile.am b/Makefile.am
-index 3a09e0a62..b0a34b212 100644
+index 3a09e0a62b..b0a34b212d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5369,8 +5369,6 @@ systemd_pull_SOURCES = \
@@ -42,7 +42,7 @@ index 3a09e0a62..b0a34b212 100644
src/import/import-job.h \
src/import/import-common.c \
diff --git a/TODO b/TODO
-index 90b2c4b30..d96d2bf0e 100644
+index 90b2c4b30a..d96d2bf0ee 100644
--- a/TODO
+++ b/TODO
@@ -126,10 +126,6 @@ Features:
@@ -57,7 +57,7 @@ index 90b2c4b30..d96d2bf0e 100644
* core/cgroup: support net_cls modules, and support automatically allocating class ids, then add support for making firewall changes depending on it, to implement a per-service firewall
diff --git a/configure.ac b/configure.ac
-index 9103f9b92..2734368dc 100644
+index 9103f9b923..2734368dc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1389,14 +1389,6 @@ AC_ARG_ENABLE([split-usr],
@@ -84,7 +84,7 @@ index 9103f9b92..2734368dc 100644
CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 640cb8b7d..b0a7f2ae4 100644
+index 640cb8b7d6..b0a7f2ae49 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -204,16 +204,6 @@
@@ -168,7 +168,7 @@ index 640cb8b7d..b0a7f2ae4 100644
<refsect1>
diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
deleted file mode 100644
-index fb72f6cee..000000000
+index fb72f6cee3..0000000000
--- a/src/import/import-dkr.c
+++ /dev/null
@@ -1,891 +0,0 @@
@@ -1065,7 +1065,7 @@ index fb72f6cee..000000000
-}
diff --git a/src/import/import-dkr.h b/src/import/import-dkr.h
deleted file mode 100644
-index 633c76796..000000000
+index 633c767965..0000000000
--- a/src/import/import-dkr.h
+++ /dev/null
@@ -1,36 +0,0 @@
@@ -1106,7 +1106,7 @@ index 633c76796..000000000
-
-int dkr_import_pull(DkrImport *import, const char *name, const char *tag, const char *local, bool force_local);
diff --git a/src/import/importd.c b/src/import/importd.c
-index 1222bf3cd..9aaf991f8 100644
+index 1222bf3cd2..9aaf991f83 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -38,7 +38,6 @@ typedef struct Manager Manager;
@@ -1298,7 +1298,7 @@ index 1222bf3cd..9aaf991f8 100644
SD_BUS_METHOD("CancelTransfer", "u", NULL, method_cancel_transfer, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_SIGNAL("TransferNew", "uo", 0),
diff --git a/src/import/org.freedesktop.import1.conf b/src/import/org.freedesktop.import1.conf
-index ae36af422..ed2539a03 100644
+index ae36af422f..ed2539a03b 100644
--- a/src/import/org.freedesktop.import1.conf
+++ b/src/import/org.freedesktop.import1.conf
@@ -52,10 +52,6 @@
@@ -1313,7 +1313,7 @@ index ae36af422..ed2539a03 100644
send_interface="org.freedesktop.import1.Transfer"
send_member="Cancel"/>
diff --git a/src/import/pull.c b/src/import/pull.c
-index ee3ff6803..9cb10880f 100644
+index ee3ff68036..9cb10880fa 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -28,13 +28,11 @@
@@ -1492,7 +1492,7 @@ index ee3ff6803..9cb10880f 100644
};
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index ef1214a66..cfd3162fb 100644
+index ef1214a666..cfd3162fb7 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -77,7 +77,6 @@ static unsigned arg_lines = 10;
@@ -1642,7 +1642,7 @@ index ef1214a66..cfd3162fb 100644
{ "cancel-transfer", 2, VERB_ANY, 0, cancel_transfer },
{}
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
-index 660d92ac5..c0aba30a9 100644
+index 660d92ac5d..c0aba30a98 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -149,34 +149,3 @@ int raw_strip_suffixes(const char *p, char **ret) {
@@ -1681,7 +1681,7 @@ index 660d92ac5..c0aba30a9 100644
- return true;
-}
diff --git a/src/shared/import-util.h b/src/shared/import-util.h
-index ff155b0ff..22773c58e 100644
+index ff155b0ff2..22773c58e9 100644
--- a/src/shared/import-util.h
+++ b/src/shared/import-util.h
@@ -41,7 +41,3 @@ ImportVerify import_verify_from_string(const char *s) _pure_;
diff --git a/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch b/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch
index 3d13383..3e135f2 100644
--- a/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch
+++ b/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch
@@ -14,7 +14,7 @@ Resolves: #1284974
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/import/import-common.c b/src/import/import-common.c
-index 2acf380f9..f10a453ee 100644
+index 2acf380f99..f10a453eed 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -281,8 +281,9 @@ int import_verify(
diff --git a/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch b/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch
index f4e3c71..ef5b900 100644
--- a/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch
+++ b/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch
@@ -24,7 +24,7 @@ Resolves: #1307080
5 files changed, 74 insertions(+), 55 deletions(-)
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index cfd3162fb..1a58aeaf1 100644
+index cfd3162fb7..1a58aeaf11 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1427,7 +1427,7 @@ static int login_machine(int argc, char *argv[], void *userdata) {
@@ -37,7 +37,7 @@ index cfd3162fb..1a58aeaf1 100644
return log_error_errno(r, "Failed to create PTY forwarder: %m");
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 78bd58483..a37b64094 100644
+index 78bd584834..a37b64094b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3581,6 +3581,7 @@ int main(int argc, char *argv[]) {
@@ -138,7 +138,7 @@ index 78bd58483..a37b64094 100644
log_error_errno(r, "Failed to create PTY forwarder: %m");
goto finish;
diff --git a/src/run/run.c b/src/run/run.c
-index dd1338f3b..468034284 100644
+index dd1338f3b4..4680342846 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -780,7 +780,7 @@ static int start_transient_service(
@@ -151,7 +151,7 @@ index dd1338f3b..468034284 100644
return log_error_errno(r, "Failed to create PTY forwarder: %m");
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
-index 88b3f4e3c..4402af123 100644
+index 88b3f4e3c4..4402af123f 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -42,6 +42,8 @@ struct PTYForward {
@@ -279,7 +279,7 @@ index 88b3f4e3c..4402af123 100644
if (r < 0)
return r;
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
-index d3e229bd7..6208a543d 100644
+index d3e229bd70..6208a543db 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -30,7 +30,7 @@
diff --git a/SOURCES/0327-mount-remove-obsolete-n.patch b/SOURCES/0327-mount-remove-obsolete-n.patch
index 829dbc6..946ef1f 100644
--- a/SOURCES/0327-mount-remove-obsolete-n.patch
+++ b/SOURCES/0327-mount-remove-obsolete-n.patch
@@ -23,7 +23,7 @@ Resolves: #1339721
1 file changed, 6 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 23f63ce32..fe967bc03 100644
+index 23f63ce32c..fe967bc039 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -881,8 +881,6 @@ static void mount_enter_unmounting(Mount *m) {
diff --git a/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch b/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch
index d00d16d..d7b593e 100644
--- a/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch
+++ b/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch
@@ -40,7 +40,7 @@ Resolves: #1280014
6 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
-index 8b5ea2566..7ce5d5772 100644
+index 8b5ea2566d..7ce5d57726 100644
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -84,7 +84,7 @@ int bus_job_method_cancel(sd_bus *bus, sd_bus_message *message, void *userdata,
@@ -53,7 +53,7 @@ index 8b5ea2566..7ce5d5772 100644
return sd_bus_reply_method_return(message, NULL);
}
diff --git a/src/core/job.c b/src/core/job.c
-index 7416386a1..c2876dec1 100644
+index 7416386a18..c2876dec18 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -190,7 +190,7 @@ Job* job_install(Job *j) {
@@ -157,7 +157,7 @@ index 7416386a1..c2876dec1 100644
failure_action(u->manager, u->job_timeout_action, u->job_timeout_reboot_arg);
diff --git a/src/core/job.h b/src/core/job.h
-index d967b68a3..e4191ee77 100644
+index d967b68a3f..e4191ee775 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -220,7 +220,7 @@ void job_add_to_dbus_queue(Job *j);
@@ -170,7 +170,7 @@ index d967b68a3..e4191ee77 100644
char *job_dbus_path(Job *j);
diff --git a/src/core/manager.c b/src/core/manager.c
-index a1504bf17..ee456fb79 100644
+index a1504bf17b..ee456fb790 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1426,7 +1426,7 @@ void manager_clear_jobs(Manager *m) {
@@ -183,7 +183,7 @@ index a1504bf17..ee456fb79 100644
static int manager_dispatch_run_queue(sd_event_source *source, void *userdata) {
diff --git a/src/core/transaction.c b/src/core/transaction.c
-index b0b3d6bd6..aed64fa41 100644
+index b0b3d6bd60..aed64fa419 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -592,7 +592,7 @@ static int transaction_apply(Transaction *tr, Manager *m, JobMode mode) {
@@ -196,7 +196,7 @@ index b0b3d6bd6..aed64fa41 100644
}
diff --git a/src/core/unit.c b/src/core/unit.c
-index db5aa987e..d6ead7d67 100644
+index db5aa987ec..d6ead7d672 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1851,12 +1851,12 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
diff --git a/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch b/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch
index 8deb821..a8530b4 100644
--- a/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch
+++ b/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch
@@ -49,7 +49,7 @@ Resolves: #1305608
6 files changed, 198 insertions(+), 62 deletions(-)
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
-index 529e84303..2fe65830e 100644
+index 529e843030..2fe65830e7 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,5 +1,3 @@
@@ -126,7 +126,7 @@ index 529e84303..2fe65830e 100644
}
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 10fdcc998..b7f08fb42 100644
+index 10fdcc9984..b7f08fb420 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1028,6 +1028,8 @@ int manager_notify_cgroup_empty(Manager *m, const char *cgroup) {
@@ -139,7 +139,7 @@ index 10fdcc998..b7f08fb42 100644
if (u) {
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
diff --git a/src/core/dbus.c b/src/core/dbus.c
-index 85b517486..29524d49a 100644
+index 85b5174868..29524d49a3 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -72,12 +72,37 @@ int bus_send_queued_message(Manager *m) {
@@ -225,7 +225,7 @@ index 85b517486..29524d49a 100644
if (r < 0)
return 0;
diff --git a/src/core/dbus.h b/src/core/dbus.h
-index d04f5326c..c27d136e3 100644
+index d04f5326c6..c27d136e30 100644
--- a/src/core/dbus.h
+++ b/src/core/dbus.h
@@ -40,3 +40,5 @@ int bus_verify_manage_unit_async(Manager *m, sd_bus_message *call, sd_bus_error
@@ -235,7 +235,7 @@ index d04f5326c..c27d136e3 100644
+
+int bus_forward_agent_released(Manager *m, const char *path);
diff --git a/src/core/manager.c b/src/core/manager.c
-index ee456fb79..370c8cbbe 100644
+index ee456fb790..370c8cbbed 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -83,8 +83,10 @@
@@ -474,7 +474,7 @@ index ee456fb79..370c8cbbe 100644
q = manager_coldplug(m);
if (q < 0 && r >= 0)
diff --git a/src/core/manager.h b/src/core/manager.h
-index d3971f168..3e855db46 100644
+index d3971f1684..3e855db466 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -137,6 +137,9 @@ struct Manager {
diff --git a/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch b/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch
index c79ed3f..4bd4cb8 100644
--- a/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch
+++ b/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch
@@ -17,7 +17,7 @@ Resolves: #1305608
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
-index 84fee0e77..bf96898f2 100644
+index 84fee0e773..bf96898f2d 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -303,7 +303,7 @@ int inhibitor_create_fifo(Inhibitor *i) {
@@ -30,7 +30,7 @@ index 84fee0e77..bf96898f2 100644
return r;
}
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index dc24539f1..59f5a7ad5 100644
+index dc24539f12..59f5a7ad5d 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -905,7 +905,9 @@ int session_create_fifo(Session *s) {
@@ -45,7 +45,7 @@ index dc24539f1..59f5a7ad5 100644
return r;
}
diff --git a/src/login/logind.c b/src/login/logind.c
-index 3afbf34a1..e8d0669bb 100644
+index 3afbf34a13..e8d0669bbf 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -685,7 +685,7 @@ static int manager_connect_bus(Manager *m) {
diff --git a/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch b/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch
index c279427..d605608 100644
--- a/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch
+++ b/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch
@@ -12,7 +12,7 @@ Resolves: #1337922
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 3a918361b..9d70798cd 100644
+index 3a918361b5..9d70798cda 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1388,7 +1388,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
diff --git a/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch b/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch
index d7f683f..4353b0b 100644
--- a/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch
+++ b/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch
@@ -18,7 +18,7 @@ Resolves: #1330593
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
-index 276591f31..9276bbdeb 100644
+index 276591f31b..9276bbdebc 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -584,7 +584,9 @@ sd_rtnl_message *sd_rtnl_message_ref(sd_rtnl_message *m) {
diff --git a/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch b/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch
index 5a46ab4..820d02e 100644
--- a/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch
+++ b/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch
@@ -16,7 +16,7 @@ Resolves: #1341154
7 files changed, 107 insertions(+), 28 deletions(-)
diff --git a/TODO b/TODO
-index d96d2bf0e..498d82c21 100644
+index d96d2bf0ee..498d82c212 100644
--- a/TODO
+++ b/TODO
@@ -185,8 +185,6 @@ Features:
@@ -29,7 +29,7 @@ index d96d2bf0e..498d82c21 100644
* in systemctl list-unit-files: show the install value the presets would suggest for a service in a third column
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 2f541937f..350a95648 100644
+index 2f541937f8..350a95648a 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -357,7 +357,12 @@
@@ -47,7 +47,7 @@ index 2f541937f..350a95648 100644
<varlistentry>
diff --git a/src/core/service.c b/src/core/service.c
-index ae5e61000..c76713b1c 100644
+index ae5e610008..c76713b1ce 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1094,7 +1094,7 @@ static int service_spawn(
@@ -107,7 +107,7 @@ index ae5e61000..c76713b1c 100644
if (!final_env) {
r = -ENOMEM;
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
-index d08e1b5a0..a14b6de19 100644
+index d08e1b5a05..a14b6de19f 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -49,7 +49,7 @@ static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrin
@@ -120,7 +120,7 @@ index d08e1b5a0..a14b6de19 100644
}
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index 407d0afee..a21251014 100644
+index 407d0afee3..a212510146 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -302,7 +302,7 @@ int socket_address_print(const SocketAddress *a, char **ret) {
@@ -252,7 +252,7 @@ index 407d0afee..a21251014 100644
return log_error_errno(r, "sockadd_pretty() failed: %m");
diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
-index 07d0aff72..6bfb677fb 100644
+index 07d0aff72b..6bfb677fb5 100644
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -98,7 +98,9 @@ const char* socket_address_get_path(const SocketAddress *a);
@@ -267,7 +267,7 @@ index 07d0aff72..6bfb677fb 100644
int getsockname_pretty(int fd, char **ret);
diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h
-index 243b44a0e..18c44445e 100644
+index 243b44a0eb..18c44445e1 100644
--- a/src/timesync/timesyncd-server.h
+++ b/src/timesync/timesyncd-server.h
@@ -59,7 +59,7 @@ struct ServerName {
diff --git a/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch b/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch
index 8b31c8e..431c0a7 100644
--- a/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch
+++ b/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch
@@ -16,7 +16,7 @@ Resolves: #1343904
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 227915efc..49770bfda 100644
+index 227915efc2..49770bfda1 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -930,10 +930,14 @@ static int bus_unit_set_transient_property(
diff --git a/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch b/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch
index bc4def1..0c0a85f 100644
--- a/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch
+++ b/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch
@@ -11,7 +11,7 @@ Resolves: #1343904
1 file changed, 4 insertions(+)
diff --git a/src/run/run.c b/src/run/run.c
-index 468034284..bbb542b65 100644
+index 4680342846..bbb542b65b 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -595,6 +595,10 @@ static int transient_scope_set_properties(sd_bus_message *m) {
diff --git a/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch b/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch
index 6db74bf..8cd8ca6 100644
--- a/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch
+++ b/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch
@@ -11,7 +11,7 @@ Resolves: #1330973
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
-index a939bb267..e197cc752 100644
+index a939bb267c..e197cc752d 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -33,6 +33,7 @@
@@ -39,7 +39,7 @@ index a939bb267..e197cc752 100644
canonical = hn;
additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL;
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index a21251014..79d1582d4 100644
+index a212510146..79d1582d49 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -435,6 +435,16 @@ bool socket_ipv6_is_supported(void) {
diff --git a/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch b/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch
index a7109d7..41032b8 100644
--- a/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch
+++ b/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch
@@ -22,7 +22,7 @@ Resolves: #1314559
3 files changed, 68 deletions(-)
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
-index 3ca48a725..6cf33f7cf 100644
+index 3ca48a7257..6cf33f7cfe 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -253,70 +253,6 @@ ReadaheadShared *shared_get(void) {
@@ -97,7 +97,7 @@ index 3ca48a725..6cf33f7cf 100644
struct stat st;
char *ap = NULL, *line = NULL;
diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h
-index b34f3aadd..cc2ea81a9 100644
+index b34f3aadd7..cc2ea81a9d 100644
--- a/src/readahead/readahead-common.h
+++ b/src/readahead/readahead-common.h
@@ -51,8 +51,6 @@ typedef struct ReadaheadShared {
@@ -110,7 +110,7 @@ index b34f3aadd..cc2ea81a9 100644
int block_set_readahead(const char *p, uint64_t bytes);
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
-index f81e0fe55..c2e281687 100644
+index f81e0fe55d..c2e281687a 100644
--- a/src/readahead/readahead-replay.c
+++ b/src/readahead/readahead-replay.c
@@ -134,8 +134,6 @@ static int replay(const char *root) {
diff --git a/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch b/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch
index ccb64bb..a427ada 100644
--- a/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch
+++ b/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch
@@ -20,7 +20,7 @@ Resolves: #1344556
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 370c8cbbe..e5226a8a6 100644
+index 370c8cbbed..e5226a8a6f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -838,6 +838,19 @@ enum {
diff --git a/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch b/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch
index f83afea..3905df4 100644
--- a/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch
+++ b/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch
@@ -18,7 +18,7 @@ Resolves: #1343648
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index b0a34b212..3848338a2 100644
+index b0a34b212d..3848338a23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3752,6 +3752,7 @@ systemd_hwdb_SOURCES = \
@@ -30,7 +30,7 @@ index b0a34b212..3848338a2 100644
libsystemd-internal.la \
libudev-internal.la
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
-index 4539673ea..8e5d6cc86 100644
+index 4539673ead..8e5d6cc869 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -34,6 +34,8 @@
diff --git a/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch b/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch
index 05e841b..dddfd5b 100644
--- a/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch
+++ b/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch
@@ -13,7 +13,7 @@ Related: #1350756
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
-index d65e40c01..201e2a0cd 100644
+index d65e40c011..201e2a0cd2 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -26,6 +26,8 @@
@@ -41,7 +41,7 @@ index d65e40c01..201e2a0cd 100644
if (test) {
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
-index 56cd0cd4e..d05a26e78 100644
+index 56cd0cd4ec..d05a26e788 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch b/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch
index ea4d7d0..c6a9a21 100644
--- a/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch
+++ b/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch
@@ -68,7 +68,7 @@ Resolves: #1047466
1 file changed, 2 insertions(+)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 95ddf3be7..6079d60db 100644
+index 95ddf3be76..6079d60dbf 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4295,6 +4295,8 @@ static int show_one(
diff --git a/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch b/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch
index 2032b88..6317bab 100644
--- a/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch
+++ b/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch
@@ -14,7 +14,7 @@ Related: #1047466
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 6079d60db..fdda174ae 100644
+index 6079d60dbf..fdda174ae7 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -75,6 +75,25 @@
diff --git a/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch b/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch
index 908a47d..f6244ca 100644
--- a/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch
+++ b/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch
@@ -30,7 +30,7 @@ Related: #1047466
1 file changed, 68 insertions(+), 38 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index fdda174ae..93b7a193b 100644
+index fdda174ae7..93b7a193b2 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4211,12 +4211,19 @@ static int show_one(
diff --git a/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch b/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch
index 6d8731a..aeed03c 100644
--- a/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch
+++ b/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch
@@ -13,7 +13,7 @@ Related: #1350232
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index b03335ef3..983217c1b 100644
+index b03335ef31..983217c1bc 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -69,6 +69,16 @@ static void draw_progress(uint64_t p, usec_t *last_usec) {
diff --git a/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch b/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch
index 01589d8..c1a8be7 100644
--- a/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch
+++ b/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch
@@ -27,7 +27,7 @@ Related: #1350232
3 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 892fe4734..ef1849787 100644
+index 892fe47340..ef18497879 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -656,13 +656,16 @@ static int journal_file_setup_field_hash_table(JournalFile *f) {
@@ -118,7 +118,7 @@ index 892fe4734..ef1849787 100644
r = -EIO;
goto fail;
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 0f29b092b..c74ad5fc5 100644
+index 0f29b092b7..c74ad5fc58 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -234,3 +234,6 @@ static inline bool JOURNAL_FILE_COMPRESS(JournalFile *f) {
@@ -129,7 +129,7 @@ index 0f29b092b..c74ad5fc5 100644
+int journal_file_map_data_hash_table(JournalFile *f);
+int journal_file_map_field_hash_table(JournalFile *f);
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 983217c1b..d2d5c400c 100644
+index 983217c1bc..d2d5c400c1 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -590,6 +590,13 @@ static int verify_hash_table(
diff --git a/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch b/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch
index e2ab347..1178cca 100644
--- a/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch
+++ b/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch
@@ -13,7 +13,7 @@ Resolves: #1350232
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index d2d5c400c..53f0550da 100644
+index d2d5c400c1..53f0550daf 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -885,7 +885,11 @@ int journal_file_verify(
diff --git a/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch b/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch
index 8d17eb9..3c3b0e9 100644
--- a/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch
+++ b/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch
@@ -14,7 +14,7 @@ Related: #1350232
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 53f0550da..77fb4090d 100644
+index 53f0550daf..77fb4090da 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -123,8 +123,10 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
diff --git a/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch b/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch
index ea9dbfa..ab911fc 100644
--- a/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch
+++ b/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch
@@ -13,7 +13,7 @@ Related: #1350232
1 file changed, 6 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 6948ed689..904aae99e 100644
+index 6948ed689d..904aae99ed 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2141,6 +2141,12 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch b/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch
index 5633de1..51e439e 100644
--- a/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch
+++ b/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch
@@ -14,7 +14,7 @@ Related: #1350232
1 file changed, 75 insertions(+), 87 deletions(-)
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 77fb4090d..8a66ac7f0 100644
+index 77fb4090da..8a66ac7f08 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -135,15 +135,15 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
diff --git a/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch b/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch
index 40f3408..3c4bd2a 100644
--- a/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch
+++ b/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch
@@ -28,7 +28,7 @@ Related: #1350232
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 904aae99e..2688d8b2e 100644
+index 904aae99ed..2688d8b2e9 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2142,8 +2142,12 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch b/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch
index 2ecd6fe..a0bce7c 100644
--- a/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch
+++ b/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch
@@ -10,7 +10,7 @@ Related: #1350232
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 2688d8b2e..a38ce4b8f 100644
+index 2688d8b2e9..a38ce4b8fd 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2145,7 +2145,8 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch b/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch
index 92d3be4..4a5247f 100644
--- a/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch
+++ b/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch
@@ -20,7 +20,7 @@ Related: #1342173
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index 1f1e6fe91..9d48e5a49 100644
+index 1f1e6fe917..9d48e5a490 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -76,8 +76,8 @@ struct sd_event_source {
@@ -56,7 +56,7 @@ index 1f1e6fe91..9d48e5a49 100644
+ return 0;
+}
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
-index 25a10f99a..4957f3a32 100644
+index 25a10f99ab..4957f3a327 100644
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -101,6 +101,7 @@ int sd_event_get_tid(sd_event *e, pid_t *tid);
diff --git a/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch b/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch
index 745316b..3a2e15a 100644
--- a/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch
+++ b/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch
@@ -27,7 +27,7 @@ Resolves: #1342173
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index e5226a8a6..63693b93a 100644
+index e5226a8a6f..63693b93a6 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1747,14 +1747,25 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
@@ -58,7 +58,7 @@ index e5226a8a6..63693b93a 100644
static int manager_dispatch_sigchld(Manager *m) {
diff --git a/src/core/unit.c b/src/core/unit.c
-index d6ead7d67..d62135d87 100644
+index d6ead7d672..d62135d878 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -94,6 +94,7 @@ Unit *unit_new(Manager *m, size_t size) {
@@ -70,7 +70,7 @@ index d6ead7d67..d62135d87 100644
return u;
}
diff --git a/src/core/unit.h b/src/core/unit.h
-index 0eebc0b89..d93645777 100644
+index 0eebc0b891..d936457776 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -167,6 +167,9 @@ struct Unit {
diff --git a/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch b/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch
index a207f77..e59f64f 100644
--- a/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch
+++ b/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch
@@ -13,7 +13,7 @@ Related: #1342173
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 63693b93a..d168777d2 100644
+index 63693b93a6..d168777d26 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1764,7 +1764,8 @@ static void invoke_sigchld_event(Manager *m, Unit *u, siginfo_t *si) {
diff --git a/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch b/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch
index 39bd70f..f6ca6b0 100644
--- a/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch
+++ b/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch
@@ -30,7 +30,7 @@ Related: #1351415
6 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index ca25c93a1..b7d9cdee0 100644
+index ca25c93a1f..b7d9cdee05 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -327,8 +327,10 @@
@@ -47,7 +47,7 @@ index ca25c93a1..b7d9cdee0 100644
defaults for units, they are not applied to PID 1
itself.</para></listitem>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 6af7c7ae5..25aea1655 100644
+index 6af7c7ae5d..25aea16553 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -559,7 +559,9 @@
@@ -62,7 +62,7 @@ index 6af7c7ae5..25aea1655 100644
<table>
<title>Limit directives and their equivalent with ulimit</title>
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 85d979751..c3461a0a6 100644
+index 85d9797514..c3461a0a69 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -59,18 +59,18 @@ $1.SystemCallArchitectures, config_parse_warn_compat, DISABLED_CO
@@ -93,7 +93,7 @@ index 85d979751..c3461a0a6 100644
$1.LimitRTPRIO, config_parse_limit, RLIMIT_RTPRIO, offsetof($1, exec_context.rlimit)
$1.LimitRTTIME, config_parse_limit, RLIMIT_RTTIME, offsetof($1, exec_context.rlimit)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index b188ec99d..dbb45b20f 100644
+index b188ec99d9..dbb45b20f3 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1119,6 +1119,49 @@ int config_parse_limit(const char *unit,
@@ -147,7 +147,7 @@ index b188ec99d..dbb45b20f 100644
int config_parse_sysv_priority(const char *unit,
const char *filename,
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index ce10d03c3..2d509d0cb 100644
+index ce10d03c3f..2d509d0cb4 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -56,6 +56,7 @@ int config_parse_exec_capabilities(const char *unit, const char *filename, unsig
@@ -159,7 +159,7 @@ index ce10d03c3..2d509d0cb 100644
int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/core/main.c b/src/core/main.c
-index 2aec40b0b..60ea36c3c 100644
+index 2aec40b0bb..60ea36c3cb 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -655,18 +655,18 @@ static int parse_config_file(void) {
diff --git a/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch b/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch
index 20d1c93..6386ae8 100644
--- a/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch
+++ b/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch
@@ -22,7 +22,7 @@ Related: #1351415
5 files changed, 231 insertions(+), 23 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 25aea1655..cfdcc3d17 100644
+index 25aea16553..cfdcc3d173 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -559,90 +559,133 @@
@@ -189,7 +189,7 @@ index 25aea1655..cfdcc3d17 100644
<citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry project='man-pages'><refentrytitle>exec</refentrytitle><manvolnum>3</manvolnum></citerefentry>
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index c3461a0a6..ce1397c7e 100644
+index c3461a0a69..ce1397c7e8 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -58,7 +58,7 @@ $1.RestrictAddressFamilies, config_parse_address_families, 0,
@@ -211,7 +211,7 @@ index c3461a0a6..ce1397c7e 100644
$1.ReadOnlyDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.read_only_dirs)
$1.InaccessibleDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.inaccessible_dirs)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index dbb45b20f..8afe9d7e8 100644
+index dbb45b20f3..8afe9d7e83 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1162,6 +1162,107 @@ int config_parse_bytes_limit(const char *unit,
@@ -323,7 +323,7 @@ index dbb45b20f..8afe9d7e8 100644
int config_parse_sysv_priority(const char *unit,
const char *filename,
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 2d509d0cb..359794d0a 100644
+index 2d509d0cb4..359794d0ac 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -57,6 +57,8 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign
@@ -336,7 +336,7 @@ index 2d509d0cb..359794d0a 100644
int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 550098332..d15173796 100644
+index 5500983322..d151737960 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -545,6 +545,66 @@ static void test_install_printf(void) {
diff --git a/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch b/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch
index c1a6131..428b35d 100644
--- a/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch
+++ b/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch
@@ -22,7 +22,7 @@ Related: #1351415
5 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
-index 2fde3e107..abbf0261e 100644
+index 2fde3e107e..abbf0261e7 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -556,7 +556,7 @@ static int parse_date(const char **p, CalendarSpec *c) {
@@ -44,7 +44,7 @@ index 2fde3e107..abbf0261e 100644
goto fail;
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index 1c36c577c..c001f52de 100644
+index 1c36c577c4..c001f52def 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -613,7 +613,8 @@ finish:
@@ -129,7 +129,7 @@ index 1c36c577c..c001f52de 100644
static const struct {
const char *suffix;
diff --git a/src/shared/time-util.h b/src/shared/time-util.h
-index fca8a4db9..f2789142f 100644
+index fca8a4db9b..f2789142fe 100644
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -99,6 +99,7 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
@@ -141,7 +141,7 @@ index fca8a4db9..f2789142f 100644
bool ntp_synced(void);
diff --git a/src/test/test-time.c b/src/test/test-time.c
-index 3840fff06..820e4aaee 100644
+index 3840fff061..820e4aaee2 100644
--- a/src/test/test-time.c
+++ b/src/test/test-time.c
@@ -57,6 +57,28 @@ static void test_parse_sec(void) {
@@ -182,7 +182,7 @@ index 3840fff06..820e4aaee 100644
test_format_timespan(1);
test_format_timespan(USEC_PER_MSEC);
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index d15173796..87c81ccd7 100644
+index d151737960..87c81ccd71 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -559,7 +559,7 @@ static void test_config_parse_rlimit(void) {
diff --git a/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch b/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch
index 3fc416d..731d213 100644
--- a/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch
+++ b/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch
@@ -32,7 +32,7 @@ Resolves: #1351415
6 files changed, 667 insertions(+), 120 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index b7d9cdee0..39d19bc71 100644
+index b7d9cdee05..39d19bc71a 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -326,13 +326,26 @@
@@ -70,7 +70,7 @@ index b7d9cdee0..39d19bc71 100644
</varlistentry>
</variablelist>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index cfdcc3d17..0cd469cd9 100644
+index cfdcc3d173..0cd469cd98 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -558,7 +558,10 @@
@@ -86,7 +86,7 @@ index cfdcc3d17..0cd469cd9 100644
suffixes K (=1024), M (=1024*1024) and so on for G, T, P and E
may be used for resource limits measured in bytes
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 8afe9d7e8..d307f1c74 100644
+index 8afe9d7e83..d307f1c743 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1075,81 +1075,108 @@ int config_parse_bounding_set(const char *unit,
@@ -406,7 +406,7 @@ index 8afe9d7e8..d307f1c74 100644
int config_parse_sysv_priority(const char *unit,
const char *filename,
diff --git a/src/shared/util.c b/src/shared/util.c
-index 036677eb4..f75ed9dd4 100644
+index 036677eb46..f75ed9dd42 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -93,6 +93,7 @@
@@ -902,7 +902,7 @@ index 036677eb4..f75ed9dd4 100644
+ return c;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index a441e44ff..be04524cc 100644
+index a441e44ff9..be04524cc9 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -315,6 +315,7 @@ int undecchar(char c) _const_;
@@ -931,7 +931,7 @@ index a441e44ff..be04524cc 100644
+int extract_first_word_and_warn(const char **p, char **ret, const char *separators, ExtractFlags flags, const char *unit, const char *filename, unsigned line, const char *rvalue);
+int extract_many_words(const char **p, const char *separators, ExtractFlags flags, ...) _sentinel_;
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 87c81ccd7..931dfeda8 100644
+index 87c81ccd71..931dfeda88 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -554,11 +554,22 @@ static void test_config_parse_rlimit(void) {
diff --git a/SOURCES/0359-core-fix-rlimit-parsing.patch b/SOURCES/0359-core-fix-rlimit-parsing.patch
index ddcb86a..fc02e7d 100644
--- a/SOURCES/0359-core-fix-rlimit-parsing.patch
+++ b/SOURCES/0359-core-fix-rlimit-parsing.patch
@@ -16,7 +16,7 @@ Related: #1351415
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index d307f1c74..2f6209e05 100644
+index d307f1c743..2f6209e053 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1160,6 +1160,7 @@ static int parse_rlimit_range(
@@ -41,7 +41,7 @@ index d307f1c74..2f6209e05 100644
if (!*rl) {
*rl = new(struct rlimit, 1);
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 931dfeda8..8acf071ff 100644
+index 931dfeda88..8acf071ff3 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -570,6 +570,27 @@ static void test_config_parse_rlimit(void) {
diff --git a/SOURCES/0360-core-dump-rlim_cur-too.patch b/SOURCES/0360-core-dump-rlim_cur-too.patch
index 8b66922..585fd75 100644
--- a/SOURCES/0360-core-dump-rlim_cur-too.patch
+++ b/SOURCES/0360-core-dump-rlim_cur-too.patch
@@ -10,7 +10,7 @@ Related: #1351415
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 8172c8b44..e9b4359a7 100644
+index 8172c8b442..e9b4359a7f 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2254,8 +2254,8 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
diff --git a/SOURCES/0361-install-fix-disable-via-unit-file-path.patch b/SOURCES/0361-install-fix-disable-via-unit-file-path.patch
index aa428cc..1e83906 100644
--- a/SOURCES/0361-install-fix-disable-via-unit-file-path.patch
+++ b/SOURCES/0361-install-fix-disable-via-unit-file-path.patch
@@ -18,7 +18,7 @@ Resolves: #1348208
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 5288bb450..f190dbfab 100644
+index 5288bb4501..f190dbfab2 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1910,10 +1910,12 @@ int unit_file_disable(
diff --git a/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch b/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch
index d8319fe..3583579 100644
--- a/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch
+++ b/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch
@@ -26,7 +26,7 @@ Resolves: #1342173
8 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/src/core/busname.c b/src/core/busname.c
-index 43d7607a3..f626ba96d 100644
+index 43d7607a30..f626ba96d0 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -997,6 +997,14 @@ static const char* const busname_state_table[_BUSNAME_STATE_MAX] = {
@@ -54,7 +54,7 @@ index 43d7607a3..f626ba96d 100644
.bus_vtable = bus_busname_vtable,
diff --git a/src/core/manager.c b/src/core/manager.c
-index d168777d2..5da836593 100644
+index d168777d26..5da8365938 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1760,7 +1760,10 @@ static void invoke_sigchld_event(Manager *m, Unit *u, siginfo_t *si) {
@@ -70,7 +70,7 @@ index d168777d2..5da836593 100644
u->sigchldgen = iteration;
} else
diff --git a/src/core/mount.c b/src/core/mount.c
-index fe967bc03..3fbdb7daf 100644
+index fe967bc039..3fbdb7dafb 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1877,6 +1877,14 @@ static const char* const mount_state_table[_MOUNT_STATE_MAX] = {
@@ -98,7 +98,7 @@ index fe967bc03..3fbdb7daf 100644
.bus_vtable = bus_mount_vtable,
.bus_set_property = bus_mount_set_property,
diff --git a/src/core/service.c b/src/core/service.c
-index c76713b1c..babd3c52a 100644
+index c76713b1ce..babd3c52ae 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3068,6 +3068,22 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = {
@@ -135,7 +135,7 @@ index c76713b1c..babd3c52a 100644
.bus_interface = "org.freedesktop.systemd1.Service",
diff --git a/src/core/socket.c b/src/core/socket.c
-index bc677a20f..771af0d24 100644
+index bc677a20f8..771af0d241 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2648,6 +2648,14 @@ static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
@@ -163,7 +163,7 @@ index bc677a20f..771af0d24 100644
.bus_vtable = bus_socket_vtable,
.bus_set_property = bus_socket_set_property,
diff --git a/src/core/swap.c b/src/core/swap.c
-index 34a2c406d..42f995990 100644
+index 34a2c406d8..42f995990c 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1426,6 +1426,14 @@ static const char* const swap_state_table[_SWAP_STATE_MAX] = {
@@ -191,7 +191,7 @@ index 34a2c406d..42f995990 100644
.bus_vtable = bus_swap_vtable,
.bus_set_property = bus_swap_set_property,
diff --git a/src/core/unit.c b/src/core/unit.c
-index d62135d87..0e90d130a 100644
+index d62135d878..0e90d130a4 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3674,6 +3674,24 @@ int unit_setup_exec_runtime(Unit *u) {
@@ -220,7 +220,7 @@ index d62135d87..0e90d130a 100644
[UNIT_ACTIVE] = "active",
[UNIT_RELOADING] = "reloading",
diff --git a/src/core/unit.h b/src/core/unit.h
-index d93645777..35287a5b7 100644
+index d936457776..35287a5b75 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -399,6 +399,12 @@ struct UnitVTable {
diff --git a/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch b/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch
index 0719975..5a09676 100644
--- a/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch
+++ b/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch
@@ -25,7 +25,7 @@ Resolves: #1267707
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
-index cc88ecd0d..b7079e4a7 100644
+index cc88ecd0db..b7079e4a7c 100644
--- a/units/systemd-hostnamed.service.in
+++ b/units/systemd-hostnamed.service.in
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
@@ -38,7 +38,7 @@ index cc88ecd0d..b7079e4a7 100644
PrivateDevices=yes
PrivateNetwork=yes
diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
-index 5534a49ed..60e8e9c85 100644
+index 5534a49ede..60e8e9c85f 100644
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -14,7 +14,7 @@ ExecStart=@rootlibexecdir@/systemd-importd
@@ -51,7 +51,7 @@ index 5534a49ed..60e8e9c85 100644
ProtectSystem=full
ProtectHome=yes
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 9d4462283..8575912bb 100644
+index 9d44622837..8575912bbd 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -22,7 +22,7 @@ RestartSec=0
@@ -64,7 +64,7 @@ index 9d4462283..8575912bb 100644
# Increase the default a bit in order to allow many simultaneous
# services being run since we keep one fd open per service. Also, when
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
-index bfa097844..9b13f901a 100644
+index bfa097844f..9b13f901a3 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
@@ -77,7 +77,7 @@ index bfa097844..9b13f901a 100644
PrivateDevices=yes
PrivateNetwork=yes
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
-index f087e99ce..ff049134e 100644
+index f087e99ce2..ff049134ee 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -24,7 +24,7 @@ Restart=always
@@ -90,7 +90,7 @@ index f087e99ce..ff049134e 100644
# Increase the default a bit in order to allow many simultaneous
# logins since we keep one fd open per session.
diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
-index 15f34d9db..35cde9869 100644
+index 15f34d9db7..35cde98698 100644
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -16,7 +16,7 @@ After=machine.slice
@@ -103,7 +103,7 @@ index 15f34d9db..35cde9869 100644
PrivateDevices=yes
PrivateNetwork=yes
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
-index 5a91b8e49..d3808c430 100644
+index 5a91b8e499..d3808c430d 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-networkd
@@ -116,7 +116,7 @@ index 5a91b8e49..d3808c430 100644
[Install]
WantedBy=multi-user.target
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
-index 98ae564af..46864e6a3 100644
+index 98ae564af6..46864e6a33 100644
--- a/units/systemd-resolved.service.m4.in
+++ b/units/systemd-resolved.service.m4.in
@@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved
@@ -129,7 +129,7 @@ index 98ae564af..46864e6a3 100644
[Install]
WantedBy=multi-user.target
diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in
-index fe5ccb460..0c9599db2 100644
+index fe5ccb4601..0c9599db20 100644
--- a/units/systemd-timedated.service.in
+++ b/units/systemd-timedated.service.in
@@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
@@ -142,7 +142,7 @@ index fe5ccb460..0c9599db2 100644
ProtectSystem=yes
ProtectHome=yes
diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in
-index 39edafc8d..c7d1d2b4f 100644
+index 39edafc8d2..c7d1d2b4fd 100644
--- a/units/systemd-timesyncd.service.in
+++ b/units/systemd-timesyncd.service.in
@@ -27,7 +27,7 @@ PrivateTmp=yes
diff --git a/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch b/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch
index 6f8e005..1e34a69 100644
--- a/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch
+++ b/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch
@@ -14,7 +14,7 @@ Related: #1267707
2 files changed, 39 insertions(+)
diff --git a/src/core/main.c b/src/core/main.c
-index 60ea36c3c..c9d8ce4a4 100644
+index 60ea36c3cb..c9d8ce4a40 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1198,6 +1198,7 @@ static int status_welcome(void) {
@@ -75,7 +75,7 @@ index 60ea36c3c..c9d8ce4a4 100644
test_mtab();
test_usr();
diff --git a/src/shared/def.h b/src/shared/def.h
-index a3d9fcf38..76daf012d 100644
+index a3d9fcf388..76daf012d7 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -35,6 +35,9 @@
diff --git a/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch b/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch
index f983da9..19f828b 100644
--- a/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch
+++ b/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch
@@ -26,7 +26,7 @@ Related: #1267707
1 file changed, 78 insertions(+), 80 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 5da836593..c5021993e 100644
+index 5da8365938..c5021993e5 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1635,9 +1635,33 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, char *
diff --git a/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch b/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch
index b33f4c9..97a85aa 100644
--- a/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch
+++ b/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch
@@ -14,7 +14,7 @@ Resolves: #1361049
create mode 100644 test/exec-personality-ppc64.service
diff --git a/src/shared/util.c b/src/shared/util.c
-index f75ed9dd4..303026152 100644
+index f75ed9dd42..3030261524 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -6986,6 +6986,22 @@ unsigned long personality_from_string(const char *p) {
@@ -41,7 +41,7 @@ index f75ed9dd4..303026152 100644
/* personality(7) documents that 0xffffffffUL is used for
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 38522a168..5a02960e7 100644
+index 38522a168d..5a02960e76 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -83,6 +83,12 @@ static void test_exec_personality(Manager *m) {
@@ -59,7 +59,7 @@ index 38522a168..5a02960e7 100644
#endif
diff --git a/test/exec-personality-aarch64.service b/test/exec-personality-aarch64.service
new file mode 100644
-index 000000000..851117441
+index 0000000000..8511174411
--- /dev/null
+++ b/test/exec-personality-aarch64.service
@@ -0,0 +1,7 @@
@@ -72,7 +72,7 @@ index 000000000..851117441
+Personality=aarch64
diff --git a/test/exec-personality-ppc64.service b/test/exec-personality-ppc64.service
new file mode 100644
-index 000000000..4432074e6
+index 0000000000..4432074e67
--- /dev/null
+++ b/test/exec-personality-ppc64.service
@@ -0,0 +1,7 @@
diff --git a/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch b/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch
index 1eef618..065f376 100644
--- a/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch
+++ b/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch
@@ -15,7 +15,7 @@ Resolves: #1362461
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 93b7a193b..b7496c006 100644
+index 93b7a193b2..b7496c006e 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4339,7 +4339,7 @@ static int show_one(
diff --git a/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch b/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch
index 5af2559..d6d4341 100644
--- a/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch
+++ b/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch
@@ -10,7 +10,7 @@ Related: #1159308
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index f190dbfab..f7f9866f4 100644
+index f190dbfab2..f7f9866f4d 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -996,7 +996,7 @@ static int unit_file_load(
diff --git a/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch b/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch
index 80cc166..e35d825 100644
--- a/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch
+++ b/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch
@@ -11,7 +11,7 @@ Related: #1348208
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index f7f9866f4..9962508b1 100644
+index f7f9866f4d..9962508b1a 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1910,12 +1910,10 @@ int unit_file_disable(
diff --git a/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch b/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch
index ab39230..0d6c3e8 100644
--- a/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch
+++ b/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch
@@ -34,7 +34,7 @@ Resolves: #1348208
1 file changed, 29 insertions(+)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index b7496c006..58998185c 100644
+index b7496c006e..58998185c6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5333,6 +5333,29 @@ static int mangle_names(char **original_names, char ***mangled_names) {
diff --git a/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch b/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch
index 6b9fd5b..1481fcb 100644
--- a/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch
+++ b/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch
@@ -15,7 +15,7 @@ Resolves: #1365870
1 file changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 64c733aaa..bda89df5b 100644
+index 64c733aaa0..bda89df5be 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -78,18 +78,18 @@ typedef enum ItemType {
diff --git a/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch b/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch
index 48ad612..5b542a0 100644
--- a/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch
+++ b/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch
@@ -17,7 +17,7 @@ Related: #1256858
2 files changed, 19 insertions(+)
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 49770bfda..c3654db9e 100644
+index 49770bfda1..c3654db9ea 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1083,3 +1083,20 @@ int bus_unit_set_properties(
@@ -42,7 +42,7 @@ index 49770bfda..c3654db9e 100644
+ return sd_bus_error_set_errnof(error, u->load_error, "Unit is not loaded properly: %m.");
+}
diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h
-index 57a5e1974..433849641 100644
+index 57a5e19744..433849641e 100644
--- a/src/core/dbus-unit.h
+++ b/src/core/dbus-unit.h
@@ -37,3 +37,5 @@ int bus_unit_method_reset_failed(sd_bus *bus, sd_bus_message *message, void *use
diff --git a/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch b/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch
index 5f2d376..e858bba 100644
--- a/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch
+++ b/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch
@@ -12,7 +12,7 @@ Related: #1256858
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/core/transaction.c b/src/core/transaction.c
-index aed64fa41..57e9cb3f8 100644
+index aed64fa419..57e9cb3f83 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -26,6 +26,7 @@
@@ -59,7 +59,7 @@ index aed64fa41..57e9cb3f8 100644
return sd_bus_error_setf(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE,
"Job type %s is not applicable for unit %s.",
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 58998185c..e4b404abc 100644
+index 58998185c6..e4b404abc2 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2617,6 +2617,11 @@ static int start_unit_one(
diff --git a/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch b/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch
index 0b71cb2..601888e 100644
--- a/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch
+++ b/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch
@@ -17,7 +17,7 @@ Resolves: #1365556
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 8359e236a..a3b019bfc 100644
+index 8359e236a1..a3b019bfc5 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -729,7 +729,7 @@ restart:
diff --git a/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch b/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch
index 08241ef..28776b3 100644
--- a/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch
+++ b/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch
@@ -9,7 +9,7 @@ Resolves: #1322773
1 file changed, 1 insertion(+)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 9a48adde1..3335fe507 100644
+index 9a48adde19..3335fe5075 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -11,6 +11,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/sys
diff --git a/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch b/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch
index eb64481..817606c 100644
--- a/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch
+++ b/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch
@@ -54,7 +54,7 @@ Related: #1318994
26 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/import/import-job.c b/src/import/import-job.c
-index 5f9cfd366..d826f493f 100644
+index 5f9cfd366d..d826f493f8 100644
--- a/src/import/import-job.c
+++ b/src/import/import-job.c
@@ -80,7 +80,7 @@ void import_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) {
@@ -67,7 +67,7 @@ index 5f9cfd366..d826f493f 100644
if (!j || j->state == IMPORT_JOB_DONE || j->state == IMPORT_JOB_FAILED)
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 576f7cae7..d1f0ce3da 100644
+index 576f7cae7d..d1f0ce3da3 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -736,7 +736,7 @@ static int request_handler_machine(
@@ -80,7 +80,7 @@ index 576f7cae7..d1f0ce3da 100644
sd_id128_t mid, bid;
_cleanup_free_ char *v = NULL;
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index 7e6295435..64089da19 100644
+index 7e62954351..64089da19b 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -316,7 +316,7 @@ int process_data(RemoteSource *source) {
@@ -93,7 +93,7 @@ index 7e6295435..64089da19 100644
assert(source->data_size == 0);
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index 9c515f9c8..4fac55cc9 100644
+index 9c515f9c8f..4fac55cc9a 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -353,7 +353,7 @@ static int remove_source(RemoteServer *s, int fd) {
@@ -115,7 +115,7 @@ index 9c515f9c8..4fac55cc9 100644
fd2 = accept_connection("raw", fd, &addr, &hostname);
if (fd2 < 0)
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index f17023284..a9c40c6d4 100644
+index f170232841..a9c40c6d4f 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -559,7 +559,7 @@ static const char *find_id(void *p, sd_id128_t id) {
@@ -128,7 +128,7 @@ index f17023284..a9c40c6d4 100644
int r;
const char *s;
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
-index f7ba0191e..59ccd46bb 100644
+index f7ba0191e1..59ccd46bb0 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -244,7 +244,7 @@ static int maybe_remove_external_coredump(const char *filename, off_t size) {
@@ -150,7 +150,7 @@ index f7ba0191e..59ccd46bb 100644
/* Store the coredump itself in the journal */
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index ef1849787..2a93460d4 100644
+index ef18497879..2a93460d4e 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -911,7 +911,7 @@ int journal_file_find_data_object_with_hash(
@@ -181,7 +181,7 @@ index ef1849787..2a93460d4 100644
r = decompress_blob(o->object.flags & OBJECT_COMPRESSION_MASK,
o->data.payload, l, &from->compress_buffer, &from->compress_buffer_size, &rsize, 0);
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
-index 832c327b3..856d11e4e 100644
+index 832c327b31..856d11e4ed 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -76,7 +76,7 @@ static void patch_realtime(
@@ -194,7 +194,7 @@ index 832c327b3..856d11e4e 100644
/* The timestamp was determined by the file name, but let's
* see if the file might actually be older than the file name
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index a38ce4b8f..6ba884779 100644
+index a38ce4b8fd..6ba8847798 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1644,7 +1644,7 @@ static int verify(sd_journal *j) {
@@ -207,7 +207,7 @@ index a38ce4b8f..6ba884779 100644
#ifdef HAVE_GCRYPT
if (!arg_verify_key && JOURNAL_HEADER_SEALED(f->header))
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
-index 3996e778e..b8caeb3d4 100644
+index 3996e778e6..b8caeb3d41 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -42,7 +42,7 @@ static void verify_contents(sd_journal *j, unsigned skip) {
@@ -220,7 +220,7 @@ index 3996e778e..b8caeb3d4 100644
assert_se(sd_journal_get_cursor(j, &k) >= 0);
printf("cursor: %s\n", k);
diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c
-index e43d70d3c..e32783f3e 100644
+index e43d70d3cf..e32783f3eb 100644
--- a/src/libsystemd-network/lldp-tlv.c
+++ b/src/libsystemd-network/lldp-tlv.c
@@ -156,7 +156,7 @@ static inline int tlv_packet_read_internal(tlv_section *m, void **data) {
@@ -260,7 +260,7 @@ index e43d70d3c..e32783f3e 100644
assert_return(m, -EINVAL);
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
-index 3f89f344d..0f284eb6a 100644
+index 3f89f344d7..0f284eb6a1 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -776,7 +776,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
@@ -273,7 +273,7 @@ index 3f89f344d..0f284eb6a 100644
if (!existing_lease) {
lease = new0(DHCPLease, 1);
diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
-index 4f49b799e..83e58a3db 100644
+index 4f49b799ec..83e58a3db3 100644
--- a/src/libsystemd-network/sd-pppoe.c
+++ b/src/libsystemd-network/sd-pppoe.c
@@ -340,7 +340,7 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata);
@@ -286,7 +286,7 @@ index 4f49b799e..83e58a3db 100644
assert(ppp);
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
-index f71749f72..cc0677bdf 100644
+index f71749f72d..cc0677bdf2 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -82,7 +82,7 @@ _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
@@ -299,7 +299,7 @@ index f71749f72..cc0677bdf 100644
assert_return(fd >= 0, -EINVAL);
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
-index aa83f32f5..778670b73 100644
+index aa83f32f53..778670b733 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -964,7 +964,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
@@ -312,7 +312,7 @@ index aa83f32f5..778670b73 100644
r = safe_atollu(b, &x);
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
-index 74b063414..bc1a90db1 100644
+index 74b0634142..bc1a90db1b 100644
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -252,7 +252,7 @@ static int dns_transaction_open_tcp(DnsTransaction *t) {
@@ -325,7 +325,7 @@ index 74b063414..bc1a90db1 100644
/* Otherwise, try to talk to the owner of a
* the IP address, in case this is a reverse
diff --git a/src/resolve/test-dns-domain.c b/src/resolve/test-dns-domain.c
-index ebc8d98fc..4963a9c6a 100644
+index ebc8d98fce..4963a9c6a5 100644
--- a/src/resolve/test-dns-domain.c
+++ b/src/resolve/test-dns-domain.c
@@ -162,7 +162,7 @@ static void test_dns_name_single_label(void) {
@@ -338,7 +338,7 @@ index ebc8d98fc..4963a9c6a 100644
assert_se(in_addr_from_string_auto(address, &familya, &a) >= 0);
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
-index 73907c635..20a69bdbf 100644
+index 73907c6354..20a69bdbff 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -55,7 +55,7 @@ static const BaseFilesystem table[] = {
@@ -351,7 +351,7 @@ index 73907c635..20a69bdbf 100644
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)
diff --git a/src/shared/capability.c b/src/shared/capability.c
-index 915ceb9d9..2b963fde3 100644
+index 915ceb9d9b..2b963fde3f 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -55,7 +55,7 @@ unsigned long cap_last_cap(void) {
@@ -364,7 +364,7 @@ index 915ceb9d9..2b963fde3 100644
if (valid)
diff --git a/src/shared/copy.c b/src/shared/copy.c
-index 0239a5806..2a0cb2808 100644
+index 0239a58066..2a0cb28080 100644
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -360,7 +360,7 @@ int copy_file_fd(const char *from, int fdt, bool try_reflink) {
@@ -395,7 +395,7 @@ index 0239a5806..2a0cb2808 100644
assert(fdf >= 0);
assert(fdt >= 0);
diff --git a/src/shared/install.c b/src/shared/install.c
-index 9962508b1..61aaafe7b 100644
+index 9962508b1a..61aaafe7bc 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2046,7 +2046,7 @@ UnitFileState unit_file_lookup_state(
@@ -408,7 +408,7 @@ index 9962508b1..61aaafe7b 100644
assert(paths);
assert(name);
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index 8c374116a..a572be94b 100644
+index 8c374116ad..a572be94b4 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -993,7 +993,7 @@ static int show_journal(FILE *f,
@@ -421,7 +421,7 @@ index 8c374116a..a572be94b 100644
/* Check whether the cutoff line is too early */
diff --git a/src/shared/util.c b/src/shared/util.c
-index 303026152..4c441a544 100644
+index 3030261524..4c441a5448 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3073,7 +3073,7 @@ int getttyname_malloc(int fd, char **ret) {
@@ -443,7 +443,7 @@ index 303026152..4c441a544 100644
e = strv_env_get(env, *i+1);
diff --git a/src/test/test-path.c b/src/test/test-path.c
-index 4f9f5c134..a3295aa99 100644
+index 4f9f5c1344..a3295aa997 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -33,7 +33,7 @@ static int setup_test(Manager **m) {
@@ -456,7 +456,7 @@ index 4f9f5c134..a3295aa99 100644
assert_se(m);
diff --git a/src/test/test-pty.c b/src/test/test-pty.c
-index cab569a9d..67c125a4c 100644
+index cab569a9da..67c125a4c0 100644
--- a/src/test/test-pty.c
+++ b/src/test/test-pty.c
@@ -97,7 +97,7 @@ static void run_parent(Pty *pty) {
@@ -469,7 +469,7 @@ index cab569a9d..67c125a4c 100644
rcvsiz = 0;
zero(rcvbuf);
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
-index 489593f4f..ad6a82e50 100644
+index 489593f4fd..ad6a82e506 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -474,7 +474,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
diff --git a/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch b/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch
index 9e88b2a..212a9b4 100644
--- a/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch
+++ b/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch
@@ -19,7 +19,7 @@ Related: #1318994
3 files changed, 119 insertions(+), 105 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 6ba884779..f60e6415f 100644
+index 6ba8847798..f60e6415f8 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1680,61 +1680,76 @@ static int verify(sd_journal *j) {
@@ -187,7 +187,7 @@ index 6ba884779..f60e6415f 100644
return r;
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index e67e9acb6..d18a02f50 100644
+index e67e9acb6a..d18a02f503 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -82,17 +82,18 @@ int calc_acl_mask_if_needed(acl_t *acl_p) {
@@ -325,7 +325,7 @@ index e67e9acb6..d18a02f50 100644
int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
-index fdb90063f..c8bcc266d 100644
+index fdb90063fa..c8bcc266d0 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -32,7 +32,7 @@
diff --git a/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch b/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch
index c9ebbff..9b6876b 100644
--- a/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch
+++ b/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch
@@ -35,7 +35,7 @@ Related: #1318994
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index f60e6415f..c7a19f236 100644
+index f60e6415f8..c7a19f236c 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1166,11 +1166,10 @@ static int add_boot(sd_journal *j) {
diff --git a/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch b/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch
index e80508c..110e629 100644
--- a/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch
+++ b/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch
@@ -13,7 +13,7 @@ Related: #1318994
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index c7a19f236..31da357c1 100644
+index c7a19f236c..31da357c1b 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -532,7 +532,7 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch b/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch
index b59cb95..5159c49 100644
--- a/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch
+++ b/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch
@@ -12,7 +12,7 @@ Related: #1318994
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 31da357c1..92ee3fb27 100644
+index 31da357c1b..92ee3fb27d 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -39,7 +39,6 @@
diff --git a/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch b/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch
index ff26301..56319d3 100644
--- a/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch
+++ b/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch
@@ -14,7 +14,7 @@ Related: #1318994
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 92ee3fb27..e84dd4c9d 100644
+index 92ee3fb27d..e84dd4c9d3 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -128,12 +128,12 @@ static enum {
diff --git a/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch b/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch
index 2ffef78..29d4e1a 100644
--- a/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch
+++ b/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch
@@ -28,7 +28,7 @@ Related: #1318994
15 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index c5021993e..71dd70c94 100644
+index c5021993e5..71dd70c94c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1679,7 +1679,7 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
@@ -41,7 +41,7 @@ index c5021993e..71dd70c94 100644
fd_array = (int*) CMSG_DATA(cmsg);
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index ebd5fb334..00495c144 100644
+index ebd5fb3347..00495c1446 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -658,12 +658,11 @@ int setup_netns(int netns_storage_socket[2]) {
@@ -59,7 +59,7 @@ index ebd5fb334..00495c144 100644
if (setns(netns, CLONE_NEWNET) < 0) {
r = -errno;
diff --git a/src/import/importd.c b/src/import/importd.c
-index 9aaf991f8..a29630b12 100644
+index 9aaf991f83..a29630b12b 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -507,12 +507,8 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
@@ -78,7 +78,7 @@ index 9aaf991f8..a29630b12 100644
cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) {
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 6a35ebbde..1eb1394d1 100644
+index 6a35ebbde0..1eb1394d10 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1176,7 +1176,7 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
@@ -91,7 +91,7 @@ index 6a35ebbde..1eb1394d1 100644
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS &&
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
-index 5f90617b9..870850ed3 100644
+index 5f90617b9e..870850ed36 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1590,7 +1590,7 @@ static int client_receive_message_raw(sd_event_source *s, int fd,
@@ -104,7 +104,7 @@ index 5f90617b9..870850ed3 100644
cmsg->cmsg_type == PACKET_AUXDATA &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct tpacket_auxdata))) {
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
-index 0f284eb6a..c9d0ace72 100644
+index 0f284eb6a1..c9d0ace728 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -903,7 +903,7 @@ static int server_receive_message(sd_event_source *s, int fd,
@@ -117,7 +117,7 @@ index 0f284eb6a..c9d0ace72 100644
cmsg->cmsg_type == IP_PKTINFO &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct in_pktinfo))) {
diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
-index d29b98a26..10ab71431 100644
+index d29b98a269..10ab714312 100644
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -222,7 +222,7 @@ int bus_container_connect_kernel(sd_bus *b) {
@@ -130,7 +130,7 @@ index d29b98a26..10ab71431 100644
int *fds;
unsigned n_fds;
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
-index a3c3a45b4..ab56ef4f3 100644
+index a3c3a45b46..ab56ef4f33 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -503,7 +503,6 @@ static int bus_socket_read_auth(sd_bus *b) {
@@ -192,7 +192,7 @@ index a3c3a45b4..ab56ef4f3 100644
r = bus_socket_read_message_need(bus, &need);
if (r < 0)
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
-index 9276bbdeb..cc84253f1 100644
+index 9276bbdebc..cc84253f1d 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -1444,7 +1444,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
@@ -205,7 +205,7 @@ index 9276bbdeb..cc84253f1 100644
cmsg->cmsg_type == SCM_CREDENTIALS &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) {
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c
-index 4c0b557ba..7f47e7223 100644
+index 4c0b557bad..7f47e7223a 100644
--- a/src/resolve/resolved-dns-stream.c
+++ b/src/resolve/resolved-dns-stream.c
@@ -113,7 +113,8 @@ static int dns_stream_identify(DnsStream *s) {
@@ -219,7 +219,7 @@ index 4c0b557ba..7f47e7223 100644
if (cmsg->cmsg_level == IPPROTO_IPV6) {
assert(s->peer.sa.sa_family == AF_INET6);
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
-index 7c253aa13..173ab8a14 100644
+index 7c253aa13f..173ab8a148 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -920,7 +920,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) {
@@ -232,7 +232,7 @@ index 7c253aa13..173ab8a14 100644
if (cmsg->cmsg_level == IPPROTO_IPV6) {
assert(p->family == AF_INET6);
diff --git a/src/shared/macro.h b/src/shared/macro.h
-index 9d857dc8d..7a57f4e5b 100644
+index 9d857dc8d7..7a57f4e5b1 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -471,4 +471,7 @@ static inline bool GID_IS_INVALID(gid_t gid) {
@@ -244,7 +244,7 @@ index 9d857dc8d..7a57f4e5b 100644
+
#include "log.h"
diff --git a/src/shared/util.c b/src/shared/util.c
-index 4c441a544..357fbfe7d 100644
+index 4c441a5448..357fbfe7dc 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -7887,7 +7887,7 @@ int openpt_in_namespace(pid_t pid, int flags) {
@@ -274,7 +274,7 @@ index 4c441a544..357fbfe7d 100644
const char *p;
char *r, *t;
diff --git a/src/shared/util.h b/src/shared/util.h
-index be04524cc..12afcc342 100644
+index be04524cc9..12afcc3429 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1082,6 +1082,8 @@ void sigkill_wait(pid_t *pid);
@@ -287,7 +287,7 @@ index be04524cc..12afcc342 100644
typedef enum ExtractFlags {
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
-index 73ac7eecb..5cc196820 100644
+index 73ac7eecbf..5cc1968204 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -539,7 +539,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
diff --git a/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch b/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch
index a31a048..ca1d566 100644
--- a/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch
+++ b/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch
@@ -19,7 +19,7 @@ Cherry-picked from: a315ac4e076c4ce7ce3e5c95792cf916d5e918c5
1 file changed, 100 insertions(+), 104 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 1eb1394d1..275224dc9 100644
+index 1eb1394d10..275224dc99 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1103,6 +1103,42 @@ finish:
diff --git a/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch b/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch
index 4739407..11f9f55 100644
--- a/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch
+++ b/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch
@@ -15,7 +15,7 @@ Related: #1318994
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index c96877c50..b1263a758 100644
+index c96877c508..b1263a7586 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -148,7 +148,7 @@ typedef struct Server {
diff --git a/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch b/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch
index 878e42a..1d3ef9c 100644
--- a/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch
+++ b/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch
@@ -10,7 +10,7 @@ Related: #1318994
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/cat.c b/src/journal/cat.c
-index 79706b692..ed467b078 100644
+index 79706b692d..ed467b0785 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -96,7 +96,7 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch b/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch
index 5566602..1fce6de 100644
--- a/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch
+++ b/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch
@@ -13,7 +13,7 @@ Related: #1318994
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index 0981fba72..dedcf1925 100644
+index 0981fba729..dedcf19250 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -528,7 +528,9 @@
@@ -27,7 +27,7 @@ index 0981fba72..dedcf1925 100644
<listitem><para>Start showing entries on or newer than the
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index e84dd4c9d..ba9ae05f7 100644
+index e84dd4c9d3..ba9ae05f72 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -274,8 +274,8 @@ static void help(void) {
diff --git a/SOURCES/0387-journal-s-Envalid-Invalid.patch b/SOURCES/0387-journal-s-Envalid-Invalid.patch
index 2e9ab6f..6d803a5 100644
--- a/SOURCES/0387-journal-s-Envalid-Invalid.patch
+++ b/SOURCES/0387-journal-s-Envalid-Invalid.patch
@@ -10,7 +10,7 @@ Related: #1318994
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 8a66ac7f0..250d4c758 100644
+index 8a66ac7f08..250d4c7586 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -899,7 +899,7 @@ int journal_file_verify(
diff --git a/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch b/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch
index 98ad607..44e7f32 100644
--- a/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch
+++ b/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch
@@ -15,7 +15,7 @@ Related: #1318994
1 file changed, 12 insertions(+)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 275224dc9..2b7ecd09a 100644
+index 275224dc99..2b7ecd09ab 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1284,10 +1284,22 @@ static int setup_signals(Server *s) {
diff --git a/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch b/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch
index f47c9ea..aca856b 100644
--- a/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch
+++ b/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch
@@ -11,7 +11,7 @@ Related: #1318994
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/compress.c b/src/journal/compress.c
-index c9a3399cc..4fb09f596 100644
+index c9a3399cca..4fb09f5965 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -190,7 +190,7 @@ int decompress_blob_lz4(const void *src, uint64_t src_size,
diff --git a/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch b/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch
index fb2f8b2..22c7843 100644
--- a/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch
+++ b/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch
@@ -27,7 +27,7 @@ Related: #1318994
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
-index 851625de0..2c9cf6e7a 100644
+index 851625de04..2c9cf6e7a8 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -457,5 +457,9 @@ int server_open_native_socket(Server*s) {
@@ -41,7 +41,7 @@ index 851625de0..2c9cf6e7a 100644
return 0;
}
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 15a554c34..b8607144b 100644
+index 15a554c34d..b8607144b3 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -448,7 +448,7 @@ int server_open_stdout_socket(Server *s) {
@@ -54,7 +54,7 @@ index 15a554c34..b8607144b 100644
return log_error_errno(r, "Failed to adjust priority of stdout server event source: %m");
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index 4e118aabc..8602b4a95 100644
+index 4e118aabc0..8602b4a95d 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -421,6 +421,10 @@ int server_open_syslog_socket(Server *s) {
diff --git a/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch b/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch
index b49140e..239e02d 100644
--- a/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch
+++ b/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch
@@ -15,7 +15,7 @@ Related: #1318994
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index 8602b4a95..b499a0d38 100644
+index 8602b4a95d..b499a0d381 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -317,7 +317,7 @@ void server_process_syslog_message(
diff --git a/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch b/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch
index fd367cb..378e3f3 100644
--- a/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch
+++ b/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch
@@ -18,7 +18,7 @@ Related: #1318994
1 file changed, 4 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 2a93460d4..8034b771d 100644
+index 2a93460d4e..8034b771de 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1419,10 +1419,6 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
diff --git a/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch b/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch
index 571f3f5..e63d9ee 100644
--- a/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch
+++ b/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch
@@ -13,7 +13,7 @@ Related: #1318994
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index ba9ae05f7..5864ff50a 100644
+index ba9ae05f72..5864ff50a6 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -932,6 +932,15 @@ static int add_matches(sd_journal *j, char **args) {
diff --git a/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch b/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch
index f2a2f51..9a7858f 100644
--- a/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch
+++ b/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch
@@ -52,7 +52,7 @@ Related: #1318994
1 file changed, 42 insertions(+), 29 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 5864ff50a..723854a2e 100644
+index 5864ff50a6..723854a2e9 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -941,18 +941,18 @@ static void boot_id_free_all(BootId *l) {
diff --git a/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch b/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch
index 9566cfd..488135f 100644
--- a/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch
+++ b/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch
@@ -23,7 +23,7 @@ Resolves: #1370133
1 file changed, 1 insertion(+)
diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket
-index 8330a1c03..46f704ed7 100644
+index 8330a1c035..46f704ed79 100644
--- a/units/systemd-udevd-control.socket
+++ b/units/systemd-udevd-control.socket
@@ -17,3 +17,4 @@ Service=systemd-udevd.service
diff --git a/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch b/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch
index df6a335..0260493 100644
--- a/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch
+++ b/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch
@@ -13,7 +13,7 @@ Resolves: #1371437
1 file changed, 1 deletion(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 59f5a7ad5..746e50aa5 100644
+index 59f5a7ad5d..746e50aa51 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -507,7 +507,6 @@ static int session_start_scope(Session *s) {
diff --git a/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch b/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch
index 57d622c..ac3b271 100644
--- a/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch
+++ b/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch
@@ -11,7 +11,7 @@ Resolves: #1370299
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 9eef290ca..8d3758ac7 100644
+index 9eef290ca7..8d3758ac7e 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -633,7 +633,18 @@ static int transient_unit_from_message(
@@ -35,7 +35,7 @@ index 9eef290ca..8d3758ac7 100644
return sd_bus_error_setf(error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name);
diff --git a/src/core/slice.c b/src/core/slice.c
-index 61ff9d331..9154558b7 100644
+index 61ff9d3314..9154558b7b 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -272,6 +272,7 @@ const UnitVTable slice_vtable = {
diff --git a/SOURCES/0398-sd-bus-bump-message-queue-size.patch b/SOURCES/0398-sd-bus-bump-message-queue-size.patch
index b1fbb26..aa31ed9 100644
--- a/SOURCES/0398-sd-bus-bump-message-queue-size.patch
+++ b/SOURCES/0398-sd-bus-bump-message-queue-size.patch
@@ -15,7 +15,7 @@ Resolves: #1371205
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
-index 071b3da79..6a106862e 100644
+index 071b3da790..6a106862ee 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -326,8 +326,8 @@ struct sd_bus {
diff --git a/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch b/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch
index 1c9894b..a5770b2 100644
--- a/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch
+++ b/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch
@@ -10,7 +10,7 @@ Resolves: #1285996
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 61aaafe7b..ab86cd145 100644
+index 61aaafe7bc..ab86cd1453 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -476,7 +476,7 @@ static int remove_marked_symlinks(
diff --git a/SOURCES/0400-rules-add-NVMe-rules-3136.patch b/SOURCES/0400-rules-add-NVMe-rules-3136.patch
index 5c4290f..72123fc 100644
--- a/SOURCES/0400-rules-add-NVMe-rules-3136.patch
+++ b/SOURCES/0400-rules-add-NVMe-rules-3136.patch
@@ -20,7 +20,7 @@ Resolves: #1274651
1 file changed, 4 insertions(+)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 71ab97484..cc01acb16 100644
+index 71ab974844..cc01acb163 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -22,6 +22,10 @@ TEST=="whole_disk", GOTO="persistent_storage_end"
diff --git a/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch b/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch
index ae49974..d12ddf8 100644
--- a/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch
+++ b/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch
@@ -18,7 +18,7 @@ Related: #1274651
1 file changed, 6 insertions(+)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index cc01acb16..74f8f21f3 100644
+index cc01acb163..74f8f21f3a 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -26,6 +26,12 @@ ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*"
diff --git a/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch b/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch
index 8e48cbf..860af9a 100644
--- a/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch
+++ b/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch
@@ -15,7 +15,7 @@ Related: #1274651
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 74f8f21f3..06e3329cc 100644
+index 74f8f21f3a..06e3329cc9 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -27,10 +27,10 @@ KERNEL=="nvme*[0-9]n*[0-9]", ATTR{wwid}=="?*", SYMLINK+="disk/by-id/nvme-$attr{w
diff --git a/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch b/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch
index 5d8b6a2..61850c6 100644
--- a/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch
+++ b/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch
@@ -24,7 +24,7 @@ Resolves: #1373950
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 2d0678d18..bb21f3a88 100644
+index 2d0678d18d..bb21f3a887 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1012,22 +1012,22 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
@@ -64,7 +64,7 @@ index 2d0678d18..bb21f3a88 100644
</listitem>
</varlistentry>
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index e4b404abc..e854508d9 100644
+index e4b404abc2..e854508d9d 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5367,6 +5367,7 @@ static int enable_unit(sd_bus *bus, char **args) {
diff --git a/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch b/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch
index c701661..cdcf045 100644
--- a/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch
+++ b/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch
@@ -27,7 +27,7 @@ Related: #1375097
5 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 8d3758ac7..c2067c099 100644
+index 8d3758ac7e..c2067c099a 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1598,11 +1598,13 @@ static int reply_unit_file_changes_and_free(
@@ -50,7 +50,7 @@ index 8d3758ac7..c2067c099 100644
r = sd_bus_message_new_method_return(message, &reply);
if (r < 0)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 9d70798cd..75d03708e 100644
+index 9d70798cda..75d03708e2 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1893,11 +1893,17 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un
@@ -74,7 +74,7 @@ index 9d70798cd..75d03708e 100644
return r;
}
diff --git a/src/shared/install.c b/src/shared/install.c
-index ab86cd145..62da52d3b 100644
+index ab86cd1453..62da52d3b3 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2402,6 +2402,9 @@ int unit_file_preset_all(
@@ -96,7 +96,7 @@ index ab86cd145..62da52d3b 100644
DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType);
diff --git a/src/shared/install.h b/src/shared/install.h
-index 87a40b67c..f0e36661b 100644
+index 87a40b67c1..f0e36661b5 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -60,10 +60,15 @@ typedef enum UnitFilePresetMode {
@@ -116,7 +116,7 @@ index 87a40b67c..f0e36661b 100644
UnitFileChangeType type;
char *path;
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index e4b404abc..a688d6905 100644
+index e4b404abc2..a688d69052 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1944,12 +1944,20 @@ static void dump_unit_file_changes(const UnitFileChange *changes, unsigned n_cha
diff --git a/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch b/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch
index 021edcd..6214a00 100644
--- a/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch
+++ b/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch
@@ -21,7 +21,7 @@ Resolves: #1375097
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 75d03708e..d35776087 100644
+index 75d03708e2..d357760870 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1897,6 +1897,8 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un
@@ -34,7 +34,7 @@ index 75d03708e..d35776087 100644
log_notice("Manager reported unknown change type \"%s\" for %s.", type, path);
}
diff --git a/src/shared/install.c b/src/shared/install.c
-index 62da52d3b..b0a29ddd7 100644
+index 62da52d3b3..b0a29ddd7e 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1253,12 +1253,15 @@ static int install_info_traverse(
@@ -86,7 +86,7 @@ index 62da52d3b..b0a29ddd7 100644
DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType);
diff --git a/src/shared/install.h b/src/shared/install.h
-index f0e36661b..7e40445d3 100644
+index f0e36661b5..7e40445d36 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -61,6 +61,7 @@ typedef enum UnitFileChangeType {
@@ -98,7 +98,7 @@ index f0e36661b..7e40445d3 100644
_UNIT_FILE_CHANGE_TYPE_INVALID = -1
} UnitFileChangeType;
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index a688d6905..39f0150e5 100644
+index a688d69052..39f0150e52 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1955,6 +1955,9 @@ static void dump_unit_file_changes(const UnitFileChange *changes, unsigned n_cha
diff --git a/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch b/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch
index 6d099d4..987f6b8 100644
--- a/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch
+++ b/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch
@@ -47,7 +47,7 @@ Related: #1375097
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index b0a29ddd7..f01a21262 100644
+index b0a29ddd7e..f01a212620 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2270,12 +2270,20 @@ static int preset_prepare_one(
diff --git a/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch b/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch
index 3346db0..445049b 100644
--- a/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch
+++ b/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch
@@ -9,7 +9,7 @@ Resolves: #1370161
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 3335fe507..4c56950da 100644
+index 3335fe5075..4c56950dab 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -4,7 +4,7 @@
diff --git a/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch b/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch
index 3ac0db2..246a491 100644
--- a/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch
+++ b/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch
@@ -15,7 +15,7 @@ Resolves: #1380175
1 file changed, 4 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 71dd70c94..689b26615 100644
+index 71dd70c94c..689b266158 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1678,6 +1678,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
diff --git a/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch b/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch
index 43ade4a..e28d783 100644
--- a/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch
+++ b/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch
@@ -26,7 +26,7 @@ Resolves: #1380259
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 0644784a5..a578897d9 100644
+index 0644784a55..a578897d9e 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4272,12 +4272,14 @@ static int show_one(
diff --git a/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch b/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch
index 2bcd11b..7ac0636 100644
--- a/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch
+++ b/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch
@@ -10,7 +10,7 @@ Related: #1375603
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 4c56950da..0164dc921 100644
+index 4c56950dab..0164dc9214 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -4,7 +4,7 @@
diff --git a/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch b/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
index c9eca03..f4ae14e 100644
--- a/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
+++ b/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
@@ -16,7 +16,7 @@ Resolves: #1380259
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 689b26615..ed8105955 100644
+index 689b266158..ed81059554 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1673,10 +1673,14 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
diff --git a/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch b/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch
index 6fb6d68..af68164 100644
--- a/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch
+++ b/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch
@@ -19,7 +19,7 @@ Resolves: #1380259
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index ed8105955..0376c4d4b 100644
+index ed81059554..0376c4d4b4 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1614,13 +1614,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
diff --git a/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch b/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch
index 63d5797..dad7521 100644
--- a/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch
+++ b/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch
@@ -17,7 +17,7 @@ Resolves: #1380259
1 file changed, 8 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 0376c4d4b..27f032b9d 100644
+index 0376c4d4b4..27f032b9d9 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1631,6 +1631,14 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const
diff --git a/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch b/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch
index ed6eda4..85e47ee 100644
--- a/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch
+++ b/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch
@@ -10,7 +10,7 @@ Related: #1380259
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 27f032b9d..6d045fdf3 100644
+index 27f032b9d9..6d045fdf35 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1637,7 +1637,7 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const
diff --git a/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch b/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch
index f40e585..9e1269d 100644
--- a/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch
+++ b/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch
@@ -12,7 +12,7 @@ Resolves: #1379852
3 files changed, 15 insertions(+)
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
-index 038246d21..e8da4c978 100644
+index 038246d21b..e8da4c978a 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -449,3 +449,13 @@ char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const cha
@@ -30,7 +30,7 @@ index 038246d21..e8da4c978 100644
+ return parse_boolean(e);
+}
diff --git a/src/shared/env-util.h b/src/shared/env-util.h
-index 618441a65..252d87be1 100644
+index 618441a655..252d87be1f 100644
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -45,3 +45,5 @@ char **strv_env_unset_many(char **l, ...) _sentinel_;
@@ -40,7 +40,7 @@ index 618441a65..252d87be1 100644
+
+int getenv_bool(const char *p);
diff --git a/src/shared/util.c b/src/shared/util.c
-index 357fbfe7d..eab5ab816 100644
+index 357fbfe7dc..eab5ab8169 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3776,6 +3776,9 @@ int files_same(const char *filea, const char *fileb) {
diff --git a/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch b/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch
index 2335a3e..79c6aaa 100644
--- a/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch
+++ b/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch
@@ -22,7 +22,7 @@ Resolves: #1396277
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 2f6209e05..83b6e7efc 100644
+index 2f6209e053..83b6e7efca 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1105,7 +1105,7 @@ static int rlim_parse_size(const char *val, rlim_t *res) {
@@ -35,7 +35,7 @@ index 2f6209e05..83b6e7efc 100644
if (r == 0)
*res = (rlim_t) u;
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 8acf071ff..038430505 100644
+index 8acf071ff3..0384305051 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -554,6 +554,10 @@ static void test_config_parse_rlimit(void) {
diff --git a/SOURCES/0417-core-fix-assertion-check.patch b/SOURCES/0417-core-fix-assertion-check.patch
index c5e5b29..eb5c650 100644
--- a/SOURCES/0417-core-fix-assertion-check.patch
+++ b/SOURCES/0417-core-fix-assertion-check.patch
@@ -12,7 +12,7 @@ Resolves: #1396312
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/timer.c b/src/core/timer.c
-index 972dd73df..f318dc6f4 100644
+index 972dd73dfb..f318dc6f44 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -321,7 +321,7 @@ static void add_random(Timer *t, usec_t *v) {
diff --git a/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch b/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch
index dea3e05..9eb2bdd 100644
--- a/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch
+++ b/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch
@@ -11,7 +11,7 @@ Resolves: #1298355
1 file changed, 1 insertion(+)
diff --git a/units/tmp.mount b/units/tmp.mount
-index af0cf4a55..8c53a8705 100644
+index af0cf4a551..8c53a87052 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -13,6 +13,7 @@ ConditionPathIsSymbolicLink=!/tmp
diff --git a/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch b/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch
index 0d0625e..3bce43b 100644
--- a/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch
+++ b/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch
@@ -29,7 +29,7 @@ Resolves: #1298355
1 file changed, 8 insertions(+)
diff --git a/src/core/swap.c b/src/core/swap.c
-index 42f995990..984be2d9a 100644
+index 42f995990c..984be2d9a9 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -210,6 +210,8 @@ static int swap_add_device_links(Swap *s) {
diff --git a/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch b/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch
index 05180ad..758f481 100644
--- a/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch
+++ b/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch
@@ -12,7 +12,7 @@ Resolves: #1390542
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index eab5ab816..66729f70e 100644
+index eab5ab8169..66729f70e5 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1924,7 +1924,11 @@ bool fstype_is_network(const char *fstype) {
diff --git a/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch b/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch
index 8cb9e11..eda08b4 100644
--- a/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch
+++ b/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch
@@ -10,7 +10,7 @@ Resolves: #1372249
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 0e90d130a..a7d6d2f45 100644
+index 0e90d130a4..a7d6d2f45b 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1155,7 +1155,7 @@ static int unit_add_mount_dependencies(Unit *u) {
diff --git a/SOURCES/0422-core-return-0-from-device_serialize.patch b/SOURCES/0422-core-return-0-from-device_serialize.patch
index a6cc1f5..9a03a3f 100644
--- a/SOURCES/0422-core-return-0-from-device_serialize.patch
+++ b/SOURCES/0422-core-return-0-from-device_serialize.patch
@@ -18,7 +18,7 @@ Resolves: #1403249
1 file changed, 2 insertions(+)
diff --git a/src/core/device.c b/src/core/device.c
-index bdc8466ab..befbae83f 100644
+index bdc8466abc..befbae83fd 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -168,6 +168,8 @@ static int device_serialize(Unit *u, FILE *f, FDSet *fds) {
diff --git a/SOURCES/0423-mtd_probe-include-stdint.patch b/SOURCES/0423-mtd_probe-include-stdint.patch
index a7b5b43..b6fa77a 100644
--- a/SOURCES/0423-mtd_probe-include-stdint.patch
+++ b/SOURCES/0423-mtd_probe-include-stdint.patch
@@ -10,7 +10,7 @@ Resolves: #1404251
1 file changed, 1 insertion(+)
diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h
-index d99be9add..cead37402 100644
+index d99be9addc..cead374023 100644
--- a/src/udev/mtd_probe/mtd_probe.h
+++ b/src/udev/mtd_probe/mtd_probe.h
@@ -20,6 +20,7 @@
diff --git a/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch b/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch
index 9cfda58..e19bb25 100644
--- a/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch
+++ b/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch
@@ -16,7 +16,7 @@ Resolves: #1410056
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/exec-privatedevices-no.service b/test/exec-privatedevices-no.service
-index cf4f275fb..af1daf78f 100644
+index cf4f275fb6..af1daf78f1 100644
--- a/test/exec-privatedevices-no.service
+++ b/test/exec-privatedevices-no.service
@@ -2,6 +2,6 @@
@@ -28,7 +28,7 @@ index cf4f275fb..af1daf78f 100644
Type=oneshot
PrivateDevices=no
diff --git a/test/exec-privatedevices-yes.service b/test/exec-privatedevices-yes.service
-index 85b3f4f98..384a7b01a 100644
+index 85b3f4f981..384a7b01af 100644
--- a/test/exec-privatedevices-yes.service
+++ b/test/exec-privatedevices-yes.service
@@ -2,6 +2,6 @@
diff --git a/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch b/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch
index eecd2fd..c2da725 100644
--- a/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch
+++ b/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch
@@ -10,7 +10,7 @@ Resolves: #1409527
1 file changed, 6 insertions(+)
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
-index 76a8c921c..b1c2b43dd 100644
+index 76a8c921c6..b1c2b43ddf 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -163,6 +163,12 @@ global:
diff --git a/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch b/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch
index fac8376..2241e0f 100644
--- a/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch
+++ b/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch
@@ -19,7 +19,7 @@ Resolves: #1353028
5 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 39d19bc71..236c20d5f 100644
+index 39d19bc71a..236c20d5f9 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -101,6 +101,17 @@
@@ -41,7 +41,7 @@ index 39d19bc71..236c20d5f 100644
<term><varname>CPUAffinity=</varname></term>
diff --git a/src/core/main.c b/src/core/main.c
-index c9d8ce4a4..6ac9c9d44 100644
+index c9d8ce4a40..6ac9c9d44f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -115,6 +115,7 @@ static FILE* arg_serialization = NULL;
@@ -78,7 +78,7 @@ index c9d8ce4a4..6ac9c9d44 100644
manager_set_default_rlimits(m, arg_default_rlimit);
manager_environment_add(m, NULL, arg_default_environment);
diff --git a/src/core/manager.c b/src/core/manager.c
-index 6d045fdf3..9048dde96 100644
+index 6d045fdf35..9048dde96e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1859,6 +1859,35 @@ static int manager_start_target(Manager *m, const char *name, JobMode mode) {
@@ -151,7 +151,7 @@ index 6d045fdf3..9048dde96 100644
+
+DEFINE_STRING_TABLE_LOOKUP(cad_burst_action, CADBurstAction);
diff --git a/src/core/manager.h b/src/core/manager.h
-index 3e855db46..42be1fc43 100644
+index 3e855db466..42be1fc437 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -64,6 +64,14 @@ typedef enum ManagerExitCode {
@@ -188,7 +188,7 @@ index 3e855db46..42be1fc43 100644
+const char *cad_burst_action_to_string(CADBurstAction a) _const_;
+CADBurstAction cad_burst_action_from_string(const char *s) _pure_;
diff --git a/src/core/system.conf b/src/core/system.conf
-index 231609033..a11f59903 100644
+index 231609033b..a11f599038 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -20,6 +20,7 @@
diff --git a/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch b/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch
index 6ac6fa7..9f4e948 100644
--- a/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch
+++ b/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch
@@ -26,7 +26,7 @@ Resolves: #1353028
rename src/core/{failure-action.h => emergency-action.h} (58%)
diff --git a/Makefile.am b/Makefile.am
-index 3848338a2..b347aed7d 100644
+index 3848338a23..b347aed7db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1182,8 +1182,8 @@ libsystemd_core_la_SOURCES = \
@@ -41,7 +41,7 @@ index 3848338a2..b347aed7d 100644
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
-index 6d4713bab..325ed13f5 100644
+index 6d4713babc..325ed13f58 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -34,7 +34,7 @@ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType
@@ -66,7 +66,7 @@ index 6d4713bab..325ed13f5 100644
SD_BUS_PROPERTY("RootDirectoryStartOnly", "b", bus_property_get_bool, offsetof(Service, root_directory_start_only), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("RemainAfterExit", "b", bus_property_get_bool, offsetof(Service, remain_after_exit), SD_BUS_VTABLE_PROPERTY_CONST),
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index c3654db9e..89b00e94c 100644
+index c3654db9ea..89b00e94c6 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -33,7 +33,7 @@
@@ -91,7 +91,7 @@ diff --git a/src/core/failure-action.c b/src/core/emergency-action.c
similarity index 63%
rename from src/core/failure-action.c
rename to src/core/emergency-action.c
-index ce522a4e4..f07b1257a 100644
+index ce522a4e4f..f07b1257a0 100644
--- a/src/core/failure-action.c
+++ b/src/core/emergency-action.c
@@ -27,44 +27,45 @@
@@ -237,7 +237,7 @@ diff --git a/src/core/failure-action.h b/src/core/emergency-action.h
similarity index 58%
rename from src/core/failure-action.h
rename to src/core/emergency-action.h
-index 1af4dd987..d3ac0f31c 100644
+index 1af4dd987b..d3ac0f31c9 100644
--- a/src/core/failure-action.h
+++ b/src/core/emergency-action.h
@@ -22,22 +22,22 @@
@@ -278,7 +278,7 @@ index 1af4dd987..d3ac0f31c 100644
+const char* emergency_action_to_string(EmergencyAction i) _const_;
+EmergencyAction emergency_action_from_string(const char *s) _pure_;
diff --git a/src/core/job.c b/src/core/job.c
-index c2876dec1..703286496 100644
+index c2876dec18..703286496f 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -916,7 +916,7 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user
@@ -291,7 +291,7 @@ index c2876dec1..703286496 100644
return 0;
}
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index ce1397c7e..45d1ead45 100644
+index ce1397c7e8..45d1ead45b 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -156,7 +156,7 @@ Unit.OnFailureIsolate, config_parse_job_mode_isolate, 0,
@@ -316,7 +316,7 @@ index ce1397c7e..45d1ead45 100644
Service.Restart, config_parse_service_restart, 0, offsetof(Service, restart)
Service.PermissionsStartOnly, config_parse_bool, 0, offsetof(Service, permissions_start_only)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 83b6e7efc..4fecb8314 100644
+index 83b6e7efca..4fecb83142 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2382,7 +2382,7 @@ int config_parse_unit_condition_null(
@@ -338,7 +338,7 @@ index 83b6e7efc..4fecb8314 100644
{ config_parse_service_sockets, "SOCKETS" },
{ config_parse_environ, "ENVIRON" },
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 359794d0a..611479612 100644
+index 359794d0ac..6114796126 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -78,7 +78,7 @@ int config_parse_unit_condition_string(const char *unit, const char *filename, u
@@ -351,7 +351,7 @@ index 359794d0a..611479612 100644
int config_parse_syscall_filter(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_syscall_archs(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/core/manager.h b/src/core/manager.h
-index 42be1fc43..59913f489 100644
+index 42be1fc437..59913f4896 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -85,7 +85,7 @@ typedef enum StatusType {
@@ -364,7 +364,7 @@ index 42be1fc43..59913f489 100644
struct Manager {
/* Note that the set of units we know of is allowed to be
diff --git a/src/core/service.c b/src/core/service.c
-index babd3c52a..6e7baa76c 100644
+index babd3c52ae..6e7baa76c6 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1280,7 +1280,7 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
@@ -386,7 +386,7 @@ index babd3c52a..6e7baa76c 100644
static int service_start(Unit *u) {
diff --git a/src/core/service.h b/src/core/service.h
-index dfeee6a68..1f937dfe5 100644
+index dfeee6a68c..1f937dfe57 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -29,7 +29,7 @@ typedef struct ServiceFDStore ServiceFDStore;
@@ -410,7 +410,7 @@ index dfeee6a68..1f937dfe5 100644
UnitRef accept_socket;
diff --git a/src/core/unit.c b/src/core/unit.c
-index a7d6d2f45..4eb0d78f4 100644
+index a7d6d2f45b..4eb0d78f44 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -937,8 +937,8 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
@@ -425,7 +425,7 @@ index a7d6d2f45..4eb0d78f4 100644
if (u->job_timeout_reboot_arg)
fprintf(f, "%s\tJob Timeout Reboot Argument: %s\n", prefix, u->job_timeout_reboot_arg);
diff --git a/src/core/unit.h b/src/core/unit.h
-index 35287a5b7..85f52df18 100644
+index 35287a5b75..85f52df187 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -41,7 +41,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
@@ -447,7 +447,7 @@ index 35287a5b7..85f52df18 100644
/* References to this */
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
-index bda224bec..e4097903c 100644
+index bda224bec6..e4097903c4 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
diff --git a/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch b/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch
index 5442c84..5ae6572 100644
--- a/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch
+++ b/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch
@@ -15,7 +15,7 @@ Resolves: #1353028
4 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 236c20d5f..57b3b90be 100644
+index 236c20d5f9..57b3b90be1 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -105,9 +105,10 @@
@@ -33,7 +33,7 @@ index 236c20d5f..57b3b90be 100644
</para></listitem>
</varlistentry>
diff --git a/src/core/main.c b/src/core/main.c
-index 6ac9c9d44..6f8367632 100644
+index 6ac9c9d44f..6f8367632c 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -77,6 +77,7 @@
@@ -72,7 +72,7 @@ index 6ac9c9d44..6f8367632 100644
};
diff --git a/src/core/manager.c b/src/core/manager.c
-index 9048dde96..8bd80e687 100644
+index 9048dde96e..8bd80e6875 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1864,28 +1864,11 @@ static void manager_handle_ctrl_alt_del(Manager *m) {
@@ -121,7 +121,7 @@ index 9048dde96..8bd80e687 100644
-
-DEFINE_STRING_TABLE_LOOKUP(cad_burst_action, CADBurstAction);
diff --git a/src/core/manager.h b/src/core/manager.h
-index 59913f489..231c076b1 100644
+index 59913f4896..231c076b10 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -64,14 +64,6 @@ typedef enum ManagerExitCode {
diff --git a/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch b/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch
index 021e726..6d30f82 100644
--- a/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch
+++ b/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch
@@ -19,7 +19,7 @@ Resolves: #1373150
1 file changed, 9 insertions(+)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index a3b019bfc..88a812ff5 100644
+index a3b019bfc5..88a812ff53 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -709,6 +709,15 @@ restart:
diff --git a/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch b/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch
index 5016384..a472cd4 100644
--- a/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch
+++ b/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch
@@ -12,7 +12,7 @@ Resolves: #1409586
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 4fecb8314..90d42b002 100644
+index 4fecb83142..90d42b002f 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1027,6 +1027,7 @@ int config_parse_bounding_set(const char *unit,
diff --git a/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch b/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch
index 0cd5648..26b696e 100644
--- a/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch
+++ b/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch
@@ -12,7 +12,7 @@ Resolves: #1409586
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 90d42b002..705641971 100644
+index 90d42b002f..7056419715 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1069,7 +1069,7 @@ int config_parse_bounding_set(const char *unit,
diff --git a/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch b/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch
index 8aa457b..38404bf 100644
--- a/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch
+++ b/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch
@@ -16,7 +16,7 @@ Resolves: #1409588
5 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 0cd469cd9..c5199d3a5 100644
+index 0cd469cd98..c5199d3a54 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -575,7 +575,12 @@
@@ -34,7 +34,7 @@ index 0cd469cd9..c5199d3a5 100644
<para>Note that most process resource limits configured with
these options are per-process, and processes may fork in order
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 45d1ead45..f3a6e13d9 100644
+index 45d1ead45b..f3a6e13d9f 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -71,7 +71,7 @@ $1.LimitMEMLOCK, config_parse_bytes_limit, RLIMIT_MEML
@@ -47,7 +47,7 @@ index 45d1ead45..f3a6e13d9 100644
$1.LimitRTTIME, config_parse_usec_limit, RLIMIT_RTTIME, offsetof($1, exec_context.rlimit)
$1.ReadWriteDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.read_write_dirs)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 705641971..3a3c456da 100644
+index 7056419715..3a3c456da5 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1154,6 +1154,56 @@ static int rlim_parse_usec(const char *val, rlim_t *res) {
@@ -137,7 +137,7 @@ index 705641971..3a3c456da 100644
#ifdef HAVE_SYSV_COMPAT
int config_parse_sysv_priority(const char *unit,
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 611479612..7c69e5369 100644
+index 6114796126..7c69e53699 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -59,6 +59,7 @@ int config_parse_limit(const char *unit, const char *filename, unsigned line, co
@@ -149,7 +149,7 @@ index 611479612..7c69e5369 100644
int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/core/main.c b/src/core/main.c
-index 6f8367632..820cbc3e5 100644
+index 6f8367632c..820cbc3e53 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -669,7 +669,7 @@ static int parse_config_file(void) {
diff --git a/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch b/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch
index c865174..71cf431 100644
--- a/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch
+++ b/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch
@@ -19,7 +19,7 @@ Resolves: #1409997
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index f01a21262..1b59a96b1 100644
+index f01a212620..1b59a96b15 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1602,7 +1602,7 @@ int unit_file_unmask(
diff --git a/SOURCES/0434-shared-fix-double-free-in-link.patch b/SOURCES/0434-shared-fix-double-free-in-link.patch
index ca6e2fd..0f1ad01 100644
--- a/SOURCES/0434-shared-fix-double-free-in-link.patch
+++ b/SOURCES/0434-shared-fix-double-free-in-link.patch
@@ -91,7 +91,7 @@ Related: #1409997
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 1b59a96b1..87d805c94 100644
+index 1b59a96b15..87d805c941 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1682,7 +1682,7 @@ int unit_file_link(
diff --git a/SOURCES/0435-shared-check-strdup-NULL.patch b/SOURCES/0435-shared-check-strdup-NULL.patch
index 4f0c1f6..792975a 100644
--- a/SOURCES/0435-shared-check-strdup-NULL.patch
+++ b/SOURCES/0435-shared-check-strdup-NULL.patch
@@ -12,7 +12,7 @@ Related: #1409997
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 87d805c94..62bdf674c 100644
+index 87d805c941..62bdf674c9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1639,7 +1639,11 @@ int unit_file_unmask(
diff --git a/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch b/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch
index 92689e7..1f76207 100644
--- a/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch
+++ b/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch
@@ -12,7 +12,7 @@ Resolves: #1026648
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 89b00e94c..056a17ac1 100644
+index 89b00e94c6..056a17ac1f 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -843,7 +843,7 @@ int bus_unit_queue_job(
@@ -25,7 +25,7 @@ index 89b00e94c..056a17ac1 100644
r = manager_add_job(u->manager, type, u, mode, true, error, &j);
if (r < 0)
diff --git a/src/core/dbus.c b/src/core/dbus.c
-index 29524d49a..0061211fa 100644
+index 29524d49a3..0061211faa 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -187,7 +187,7 @@ static int signal_activation_request(sd_bus *bus, sd_bus_message *message, void
diff --git a/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch b/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch
index 219dd20..c8e18e1 100644
--- a/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch
+++ b/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch
@@ -11,7 +11,7 @@ Resolves: #1413964
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index a578897d9..1e1009f38 100644
+index a578897d9e..1e1009f388 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5739,7 +5739,7 @@ static int unit_is_enabled(sd_bus *bus, char **args) {
diff --git a/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch b/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch
index a934dc7..7ed03d2 100644
--- a/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch
+++ b/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch
@@ -11,7 +11,7 @@ Resolves: #1418547
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index c4f71e887..46a498b67 100644
+index c4f71e8873..46a498b673 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -210,7 +210,8 @@
diff --git a/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch b/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch
index 9c9e233..3f0ad31 100644
--- a/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch
+++ b/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch
@@ -9,7 +9,7 @@ Resolves: #1386824
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
-index ce1bd195d..3ccc8f681 100644
+index ce1bd195d2..3ccc8f6819 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -29,7 +29,7 @@
diff --git a/SOURCES/0440-bash-completion-add-support-for-now-5155.patch b/SOURCES/0440-bash-completion-add-support-for-now-5155.patch
index 2f26307..e1141f3 100644
--- a/SOURCES/0440-bash-completion-add-support-for-now-5155.patch
+++ b/SOURCES/0440-bash-completion-add-support-for-now-5155.patch
@@ -10,7 +10,7 @@ Resolves: #1351806
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
-index 0a022c4cf..a1dde32c3 100644
+index 0a022c4cf4..a1dde32c3e 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -91,7 +91,7 @@ _systemctl () {
diff --git a/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch b/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch
index 0f89cad..3e0d6fe 100644
--- a/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch
+++ b/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch
@@ -15,7 +15,7 @@ Resolves: #1416062
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 66729f70e..1070e32c4 100644
+index 66729f70e5..1070e32c4a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3908,7 +3908,8 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
diff --git a/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch b/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch
index 5b951cc..e6a60af 100644
--- a/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch
+++ b/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch
@@ -16,7 +16,7 @@ Resolves: #1392426
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 19e1f2631..7c154355d 100644
+index 19e1f2631a..7c154355dd 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -38,7 +38,7 @@
diff --git a/SOURCES/0443-install-introduce-UnitFileFlags.patch b/SOURCES/0443-install-introduce-UnitFileFlags.patch
index 744c2fc..52cd0d1 100644
--- a/SOURCES/0443-install-introduce-UnitFileFlags.patch
+++ b/SOURCES/0443-install-introduce-UnitFileFlags.patch
@@ -19,7 +19,7 @@ Related: #1413041
7 files changed, 135 insertions(+), 113 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index c2067c099..5b40aa20f 100644
+index c2067c099a..5b40aa20f0 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -41,6 +41,11 @@
@@ -183,7 +183,7 @@ index c2067c099..5b40aa20f 100644
return r;
diff --git a/src/core/main.c b/src/core/main.c
-index 820cbc3e5..a0df1e5ce 100644
+index 820cbc3e53..a0df1e5cec 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1658,7 +1658,7 @@ int main(int argc, char *argv[]) {
@@ -196,7 +196,7 @@ index 820cbc3e5..a0df1e5ce 100644
log_warning_errno(r, "Failed to populate /etc with preset unit settings, ignoring: %m");
else
diff --git a/src/shared/install.c b/src/shared/install.c
-index 62bdf674c..b3df6b35c 100644
+index 62bdf674c9..b3df6b35c9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1549,10 +1549,9 @@ static int install_context_mark_for_removal(
@@ -455,7 +455,7 @@ index 62bdf674c..b3df6b35c 100644
static void unit_file_list_free_one(UnitFileList *f) {
diff --git a/src/shared/install.h b/src/shared/install.h
-index 7e40445d3..c961b53d0 100644
+index 7e40445d36..c961b53d08 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -66,6 +66,11 @@ typedef enum UnitFileChangeType {
@@ -499,7 +499,7 @@ index 7e40445d3..c961b53d0 100644
int unit_file_lookup_state(UnitFileScope scope, const char *root_dir,const LookupPaths *paths, const char *name, UnitFileState *ret);
int unit_file_get_state(UnitFileScope scope, const char *root_dir, const char *filename, UnitFileState *ret);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 1e1009f38..e0dbf0fda 100644
+index 1e1009f388..e0dbf0fda9 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -165,6 +165,11 @@ static int daemon_reload(sd_bus *bus, char **args);
@@ -575,7 +575,7 @@ index 1e1009f38..e0dbf0fda 100644
log_error_errno(r, "Operation failed: %m");
goto finish;
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
-index 667c3748c..cb417d4c1 100644
+index 667c3748c5..cb417d4c19 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -62,7 +62,7 @@ static void test_basic_mask_and_enable(const char *root) {
@@ -830,7 +830,7 @@ index 667c3748c..cb417d4c1 100644
assert_se(n_changes > 0);
diff --git a/src/test/test-install.c b/src/test/test-install.c
-index 08a1faf2c..0cae0e794 100644
+index 08a1faf2c4..0cae0e794e 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -73,12 +73,12 @@ int main(int argc, char* argv[]) {
diff --git a/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch b/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch
index 510cdd1..811dfaf 100644
--- a/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch
+++ b/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch
@@ -27,7 +27,7 @@ Resolves: #1413041
6 files changed, 145 insertions(+), 17 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index bb21f3a88..4a1aff227 100644
+index bb21f3a887..4a1aff2273 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -223,6 +223,8 @@
@@ -48,7 +48,7 @@ index bb21f3a88..4a1aff227 100644
<table>
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 5b40aa20f..7ba1b519e 100644
+index 5b40aa20f0..7ba1b519ea 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1958,6 +1958,49 @@ static int method_add_dependency_unit_files(sd_bus *bus, sd_bus_message *message
@@ -110,7 +110,7 @@ index 5b40aa20f..7ba1b519e 100644
SD_BUS_SIGNAL("UnitNew", "so", 0),
SD_BUS_SIGNAL("UnitRemoved", "so", 0),
diff --git a/src/core/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf
-index 6a7a37ee9..3997dd0b4 100644
+index 6a7a37ee92..3997dd0b4e 100644
--- a/src/core/org.freedesktop.systemd1.conf
+++ b/src/core/org.freedesktop.systemd1.conf
@@ -76,6 +76,10 @@
@@ -125,7 +125,7 @@ index 6a7a37ee9..3997dd0b4 100644
send_interface="org.freedesktop.systemd1.Manager"
send_member="ListJobs"/>
diff --git a/src/shared/install.c b/src/shared/install.c
-index b3df6b35c..bdfd7b96a 100644
+index b3df6b35c9..bdfd7b96a2 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -340,6 +340,7 @@ static int remove_marked_symlinks_fd(
@@ -248,7 +248,7 @@ index b3df6b35c..bdfd7b96a 100644
r = 0;
diff --git a/src/shared/install.h b/src/shared/install.h
-index c961b53d0..c236dcfd8 100644
+index c961b53d08..c236dcfd8e 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -68,7 +68,8 @@ typedef enum UnitFileChangeType {
@@ -262,7 +262,7 @@ index c961b53d0..c236dcfd8 100644
static inline bool unit_file_change_is_modification(UnitFileChangeType type) {
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index e0dbf0fda..ff8b4e978 100644
+index e0dbf0fda9..ff8b4e9782 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5722,6 +5722,63 @@ finish:
diff --git a/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch b/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch
index 0aaf4a9..1fc52b5 100644
--- a/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch
+++ b/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch
@@ -15,7 +15,7 @@ Resolves: #1245293
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 21e7e7f9a..82c7a5425 100644
+index 21e7e7f9a9..82c7a5425a 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -990,7 +990,10 @@ static void kernel_cmdline_options(struct udev *udev) {
diff --git a/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch b/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch
index 0a685cd..1037dd4 100644
--- a/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch
+++ b/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch
@@ -13,7 +13,7 @@ Related: #1421181
1 file changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index e9b4359a7..59340ec05 100644
+index e9b4359a7f..59340ec051 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1256,6 +1256,36 @@ static int build_environment(
diff --git a/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch b/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch
index dd6b53e..12cfd7d 100644
--- a/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch
+++ b/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch
@@ -21,7 +21,7 @@ Resolves: #1421181
4 files changed, 100 insertions(+), 15 deletions(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 59340ec05..863babd76 100644
+index 59340ec051..863babd761 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1305,6 +1305,7 @@ static int exec_child(
@@ -61,7 +61,7 @@ index 59340ec05..863babd76 100644
*exit_status = EXIT_CHROOT;
return -errno;
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 00495c144..574746273 100644
+index 00495c1446..5747462736 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -44,6 +44,7 @@
@@ -228,7 +228,7 @@ index 00495c144..574746273 100644
return 0;
diff --git a/src/core/namespace.h b/src/core/namespace.h
-index 42b92e780..00ab22bf2 100644
+index 42b92e7803..00ab22bf2e 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -41,7 +41,8 @@ typedef enum ProtectSystem {
@@ -242,7 +242,7 @@ index 42b92e780..00ab22bf2 100644
char **inaccessible_dirs,
const char *tmp_dir,
diff --git a/src/test/test-ns.c b/src/test/test-ns.c
-index 7cd7b7715..72a0004e3 100644
+index 7cd7b77153..72a0004e3e 100644
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -42,10 +42,12 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch b/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch
index ff06ca3..bca756b 100644
--- a/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch
+++ b/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch
@@ -16,7 +16,7 @@ Resolves: #1421658
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 6e7baa76c..84e00573f 100644
+index 6e7baa76c6..84e00573f3 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1563,7 +1563,15 @@ static void service_enter_start(Service *s) {
diff --git a/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch b/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch
index d9b80ce..72ce270 100644
--- a/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch
+++ b/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch
@@ -12,7 +12,7 @@ Resolves: #1417459
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index ff8b4e978..0333599c8 100644
+index ff8b4e9782..0333599c87 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5549,16 +5549,20 @@ static int enable_unit(sd_bus *bus, char **args) {
diff --git a/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch b/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch
index 651a0f5..09da45f 100644
--- a/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch
+++ b/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch
@@ -11,7 +11,7 @@ Resolves: #1361601
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 82c7a5425..1d21182fb 100644
+index 82c7a5425a..1d21182fbf 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -697,6 +697,10 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) {
diff --git a/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch b/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch
index db0bceb..cd760a1 100644
--- a/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch
+++ b/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch
@@ -10,7 +10,7 @@ Related: #1421658
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 84e00573f..3bd6c3338 100644
+index 84e00573f3..3bd6c33381 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1567,7 +1567,7 @@ static void service_enter_start(Service *s) {
diff --git a/SOURCES/0452-automount-add-expire-support.patch b/SOURCES/0452-automount-add-expire-support.patch
index 3df11ca..86c11bf 100644
--- a/SOURCES/0452-automount-add-expire-support.patch
+++ b/SOURCES/0452-automount-add-expire-support.patch
@@ -17,7 +17,7 @@ Resolves: #1354410
8 files changed, 269 insertions(+), 28 deletions(-)
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
-index b5b5885cd..9561590c5 100644
+index b5b5885cdf..9561590c5c 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -135,6 +135,14 @@
@@ -36,7 +36,7 @@ index b5b5885cd..9561590c5 100644
</refsect1>
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 8e652e133..04ed1e1cf 100644
+index 8e652e1332..04ed1e1cf4 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -177,6 +177,15 @@
@@ -56,7 +56,7 @@ index 8e652e133..04ed1e1cf 100644
<term><option>x-systemd.device-timeout=</option></term>
diff --git a/src/core/automount.c b/src/core/automount.c
-index b391f6198..4e066613d 100644
+index b391f6198e..4e066613d7 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -42,6 +42,7 @@
@@ -433,7 +433,7 @@ index b391f6198..4e066613d 100644
log_unit_error(UNIT(a)->id, "Received unknown automount request %i", packet.hdr.type);
break;
diff --git a/src/core/automount.h b/src/core/automount.h
-index 60f552238..2a50fef68 100644
+index 60f5522389..2a50fef68d 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -47,6 +47,7 @@ struct Automount {
@@ -463,7 +463,7 @@ index 60f552238..2a50fef68 100644
const char* automount_state_to_string(AutomountState i) _const_;
AutomountState automount_state_from_string(const char *s) _pure_;
diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
-index b2a510ad0..c62ad8242 100644
+index b2a510ad09..c62ad8242b 100644
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -32,5 +32,6 @@ const sd_bus_vtable bus_automount_vtable[] = {
@@ -474,7 +474,7 @@ index b2a510ad0..c62ad8242 100644
SD_BUS_VTABLE_END
};
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index f3a6e13d9..c866a9cd0 100644
+index f3a6e13d9f..c866a9cd02 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -318,6 +318,7 @@ KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
@@ -486,7 +486,7 @@ index f3a6e13d9..c866a9cd0 100644
Swap.What, config_parse_path, 0, offsetof(Swap, parameters_fragment.what)
Swap.Priority, config_parse_int, 0, offsetof(Swap, parameters_fragment.priority)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 3fbdb7daf..7ca7f5a25 100644
+index 3fbdb7dafb..7ca7f5a258 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -552,7 +552,7 @@ static int mount_load(Unit *u) {
@@ -531,7 +531,7 @@ index 3fbdb7daf..7ca7f5a25 100644
if (state != old_state)
log_unit_debug(UNIT(m)->id,
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 029eb1638..a943393b0 100644
+index 029eb16380..a943393b04 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -213,6 +213,30 @@ static int write_requires_mounts_for(FILE *f, const char *opts) {
diff --git a/SOURCES/0453-fstab-generator-fix-memleak.patch b/SOURCES/0453-fstab-generator-fix-memleak.patch
index c21b465..34debc3 100644
--- a/SOURCES/0453-fstab-generator-fix-memleak.patch
+++ b/SOURCES/0453-fstab-generator-fix-memleak.patch
@@ -15,7 +15,7 @@ Related: #1354410
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index a943393b0..32aca2244 100644
+index a943393b04..32aca22444 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -214,13 +214,13 @@ static int write_requires_mounts_for(FILE *f, const char *opts) {
diff --git a/SOURCES/0454-remove-bus-proxyd.patch b/SOURCES/0454-remove-bus-proxyd.patch
index 9b7b752..0065c3f 100644
--- a/SOURCES/0454-remove-bus-proxyd.patch
+++ b/SOURCES/0454-remove-bus-proxyd.patch
@@ -65,7 +65,7 @@ Resolves: #1317518
delete mode 100644 units/user/systemd-bus-proxyd.socket
diff --git a/.gitignore b/.gitignore
-index 0360f7c6b..5ac188bfb 100644
+index 0360f7c6bd..5ac188bfb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@
@@ -77,7 +77,7 @@ index 0360f7c6b..5ac188bfb 100644
/systemd-cgls
/systemd-cgroups-agent
diff --git a/Makefile-man.am b/Makefile-man.am
-index 7ec709c8b..734c80598 100644
+index 7ec709c8b8..734c805983 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1762,8 +1762,6 @@ EXTRA_DIST += \
@@ -90,7 +90,7 @@ index 7ec709c8b..734c80598 100644
man/systemd-cgls.xml \
man/systemd-cgtop.xml \
diff --git a/Makefile.am b/Makefile.am
-index b347aed7d..924b34b69 100644
+index b347aed7db..924b34b699 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -397,7 +397,6 @@ rootlibexec_PROGRAMS = \
@@ -218,7 +218,7 @@ index b347aed7d..924b34b69 100644
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
diff --git a/README b/README
-index ffc2cf9f2..bf75909f8 100644
+index ffc2cf9f20..bf75909f85 100644
--- a/README
+++ b/README
@@ -198,9 +198,6 @@ USERS AND GROUPS:
@@ -232,7 +232,7 @@ index ffc2cf9f2..bf75909f8 100644
systemd ships with three NSS modules:
diff --git a/TODO b/TODO
-index 498d82c21..99473078a 100644
+index 498d82c212..99473078ac 100644
--- a/TODO
+++ b/TODO
@@ -431,10 +431,6 @@ Features:
@@ -247,7 +247,7 @@ index 498d82c21..99473078a 100644
- kdbus: add counter for refused unicast messages that is passed out via the RECV ioctl. SImilar to the counter for dropped multicast messages we already have.
diff --git a/man/busctl.xml b/man/busctl.xml
-index 0635280ea..c68fe236c 100644
+index 0635280ead..c68fe236c1 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -468,7 +468,6 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting>
@@ -260,7 +260,7 @@ index 0635280ea..c68fe236c 100644
</para>
diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml
deleted file mode 100644
-index e0efe9985..000000000
+index e0efe99854..0000000000
--- a/man/systemd-bus-proxyd.xml
+++ /dev/null
@@ -1,109 +0,0 @@
@@ -375,7 +375,7 @@ index e0efe9985..000000000
-</refentry>
diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml
deleted file mode 100644
-index dc4f07ff1..000000000
+index dc4f07ff1b..0000000000
--- a/man/systemd-bus-proxyd@.service.xml
+++ /dev/null
@@ -1,81 +0,0 @@
@@ -462,7 +462,7 @@ index dc4f07ff1..000000000
-</refentry>
diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile
deleted file mode 120000
-index d0b0e8e00..000000000
+index d0b0e8e008..0000000000
--- a/src/bus-proxyd/Makefile
+++ /dev/null
@@ -1 +0,0 @@
@@ -470,7 +470,7 @@ index d0b0e8e00..000000000
\ No newline at end of file
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
deleted file mode 100644
-index b6550ed3c..000000000
+index b6550ed3cf..0000000000
--- a/src/bus-proxyd/bus-proxyd.c
+++ /dev/null
@@ -1,346 +0,0 @@
@@ -822,7 +822,7 @@ index b6550ed3c..000000000
-}
diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c
deleted file mode 100644
-index f6ac0c009..000000000
+index f6ac0c0093..0000000000
--- a/src/bus-proxyd/bus-xml-policy.c
+++ /dev/null
@@ -1,1325 +0,0 @@
@@ -2153,7 +2153,7 @@ index f6ac0c009..000000000
-DEFINE_STRING_TABLE_LOOKUP(policy_item_class, PolicyItemClass);
diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/bus-proxyd/bus-xml-policy.h
deleted file mode 100644
-index f2ec1bbea..000000000
+index f2ec1bbea4..0000000000
--- a/src/bus-proxyd/bus-xml-policy.h
+++ /dev/null
@@ -1,151 +0,0 @@
@@ -2310,7 +2310,7 @@ index f2ec1bbea..000000000
-DEFINE_TRIVIAL_CLEANUP_FUNC(SharedPolicy*, shared_policy_free);
diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
deleted file mode 100644
-index bc2c0c86f..000000000
+index bc2c0c86f3..0000000000
--- a/src/bus-proxyd/driver.c
+++ /dev/null
@@ -1,608 +0,0 @@
@@ -2924,7 +2924,7 @@ index bc2c0c86f..000000000
-}
diff --git a/src/bus-proxyd/driver.h b/src/bus-proxyd/driver.h
deleted file mode 100644
-index b8cedf5ce..000000000
+index b8cedf5ce5..0000000000
--- a/src/bus-proxyd/driver.h
+++ /dev/null
@@ -1,27 +0,0 @@
@@ -2957,7 +2957,7 @@ index b8cedf5ce..000000000
-int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPolicy *sp, const struct ucred *ucred, Set *owned_names);
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
deleted file mode 100644
-index e13cf5e2e..000000000
+index e13cf5e2ea..0000000000
--- a/src/bus-proxyd/proxy.c
+++ /dev/null
@@ -1,864 +0,0 @@
@@ -3827,7 +3827,7 @@ index e13cf5e2e..000000000
-}
diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
deleted file mode 100644
-index 782c4e60b..000000000
+index 782c4e60b3..0000000000
--- a/src/bus-proxyd/proxy.h
+++ /dev/null
@@ -1,53 +0,0 @@
@@ -3886,7 +3886,7 @@ index 782c4e60b..000000000
-DEFINE_TRIVIAL_CLEANUP_FUNC(Proxy*, proxy_free);
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
deleted file mode 100644
-index 9fb3e9fc4..000000000
+index 9fb3e9fc49..0000000000
--- a/src/bus-proxyd/stdio-bridge.c
+++ /dev/null
@@ -1,263 +0,0 @@
@@ -4155,7 +4155,7 @@ index 9fb3e9fc4..000000000
-}
diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c
deleted file mode 100644
-index e1b0fd353..000000000
+index e1b0fd3535..0000000000
--- a/src/bus-proxyd/synthesize.c
+++ /dev/null
@@ -1,228 +0,0 @@
@@ -4389,7 +4389,7 @@ index e1b0fd353..000000000
-}
diff --git a/src/bus-proxyd/synthesize.h b/src/bus-proxyd/synthesize.h
deleted file mode 100644
-index a55f171cb..000000000
+index a55f171cb2..0000000000
--- a/src/bus-proxyd/synthesize.h
+++ /dev/null
@@ -1,34 +0,0 @@
@@ -4429,7 +4429,7 @@ index a55f171cb..000000000
-int synthesize_name_acquired(sd_bus *a, sd_bus *b, sd_bus_message *m);
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
deleted file mode 100644
-index 421487e03..000000000
+index 421487e038..0000000000
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ /dev/null
@@ -1,182 +0,0 @@
@@ -4617,7 +4617,7 @@ index 421487e03..000000000
-}
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
new file mode 100644
-index 000000000..791e545ab
+index 0000000000..791e545aba
--- /dev/null
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -0,0 +1,303 @@
@@ -4925,7 +4925,7 @@ index 000000000..791e545ab
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
-index e4097903c..afd4ab7fb 100644
+index e4097903c4..afd4ab7fb3 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -46,7 +46,6 @@
@@ -4946,7 +4946,7 @@ index e4097903c..afd4ab7fb 100644
test_table(protect_system, PROTECT_SYSTEM);
test_table(rlimit, RLIMIT);
diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4
-index 23175de1f..3d3e2374e 100644
+index 23175de1f5..3d3e2374ef 100644
--- a/sysusers.d/systemd.conf.m4
+++ b/sysusers.d/systemd.conf.m4
@@ -6,9 +6,6 @@
@@ -4960,7 +4960,7 @@ index 23175de1f..3d3e2374e 100644
u systemd-network - "systemd Network Management"
)m4_dnl
diff --git a/units/.gitignore b/units/.gitignore
-index 7f3e0d093..48c8f7217 100644
+index 7f3e0d093c..48c8f72174 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,4 +1,3 @@
@@ -4978,7 +4978,7 @@ index 7f3e0d093..48c8f7217 100644
/systemd-fsck@.service
diff --git a/units/systemd-bus-proxyd.service.m4.in b/units/systemd-bus-proxyd.service.m4.in
deleted file mode 100644
-index ffaf0bdc8..000000000
+index ffaf0bdc87..0000000000
--- a/units/systemd-bus-proxyd.service.m4.in
+++ /dev/null
@@ -1,19 +0,0 @@
@@ -5003,7 +5003,7 @@ index ffaf0bdc8..000000000
-ProtectHome=yes
diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket
deleted file mode 100644
-index 3f80a1d54..000000000
+index 3f80a1d547..0000000000
--- a/units/systemd-bus-proxyd.socket
+++ /dev/null
@@ -1,12 +0,0 @@
@@ -5020,7 +5020,7 @@ index 3f80a1d54..000000000
-[Socket]
-ListenStream=/var/run/dbus/system_bus_socket
diff --git a/units/user/.gitignore b/units/user/.gitignore
-index 6111b10cc..41a74f546 100644
+index 6111b10ccf..41a74f5461 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1,3 +1 @@
@@ -5029,7 +5029,7 @@ index 6111b10cc..41a74f546 100644
-/systemd-consoled.service
diff --git a/units/user/systemd-bus-proxyd.service.in b/units/user/systemd-bus-proxyd.service.in
deleted file mode 100644
-index e1e399dc3..000000000
+index e1e399dc32..0000000000
--- a/units/user/systemd-bus-proxyd.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
@@ -5048,7 +5048,7 @@ index e1e399dc3..000000000
-NotifyAccess=main
diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket
deleted file mode 100644
-index b9efc0e7c..000000000
+index b9efc0e7ce..0000000000
--- a/units/user/systemd-bus-proxyd.socket
+++ /dev/null
@@ -1,12 +0,0 @@
diff --git a/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch b/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch
index 17102bd..ba5c0d2 100644
--- a/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch
+++ b/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch
@@ -39,7 +39,7 @@ Resolves: #1426214
11 files changed, 189 insertions(+), 4 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index c5199d3a5..aa5831cc2 100644
+index c5199d3a54..aa5831cc2c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -293,6 +293,33 @@
@@ -77,7 +77,7 @@ index c5199d3a5..aa5831cc2 100644
<term><varname>StandardInput=</varname></term>
<listitem><para>Controls where file descriptor 0 (STDIN) of
diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run
-index 5145cd3f2..36ffa46db 100644
+index 5145cd3f29..36ffa46db5 100644
--- a/shell-completion/bash/systemd-run
+++ b/shell-completion/bash/systemd-run
@@ -73,7 +73,7 @@ _systemd_run() {
@@ -90,7 +90,7 @@ index 5145cd3f2..36ffa46db 100644
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index a9f7971cd..da8b10d2b 100644
+index a9f7971cde..da8b10d2b3 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -597,6 +597,7 @@ const sd_bus_vtable bus_exec_vtable[] = {
@@ -142,7 +142,7 @@ index a9f7971cd..da8b10d2b 100644
uint64_t rl;
rlim_t x;
diff --git a/src/core/execute.c b/src/core/execute.c
-index 863babd76..f72b20966 100644
+index 863babd761..f72b20966f 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1256,6 +1256,34 @@ static int build_environment(
@@ -227,7 +227,7 @@ index 863babd76..f72b20966 100644
fprintf(f,
"%sNice: %i\n",
diff --git a/src/core/execute.h b/src/core/execute.h
-index 6e0c9faa7..cadd0e6b4 100644
+index 6e0c9faa75..cadd0e6b47 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -96,6 +96,7 @@ struct ExecRuntime {
@@ -239,7 +239,7 @@ index 6e0c9faa7..cadd0e6b4 100644
struct rlimit *rlimit[_RLIMIT_MAX];
char *working_directory, *root_directory;
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index c866a9cd0..b50fe45b4 100644
+index c866a9cd02..b50fe45b47 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -33,6 +33,7 @@ $1.CPUAffinity, config_parse_exec_cpu_affinity, 0,
@@ -251,7 +251,7 @@ index c866a9cd0..b50fe45b4 100644
$1.StandardOutput, config_parse_output, 0, offsetof($1, exec_context.std_output)
$1.StandardError, config_parse_output, 0, offsetof($1, exec_context.std_error)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 3a3c456da..c450fe2c7 100644
+index 3a3c456da5..c450fe2c72 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2265,6 +2265,71 @@ int config_parse_environ(const char *unit,
@@ -327,7 +327,7 @@ index 3a3c456da..c450fe2c7 100644
const char *filename,
unsigned line,
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 7c69e5369..9dd7d1bda 100644
+index 7c69e53699..9dd7d1bda0 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -85,6 +85,7 @@ int config_parse_syscall_filter(const char *unit, const char *filename, unsigned
@@ -339,7 +339,7 @@ index 7c69e5369..9dd7d1bda 100644
int config_parse_cpu_shares(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_memory_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index d35776087..ed0849b63 100644
+index d357760870..ed0849b638 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1535,7 +1535,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
@@ -352,7 +352,7 @@ index d35776087..ed0849b63 100644
r = sd_bus_message_append(m, "v", "as", 1, eq);
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
-index e8da4c978..581d84a20 100644
+index e8da4c978a..581d84a20b 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -136,6 +136,21 @@ bool strv_env_is_valid(char **e) {
@@ -378,7 +378,7 @@ index e8da4c978..581d84a20 100644
char **p, **q;
diff --git a/src/shared/env-util.h b/src/shared/env-util.h
-index 252d87be1..b8c2d81e4 100644
+index 252d87be1f..b8c2d81e4a 100644
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -34,6 +34,7 @@ bool strv_env_is_valid(char **e);
diff --git a/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch b/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch
index ef805c9..d2f8574 100644
--- a/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch
+++ b/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch
@@ -28,7 +28,7 @@ Related: #1426214
create mode 100644 test/exec-passenvironment.service
diff --git a/Makefile.am b/Makefile.am
-index 924b34b69..e9ceac98a 100644
+index 924b34b699..e9ceac98a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1477,6 +1477,10 @@ EXTRA_DIST += \
@@ -43,7 +43,7 @@ index 924b34b69..e9ceac98a 100644
test/exec-ignoresigpipe-no.service \
test/exec-ignoresigpipe-yes.service \
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 5a02960e7..8def1946d 100644
+index 5a02960e76..8def1946dc 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -142,6 +142,19 @@ static void test_exec_environment(Manager *m) {
@@ -76,7 +76,7 @@ index 5a02960e7..8def1946d 100644
NULL,
diff --git a/test/exec-passenvironment-absent.service b/test/exec-passenvironment-absent.service
new file mode 100644
-index 000000000..7d5e32a4e
+index 0000000000..7d5e32a4eb
--- /dev/null
+++ b/test/exec-passenvironment-absent.service
@@ -0,0 +1,7 @@
@@ -89,7 +89,7 @@ index 000000000..7d5e32a4e
+PassEnvironment=VAR1 VAR2 VAR3
diff --git a/test/exec-passenvironment-empty.service b/test/exec-passenvironment-empty.service
new file mode 100644
-index 000000000..c93c197c1
+index 0000000000..c93c197c10
--- /dev/null
+++ b/test/exec-passenvironment-empty.service
@@ -0,0 +1,8 @@
@@ -103,7 +103,7 @@ index 000000000..c93c197c1
+PassEnvironment=
diff --git a/test/exec-passenvironment-repeated.service b/test/exec-passenvironment-repeated.service
new file mode 100644
-index 000000000..5e8c56f26
+index 0000000000..5e8c56f26a
--- /dev/null
+++ b/test/exec-passenvironment-repeated.service
@@ -0,0 +1,8 @@
@@ -117,7 +117,7 @@ index 000000000..5e8c56f26
+PassEnvironment=VAR1 VAR3
diff --git a/test/exec-passenvironment.service b/test/exec-passenvironment.service
new file mode 100644
-index 000000000..b4a990968
+index 0000000000..b4a9909682
--- /dev/null
+++ b/test/exec-passenvironment.service
@@ -0,0 +1,7 @@
diff --git a/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch b/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch
index 1791b46..0a69847 100644
--- a/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch
+++ b/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch
@@ -29,7 +29,7 @@ Related: #1426214
1 file changed, 21 insertions(+)
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 8def1946d..6e5567c3e 100644
+index 8def1946dc..6e5567c3ed 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -143,6 +143,17 @@ static void test_exec_environment(Manager *m) {
diff --git a/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch b/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch
index 81c54f2..604750c 100644
--- a/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch
+++ b/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch
@@ -10,7 +10,7 @@ Resolves: #1428110
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index c450fe2c7..6fc4d745d 100644
+index c450fe2c72..6fc4d745d5 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3384,6 +3384,7 @@ int config_parse_runtime_directory(
diff --git a/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch b/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch
index efbd01b..6eedf16 100644
--- a/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch
+++ b/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch
@@ -11,7 +11,7 @@ Resolves: #1413477
1 file changed, 2 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 88906655e..a7ae2f867 100644
+index 88906655ef..a7ae2f8673 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -263,6 +263,8 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr*
diff --git a/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch b/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch
index 107b6ea..9711fe7 100644
--- a/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch
+++ b/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch
@@ -12,7 +12,7 @@ Related: #1413477
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index a7ae2f867..a9cd73b72 100644
+index a7ae2f8673..a9cd73b727 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -265,7 +265,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr*
diff --git a/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch b/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch
index ad750ae..fe75e75 100644
--- a/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch
+++ b/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch
@@ -31,7 +31,7 @@ Resolves: #1274401
2 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 0164dc921..c928d412b 100644
+index 0164dc9214..c928d412b7 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -15,3 +15,28 @@ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_target", TEST!="[module/sg]", RUN+="/sbin
@@ -64,7 +64,7 @@ index 0164dc921..c928d412b 100644
+
+LABEL="zfcp_scsi_device_end"
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 88a812ff5..19447201b 100644
+index 88a812ff53..19447201b4 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -615,27 +615,23 @@ static struct udev_device *handle_bcma(struct udev_device *parent, char **path)
diff --git a/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch b/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch
index b493f34..15522a4 100644
--- a/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch
+++ b/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch
@@ -10,7 +10,7 @@ Resolves: #1387398
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 6fc4d745d..4830d7ad6 100644
+index 6fc4d745d5..4830d7ad6f 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1028,10 +1028,10 @@ int config_parse_bounding_set(const char *unit,
diff --git a/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch b/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch
index 8198b6e..2be413b 100644
--- a/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch
+++ b/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch
@@ -16,7 +16,7 @@ Resolves: #1387398
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 4830d7ad6..ab3b0c2e9 100644
+index 4830d7ad6f..ab3b0c2e92 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1015,23 +1015,22 @@ int config_parse_exec_secure_bits(const char *unit,
diff --git a/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch b/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch
index 9d2246c..ec5c1bc 100644
--- a/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch
+++ b/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch
@@ -10,7 +10,7 @@ Resolves: #1387398
1 file changed, 45 insertions(+)
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 038430505..0f00a8fff 100644
+index 0384305051..0f00a8fff1 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -24,6 +24,7 @@
diff --git a/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch b/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch
index b7be88c..9537586 100644
--- a/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch
+++ b/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch
@@ -25,7 +25,7 @@ Resolves: #1387398
13 files changed, 96 insertions(+), 81 deletions(-)
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index da8b10d2b..a564c53fa 100644
+index da8b10d2b3..a564c53fae 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -324,9 +324,7 @@ static int property_get_capability_bounding_set(
@@ -40,7 +40,7 @@ index da8b10d2b..a564c53fa 100644
static int property_get_capabilities(
diff --git a/src/core/execute.c b/src/core/execute.c
-index f72b20966..40db11e28 100644
+index f72b20966f..40db11e284 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1733,8 +1733,8 @@ static int exec_child(
@@ -78,7 +78,7 @@ index f72b20966..40db11e28 100644
fputs("\n", f);
diff --git a/src/core/execute.h b/src/core/execute.h
-index cadd0e6b4..40f7b794c 100644
+index cadd0e6b47..40f7b794c5 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -150,7 +150,7 @@ struct ExecContext {
@@ -91,7 +91,7 @@ index cadd0e6b4..40f7b794c 100644
cap_t capabilities;
int secure_bits;
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index b50fe45b4..e4ce29210 100644
+index b50fe45b47..e4ce292100 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -47,7 +47,7 @@ $1.SyslogLevel, config_parse_log_level, 0,
@@ -104,7 +104,7 @@ index b50fe45b4..e4ce29210 100644
$1.NoNewPrivileges, config_parse_no_new_privileges, 0, offsetof($1, exec_context)
m4_ifdef(`HAVE_SECCOMP',
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index ab3b0c2e9..dbaaf2fee 100644
+index ab3b0c2e92..dbaaf2fee7 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1015,7 +1015,7 @@ int config_parse_exec_secure_bits(const char *unit,
@@ -169,7 +169,7 @@ index ab3b0c2e9..dbaaf2fee 100644
{ config_parse_unit_deps, "UNIT [...]" },
{ config_parse_exec, "PATH [ARGUMENT [...]]" },
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 9dd7d1bda..2059353d3 100644
+index 9dd7d1bda0..2059353d38 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -54,7 +54,7 @@ int config_parse_exec_cpu_sched_prio(const char *unit, const char *filename, uns
@@ -182,7 +182,7 @@ index 9dd7d1bda..2059353d3 100644
int config_parse_bytes_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_sec_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/core/main.c b/src/core/main.c
-index a0df1e5ce..cba992cea 100644
+index a0df1e5cec..cba992cea2 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -108,7 +108,7 @@ static usec_t arg_runtime_watchdog = 0;
@@ -222,7 +222,7 @@ index a0df1e5ce..cba992cea 100644
log_emergency_errno(r, "Failed to drop capability bounding set: %m");
error_message = "Failed to drop capability bounding set";
diff --git a/src/core/unit.c b/src/core/unit.c
-index 4eb0d78f4..103f92084 100644
+index 4eb0d78f44..103f92084c 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3213,7 +3213,7 @@ int unit_patch_contexts(Unit *u) {
@@ -235,7 +235,7 @@ index 4eb0d78f4..103f92084 100644
cc = unit_get_cgroup_context(u);
diff --git a/src/import/import-common.c b/src/import/import-common.c
-index f10a453ee..243e657c5 100644
+index f10a453eed..243e657c56 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -526,7 +526,7 @@ int import_fork_tar(const char *path, pid_t *ret) {
@@ -248,7 +248,7 @@ index f10a453ee..243e657c5 100644
log_error_errno(r, "Failed to drop capabilities, ignoring: %m");
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index a37b64094..d0003d379 100644
+index a37b64094b..d0003d3790 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1863,7 +1863,7 @@ static int setup_journal(const char *directory) {
@@ -261,7 +261,7 @@ index a37b64094..d0003d379 100644
static int register_machine(pid_t pid, int local_ifindex) {
diff --git a/src/shared/capability.c b/src/shared/capability.c
-index 2b963fde3..3ed31df5a 100644
+index 2b963fde3f..3ed31df5ab 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -98,7 +98,7 @@ unsigned long cap_last_cap(void) {
@@ -328,7 +328,7 @@ index 2b963fde3..3ed31df5a 100644
return log_error_errno(r, "Failed to drop capabilities: %m");
diff --git a/src/shared/capability.h b/src/shared/capability.h
-index 6f2f6f997..04cd6e54e 100644
+index 6f2f6f997d..04cd6e54e2 100644
--- a/src/shared/capability.h
+++ b/src/shared/capability.h
@@ -27,10 +27,12 @@
@@ -357,7 +357,7 @@ index 6f2f6f997..04cd6e54e 100644
+ return (caps & m) == m;
+}
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 0f00a8fff..38ecfe972 100644
+index 0f00a8fff1..38ecfe972e 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -550,6 +550,53 @@ static uint64_t make_cap(int cap) {
diff --git a/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch b/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch
index 377bece..94ed94e 100644
--- a/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch
+++ b/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch
@@ -45,7 +45,7 @@ Resolves: #1387398
9 files changed, 174 insertions(+), 17 deletions(-)
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index a564c53fa..817ef80d1 100644
+index a564c53fae..817ef80d1f 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -327,6 +327,24 @@ static int property_get_capability_bounding_set(
@@ -82,7 +82,7 @@ index a564c53fa..817ef80d1 100644
SD_BUS_PROPERTY("Group", "s", NULL, offsetof(ExecContext, group), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("SupplementaryGroups", "as", NULL, offsetof(ExecContext, supplementary_groups), SD_BUS_VTABLE_PROPERTY_CONST),
diff --git a/src/core/execute.c b/src/core/execute.c
-index 40db11e28..4265b9c34 100644
+index 40db11e284..4265b9c348 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -696,12 +696,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) {
@@ -226,7 +226,7 @@ index 40db11e28..4265b9c34 100644
fprintf(f, "%sUser: %s\n", prefix, c->user);
if (c->group)
diff --git a/src/core/execute.h b/src/core/execute.h
-index 40f7b794c..00bf99cbe 100644
+index 40f7b794c5..00bf99cbea 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -152,6 +152,8 @@ struct ExecContext {
@@ -239,7 +239,7 @@ index 40f7b794c..00bf99cbe 100644
int secure_bits;
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index e4ce29210..f996032cf 100644
+index e4ce292100..f996032cf2 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -48,6 +48,7 @@ $1.SyslogLevelPrefix, config_parse_bool, 0,
@@ -251,7 +251,7 @@ index e4ce29210..f996032cf 100644
$1.NoNewPrivileges, config_parse_no_new_privileges, 0, offsetof($1, exec_context)
m4_ifdef(`HAVE_SECCOMP',
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index dbaaf2fee..7d1ac6c25 100644
+index dbaaf2fee7..7d1ac6c251 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -61,6 +61,7 @@
@@ -280,7 +280,7 @@ index dbaaf2fee..7d1ac6c25 100644
}
diff --git a/src/shared/capability.c b/src/shared/capability.c
-index 3ed31df5a..6e3d7d22e 100644
+index 3ed31df5ab..6e3d7d22e0 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -98,6 +98,61 @@ unsigned long cap_last_cap(void) {
@@ -346,7 +346,7 @@ index 3ed31df5a..6e3d7d22e 100644
_cleanup_cap_free_ cap_t after_cap = NULL;
cap_flag_value_t fv;
diff --git a/src/shared/capability.h b/src/shared/capability.h
-index 04cd6e54e..76a756856 100644
+index 04cd6e54e2..76a7568561 100644
--- a/src/shared/capability.h
+++ b/src/shared/capability.h
@@ -36,6 +36,9 @@ int capability_bounding_set_drop_usermode(uint64_t keep);
@@ -360,7 +360,7 @@ index 04cd6e54e..76a756856 100644
DEFINE_TRIVIAL_CLEANUP_FUNC(cap_t, cap_free);
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 4b36a9c93..a7771bc99 100644
+index 4b36a9c93a..a7771bc996 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -1004,3 +1004,19 @@ static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, uns
@@ -384,7 +384,7 @@ index 4b36a9c93..a7771bc99 100644
+#define PR_CAP_AMBIENT_CLEAR_ALL 4
+#endif
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
-index 38ecfe972..cfa3d2316 100644
+index 38ecfe972e..cfa3d23166 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -38,6 +38,7 @@
diff --git a/SOURCES/0467-man-add-AmbientCapabilities-entry.patch b/SOURCES/0467-man-add-AmbientCapabilities-entry.patch
index f279e12..5344192 100644
--- a/SOURCES/0467-man-add-AmbientCapabilities-entry.patch
+++ b/SOURCES/0467-man-add-AmbientCapabilities-entry.patch
@@ -10,7 +10,7 @@ Resolves: #1387398
1 file changed, 29 insertions(+)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index aa5831cc2..1b14ced78 100644
+index aa5831cc2c..1b14ced788 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -766,6 +766,35 @@
diff --git a/SOURCES/0468-test-capability-rebase-to-upstream-version.patch b/SOURCES/0468-test-capability-rebase-to-upstream-version.patch
index 6d163a4..78eac55 100644
--- a/SOURCES/0468-test-capability-rebase-to-upstream-version.patch
+++ b/SOURCES/0468-test-capability-rebase-to-upstream-version.patch
@@ -26,7 +26,7 @@ Related: #1387398
create mode 100644 test/exec-capabilityboundingset-simple.service
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
-index 43769923b..67a9ec2d1 100644
+index 43769923b0..67a9ec2d14 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -17,21 +17,22 @@
@@ -164,7 +164,7 @@ index 43769923b..67a9ec2d1 100644
return 0;
}
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 6e5567c3e..8e70702cb 100644
+index 6e5567c3ed..8e70702cbb 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -17,7 +17,11 @@
@@ -241,7 +241,7 @@ index 6e5567c3e..8e70702cb 100644
test_function_t *test = NULL;
diff --git a/test/exec-capabilityambientset-merge-nfsnobody.service b/test/exec-capabilityambientset-merge-nfsnobody.service
new file mode 100644
-index 000000000..00bec581b
+index 0000000000..00bec581b5
--- /dev/null
+++ b/test/exec-capabilityambientset-merge-nfsnobody.service
@@ -0,0 +1,9 @@
@@ -256,7 +256,7 @@ index 000000000..00bec581b
+AmbientCapabilities=CAP_NET_RAW
diff --git a/test/exec-capabilityambientset-merge.service b/test/exec-capabilityambientset-merge.service
new file mode 100644
-index 000000000..64964380e
+index 0000000000..64964380e2
--- /dev/null
+++ b/test/exec-capabilityambientset-merge.service
@@ -0,0 +1,9 @@
@@ -271,7 +271,7 @@ index 000000000..64964380e
+AmbientCapabilities=CAP_NET_RAW
diff --git a/test/exec-capabilityambientset-nfsnobody.service b/test/exec-capabilityambientset-nfsnobody.service
new file mode 100644
-index 000000000..614cfdd58
+index 0000000000..614cfdd584
--- /dev/null
+++ b/test/exec-capabilityambientset-nfsnobody.service
@@ -0,0 +1,8 @@
@@ -285,7 +285,7 @@ index 000000000..614cfdd58
+AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW
diff --git a/test/exec-capabilityambientset.service b/test/exec-capabilityambientset.service
new file mode 100644
-index 000000000..d63f884ef
+index 0000000000..d63f884ef8
--- /dev/null
+++ b/test/exec-capabilityambientset.service
@@ -0,0 +1,8 @@
@@ -299,7 +299,7 @@ index 000000000..d63f884ef
+AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW
diff --git a/test/exec-capabilityboundingset-invert.service b/test/exec-capabilityboundingset-invert.service
new file mode 100644
-index 000000000..fd5d24870
+index 0000000000..fd5d248702
--- /dev/null
+++ b/test/exec-capabilityboundingset-invert.service
@@ -0,0 +1,7 @@
@@ -312,7 +312,7 @@ index 000000000..fd5d24870
+CapabilityBoundingSet=~CAP_CHOWN
diff --git a/test/exec-capabilityboundingset-merge.service b/test/exec-capabilityboundingset-merge.service
new file mode 100644
-index 000000000..5c7fcaf43
+index 0000000000..5c7fcaf437
--- /dev/null
+++ b/test/exec-capabilityboundingset-merge.service
@@ -0,0 +1,8 @@
@@ -326,7 +326,7 @@ index 000000000..5c7fcaf43
+CapabilityBoundingSet=CAP_KILL CAP_CHOWN
diff --git a/test/exec-capabilityboundingset-reset.service b/test/exec-capabilityboundingset-reset.service
new file mode 100644
-index 000000000..d7d332020
+index 0000000000..d7d3320204
--- /dev/null
+++ b/test/exec-capabilityboundingset-reset.service
@@ -0,0 +1,8 @@
@@ -340,7 +340,7 @@ index 000000000..d7d332020
+CapabilityBoundingSet=
diff --git a/test/exec-capabilityboundingset-simple.service b/test/exec-capabilityboundingset-simple.service
new file mode 100644
-index 000000000..bf1a7f575
+index 0000000000..bf1a7f575a
--- /dev/null
+++ b/test/exec-capabilityboundingset-simple.service
@@ -0,0 +1,7 @@
diff --git a/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch b/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch
index e967192..bec94a4 100644
--- a/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch
+++ b/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch
@@ -15,7 +15,7 @@ Resolves: #1433687
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 1070e32c4..3e13cc1fd 100644
+index 1070e32c4a..3e13cc1fdb 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -7332,22 +7332,21 @@ int bind_remount_recursive(const char *prefix, bool ro) {
diff --git a/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch b/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch
index ff0d13c..25917d1 100644
--- a/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch
+++ b/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch
@@ -15,7 +15,7 @@ Resolves: #1438749
1 file changed, 3 insertions(+)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index 7e0e7fc28..fe6fae151 100644
+index 7e0e7fc283..fe6fae1510 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -500,6 +500,9 @@ static int load_sysv(SysvStub *s) {
diff --git a/SOURCES/0471-Install-correctly-report-symlink-creations.patch b/SOURCES/0471-Install-correctly-report-symlink-creations.patch
index 3af8ca7..cfff4c7 100644
--- a/SOURCES/0471-Install-correctly-report-symlink-creations.patch
+++ b/SOURCES/0471-Install-correctly-report-symlink-creations.patch
@@ -22,7 +22,7 @@ Resolves: #1435098
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index bdfd7b96a..e73f0c95b 100644
+index bdfd7b96a2..e73f0c95bd 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -283,7 +283,7 @@ static int create_symlink(
diff --git a/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch b/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch
index 9a4a0b7..0ab45a7 100644
--- a/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch
+++ b/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch
@@ -10,7 +10,7 @@ Related: #1274401
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index c928d412b..34a1df9c4 100644
+index c928d412b7..34a1df9c48 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -29,14 +29,10 @@ ACTION=="remove", GOTO="zfcp_scsi_device_end"
diff --git a/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch b/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch
index cc26007..d9dbb89 100644
--- a/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch
+++ b/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch
@@ -18,7 +18,7 @@ Resolves: #1225739
2 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index fc1fe13ac..fc9db622e 100644
+index fc1fe13aca..fc9db622e5 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -161,6 +161,13 @@
@@ -45,7 +45,7 @@ index fc1fe13ac..fc9db622e 100644
<literal>-</literal>, no automatic clean-up is
done.</para>
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index bda89df5b..df7676b57 100644
+index bda89df5be..df7676b572 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -79,6 +79,7 @@ typedef enum ItemType {
diff --git a/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch b/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch
index 1ba2f79..907683e 100644
--- a/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch
+++ b/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch
@@ -14,7 +14,7 @@ Resolves: #1433687
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 3e13cc1fd..cadaddee3 100644
+index 3e13cc1fdb..cadaddee32 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -7327,7 +7327,7 @@ int bind_remount_recursive(const char *prefix, bool ro) {
diff --git a/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch b/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch
index eeb6031..7c1e37c 100644
--- a/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch
+++ b/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch
@@ -40,7 +40,7 @@ Resolves: #1337244
14 files changed, 236 insertions(+), 27 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 57b3b90be..d367ccd13 100644
+index 57b3b90be1..d367ccd130 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -51,14 +51,14 @@
@@ -84,7 +84,7 @@ index 57b3b90be..d367ccd13 100644
for details on the per-unit settings.</para></listitem>
</varlistentry>
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
-index 8f4e7a3f1..6b9329bbe 100644
+index 8f4e7a3f16..6b9329bbee 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -103,10 +103,10 @@
@@ -195,7 +195,7 @@ index 8f4e7a3f1..6b9329bbe 100644
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index b7f08fb42..d4a8f9cbe 100644
+index b7f08fb420..d4a8f9cbe3 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -40,6 +40,7 @@ void cgroup_context_init(CGroupContext *c) {
@@ -285,7 +285,7 @@ index b7f08fb42..d4a8f9cbe 100644
[CGROUP_AUTO] = "auto",
[CGROUP_CLOSED] = "closed",
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
-index 8fa851de3..8af3eaa3a 100644
+index 8fa851de32..8af3eaa3ae 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -72,6 +72,7 @@ struct CGroupContext {
@@ -314,7 +314,7 @@ index 8fa851de3..8af3eaa3a 100644
const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_;
CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_;
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index 4a9df0601..a4465dc7a 100644
+index 4a9df06016..a4465dc7aa 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -168,6 +168,8 @@ const sd_bus_vtable bus_cgroup_vtable[] = {
@@ -380,7 +380,7 @@ index 4a9df0601..a4465dc7a 100644
if (u->transient && u->load_state == UNIT_STUB) {
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 056a17ac1..1d0d6f67c 100644
+index 056a17ac1f..1d0d6f67c7 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -673,11 +673,36 @@ static int property_get_current_memory(
@@ -421,7 +421,7 @@ index 056a17ac1..1d0d6f67c 100644
};
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index f996032cf..26e4c618e 100644
+index f996032cf2..26e4c618ee 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -125,6 +125,8 @@ $1.StartupBlockIOWeight, config_parse_blockio_weight, 0,
@@ -434,7 +434,7 @@ index f996032cf..26e4c618e 100644
)m4_dnl
Unit.Description, config_parse_unit_string_printf, 0, offsetof(Unit, description)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 7d1ac6c25..7d2e737d0 100644
+index 7d1ac6c251..7d2e737d05 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3052,7 +3052,7 @@ int config_parse_memory_limit(
@@ -496,7 +496,7 @@ index 7d1ac6c25..7d2e737d0 100644
const char *unit,
const char *filename,
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index 2059353d3..8d334f2c8 100644
+index 2059353d38..8d334f2c86 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -89,6 +89,7 @@ int config_parse_pass_environ(const char *unit, const char *filename, unsigned l
@@ -508,7 +508,7 @@ index 2059353d3..8d334f2c8 100644
int config_parse_device_allow(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_blockio_weight(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/core/main.c b/src/core/main.c
-index cba992cea..aca05a535 100644
+index cba992cea2..aca05a5358 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -117,6 +117,7 @@ static bool arg_default_cpu_accounting = false;
@@ -536,7 +536,7 @@ index cba992cea..aca05a535 100644
m->shutdown_watchdog = arg_shutdown_watchdog;
diff --git a/src/core/manager.h b/src/core/manager.h
-index 231c076b1..96dcd83dc 100644
+index 231c076b10..96dcd83dc0 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -261,6 +261,7 @@ struct Manager {
@@ -548,7 +548,7 @@ index 231c076b1..96dcd83dc 100644
usec_t default_timer_accuracy_usec;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 103f92084..2fcb4fbf0 100644
+index 103f92084c..2fcb4fbf07 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -126,6 +126,7 @@ static void unit_init(Unit *u) {
@@ -560,7 +560,7 @@ index 103f92084..2fcb4fbf0 100644
ec = unit_get_exec_context(u);
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
-index 96a3d3baf..31bd8d311 100644
+index 96a3d3bafa..31bd8d311f 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -35,6 +35,7 @@ typedef enum CGroupControllerMask {
@@ -572,7 +572,7 @@ index 96a3d3baf..31bd8d311 100644
} CGroupControllerMask;
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 0333599c8..b1862b567 100644
+index 0333599c87..b1862b5676 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3280,6 +3280,8 @@ typedef struct UnitStatusInfo {
diff --git a/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch b/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch
index 2c6a5dc..3cb0bb9 100644
--- a/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch
+++ b/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch
@@ -22,7 +22,7 @@ Related: #1337244
10 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index d367ccd13..53e8ff665 100644
+index d367ccd130..53e8ff665a 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -1,4 +1,4 @@
@@ -50,7 +50,7 @@ index d367ccd13..53e8ff665 100644
<term><varname>DefaultLimitCPU=</varname></term>
<term><varname>DefaultLimitFSIZE=</varname></term>
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
-index 6b9329bbe..217105ee5 100644
+index 6b9329bbee..217105ee5a 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -231,7 +231,10 @@
@@ -66,7 +66,7 @@ index 6b9329bbe..217105ee5 100644
</varlistentry>
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 7ba1b519e..c92f8c6bf 100644
+index 7ba1b519ea..c92f8c6bfc 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2039,6 +2039,7 @@ const sd_bus_vtable bus_manager_vtable[] = {
@@ -78,7 +78,7 @@ index 7ba1b519e..c92f8c6bf 100644
SD_BUS_METHOD("GetUnit", "s", "o", method_get_unit, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("GetUnitByPID", "u", "o", method_get_unit_by_pid, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 26e4c618e..b2fe627af 100644
+index 26e4c618ee..b2fe627af3 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -126,7 +126,7 @@ $1.BlockIODeviceWeight, config_parse_blockio_device_weight, 0,
@@ -91,7 +91,7 @@ index 26e4c618e..b2fe627af 100644
)m4_dnl
Unit.Description, config_parse_unit_string_printf, 0, offsetof(Unit, description)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 7d2e737d0..c1ffee2c7 100644
+index 7d2e737d05..c1ffee2c7e 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3081,12 +3081,11 @@ int config_parse_tasks_max(
@@ -119,7 +119,7 @@ index 7d2e737d0..c1ffee2c7 100644
}
diff --git a/src/core/main.c b/src/core/main.c
-index aca05a535..50c9714f7 100644
+index aca05a5358..50c9714f78 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -118,6 +118,7 @@ static bool arg_default_blockio_accounting = false;
@@ -147,7 +147,7 @@ index aca05a535..50c9714f7 100644
m->shutdown_watchdog = arg_shutdown_watchdog;
diff --git a/src/core/manager.h b/src/core/manager.h
-index 96dcd83dc..e91e7bd8b 100644
+index 96dcd83dc0..e91e7bd8b3 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -263,6 +263,7 @@ struct Manager {
@@ -159,7 +159,7 @@ index 96dcd83dc..e91e7bd8b 100644
struct rlimit *rlimit[_RLIMIT_MAX];
diff --git a/src/core/system.conf b/src/core/system.conf
-index a11f59903..91ef01cd0 100644
+index a11f599038..91ef01cd0f 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -40,6 +40,8 @@
@@ -172,7 +172,7 @@ index a11f59903..91ef01cd0 100644
#DefaultLimitFSIZE=
#DefaultLimitDATA=
diff --git a/src/core/unit.c b/src/core/unit.c
-index 2fcb4fbf0..6a2ad6ed3 100644
+index 2fcb4fbf07..6a2ad6ed38 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -127,6 +127,9 @@ static void unit_init(Unit *u) {
@@ -186,7 +186,7 @@ index 2fcb4fbf0..6a2ad6ed3 100644
ec = unit_get_exec_context(u);
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index cf757d2b2..c5d9e4bb5 100644
+index cf757d2b23..c5d9e4bb58 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1606,7 +1606,8 @@ static const char mask_names[] =
diff --git a/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch b/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch
index 00826ab..11ca7cb 100644
--- a/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch
+++ b/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch
@@ -32,7 +32,7 @@ Resolves: #1337244
9 files changed, 160 insertions(+), 25 deletions(-)
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
-index 54651f07d..bcc8ee975 100644
+index 54651f07d2..bcc8ee9753 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -1,4 +1,4 @@
@@ -62,7 +62,7 @@ index 54651f07d..bcc8ee975 100644
<varlistentry>
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index fb84e92e5..63b9a0df3 100644
+index fb84e92e5d..63b9a0df36 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2325,13 +2325,101 @@ int manager_dispatch_delayed(Manager *manager) {
@@ -180,7 +180,7 @@ index fb84e92e5..63b9a0df3 100644
if (r < 0)
return r;
diff --git a/src/login/logind-gperf.gperf b/src/login/logind-gperf.gperf
-index 62460673b..8a064e2a9 100644
+index 62460673b9..8a064e2a96 100644
--- a/src/login/logind-gperf.gperf
+++ b/src/login/logind-gperf.gperf
@@ -33,3 +33,4 @@ Login.IdleAction, config_parse_handle_action, 0, offsetof(Manag
@@ -189,7 +189,7 @@ index 62460673b..8a064e2a9 100644
Login.RemoveIPC, config_parse_bool, 0, offsetof(Manager, remove_ipc)
+Login.UserTasksMax, config_parse_uint64, 0, offsetof(Manager, user_tasks_max)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 746e50aa5..4575a029f 100644
+index 746e50aa51..4575a029fe 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -510,21 +510,28 @@ static int session_start_scope(Session *s) {
@@ -239,7 +239,7 @@ index 746e50aa5..4575a029f 100644
return 0;
}
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
-index 5002b6868..d662082d8 100644
+index 5002b68689..d662082d85 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -115,7 +115,8 @@ struct Session {
@@ -253,7 +253,7 @@ index 5002b6868..d662082d8 100644
sd_bus_message *create_message;
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index 97eb4feca..4298704ce 100644
+index 97eb4feca9..4298704cea 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -33,6 +33,7 @@
@@ -329,7 +329,7 @@ index 97eb4feca..4298704ce 100644
return 0;
}
diff --git a/src/login/logind.c b/src/login/logind.c
-index e8d0669bb..16c931c3e 100644
+index e8d0669bbf..16c931c3e0 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -63,6 +63,7 @@ Manager *manager_new(void) {
@@ -341,7 +341,7 @@ index e8d0669bb..16c931c3e 100644
m->devices = hashmap_new(&string_hash_ops);
m->seats = hashmap_new(&string_hash_ops);
diff --git a/src/login/logind.conf b/src/login/logind.conf
-index be8d7dff2..d33e0b34d 100644
+index be8d7dff29..d33e0b34d2 100644
--- a/src/login/logind.conf
+++ b/src/login/logind.conf
@@ -31,3 +31,4 @@
@@ -350,7 +350,7 @@ index be8d7dff2..d33e0b34d 100644
#RemoveIPC=no
+#UserTasksMax=
diff --git a/src/login/logind.h b/src/login/logind.h
-index e0cb7d023..8503eb24d 100644
+index e0cb7d0238..8503eb24dd 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -128,6 +128,7 @@ struct Manager {
diff --git a/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch b/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch
index 08e52c9..faa6eaa 100644
--- a/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch
+++ b/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch
@@ -20,7 +20,7 @@ Related: #1337244
7 files changed, 187 insertions(+), 12 deletions(-)
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
-index 217105ee5..f507c6748 100644
+index 217105ee5a..f507c67487 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -221,15 +221,12 @@
@@ -46,7 +46,7 @@ index 217105ee5..f507c6748 100644
<para>Implies <literal>TasksAccounting=true</literal>. The
system default for this setting may be controlled with
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index a4465dc7a..fa76c60c1 100644
+index a4465dc7aa..fa76c60c1f 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -694,6 +694,8 @@ int bus_cgroup_set_property(
@@ -86,7 +86,7 @@ index a4465dc7a..fa76c60c1 100644
}
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index c1ffee2c7..411475024 100644
+index c1ffee2c7e..4114750244 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3089,9 +3089,18 @@ int config_parse_tasks_max(
@@ -112,7 +112,7 @@ index c1ffee2c7..411475024 100644
}
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index ed0849b63..f46fa2bbf 100644
+index ed0849b638..f46fa2bbf3 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1409,7 +1409,26 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
@@ -143,7 +143,7 @@ index ed0849b63..f46fa2bbf 100644
uint64_t u;
diff --git a/src/shared/util.c b/src/shared/util.c
-index cadaddee3..bbb457759 100644
+index cadaddee32..bbb4577590 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -94,6 +94,7 @@
@@ -242,7 +242,7 @@ index cadaddee3..bbb457759 100644
+ return m / max;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index 12afcc342..f1b6c348f 100644
+index 12afcc3429..f1b6c348f8 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1098,3 +1098,8 @@ typedef enum ExtractFlags {
@@ -255,7 +255,7 @@ index 12afcc342..f1b6c348f 100644
+uint64_t system_tasks_max(void);
+uint64_t system_tasks_max_scale(uint64_t v, uint64_t max);
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index 9ae347b43..971f97d7c 100644
+index 9ae347b434..971f97d7c3 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1530,6 +1530,43 @@ static void test_shell_maybe_quote(void) {
diff --git a/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch b/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch
index 540a1bf..c3294c1 100644
--- a/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch
+++ b/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch
@@ -25,7 +25,7 @@ Related: #1436021
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/src/core/transaction.c b/src/core/transaction.c
-index 57e9cb3f8..428b7671b 100644
+index 57e9cb3f83..428b7671b3 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -1008,40 +1008,25 @@ int transaction_add_job_and_dependencies(
diff --git a/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch b/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch
index 4053e4e..3245b52 100644
--- a/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch
+++ b/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch
@@ -24,7 +24,7 @@ Resolves: #1436021
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 703286496..1617e24c0 100644
+index 703286496f..1617e24c03 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -392,38 +392,38 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) {
@@ -81,7 +81,7 @@ index 703286496..1617e24c0 100644
}
diff --git a/src/core/job.h b/src/core/job.h
-index e4191ee77..ce81607de 100644
+index e4191ee775..ce81607de8 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -210,7 +210,7 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_;
@@ -94,7 +94,7 @@ index e4191ee77..ce81607de 100644
int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u);
diff --git a/src/core/manager.c b/src/core/manager.c
-index 8bd80e687..287cf6a74 100644
+index 8bd80e6875..287cf6a741 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1303,7 +1303,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
@@ -107,7 +107,7 @@ index 8bd80e687..287cf6a74 100644
tr = transaction_new(mode == JOB_REPLACE_IRREVERSIBLY);
if (!tr)
diff --git a/src/core/transaction.c b/src/core/transaction.c
-index 428b7671b..34df15718 100644
+index 428b7671b3..34df15718b 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -855,8 +855,7 @@ int transaction_add_job_and_dependencies(
diff --git a/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch b/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch
index 4c49410..1c531ed 100644
--- a/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch
+++ b/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch
@@ -11,7 +11,7 @@ Resolves: #1436021
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/core/transaction.c b/src/core/transaction.c
-index 34df15718..66bbb6066 100644
+index 34df15718b..66bbb60665 100644
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -1023,8 +1023,13 @@ int transaction_add_job_and_dependencies(
diff --git a/SOURCES/0482-tests-set-tasks_max-to-infinity.patch b/SOURCES/0482-tests-set-tasks_max-to-infinity.patch
index 3d35647..9e4fe5f 100644
--- a/SOURCES/0482-tests-set-tasks_max-to-infinity.patch
+++ b/SOURCES/0482-tests-set-tasks_max-to-infinity.patch
@@ -13,7 +13,7 @@ Related: #1337244
2 files changed, 16 insertions(+)
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
-index 9e9de23e0..471adb25b 100644
+index 9e9de23e0e..471adb25ba 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -45,6 +45,17 @@ static int test_cgroup_mask(void) {
@@ -35,7 +35,7 @@ index 9e9de23e0..471adb25b 100644
assert_se(manager_startup(m, serial, fdset) >= 0);
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
-index 8e70702cb..627097fcf 100644
+index 8e70702cbb..627097fcf2 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -270,6 +270,11 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch b/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch
index 85acc3d..a000dcc 100644
--- a/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch
+++ b/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch
@@ -21,7 +21,7 @@ Related: #1294516
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 723854a2e..c771cff8b 100644
+index 723854a2e9..c771cff8b8 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1039,7 +1039,7 @@ static int get_boots(
diff --git a/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch b/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch
index a53f4b3..0143277 100644
--- a/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch
+++ b/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch
@@ -27,7 +27,7 @@ Resolves: #1446140
1 file changed, 1 insertion(+)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 20456c3a1..72f312b67 100644
+index 20456c3a12..72f312b67c 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2190,6 +2190,7 @@ _public_ int sd_journal_process(sd_journal *j) {
diff --git a/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch b/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch
index a4b0a15..d54ab33 100644
--- a/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch
+++ b/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch
@@ -12,7 +12,7 @@ Resolves: #1377055
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 411475024..58e44b89b 100644
+index 4114750244..58e44b89b2 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -367,8 +367,9 @@ int config_parse_socket_listen(const char *unit,
diff --git a/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch b/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch
index 2f32336..3bf45ec 100644
--- a/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch
+++ b/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch
@@ -14,7 +14,7 @@ Resolves: #1427927
1 file changed, 10 insertions(+)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index c92f8c6bf..9d4f63377 100644
+index c92f8c6bfc..9d4f633774 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2039,6 +2039,16 @@ const sd_bus_vtable bus_manager_vtable[] = {
diff --git a/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch b/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch
index 327c72d..9e6f02d 100644
--- a/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch
+++ b/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch
@@ -16,7 +16,7 @@ Resolves: #1427927
3 files changed, 56 insertions(+)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 9d4f63377..d34ed042f 100644
+index 9d4f633774..d34ed042f6 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2049,6 +2049,22 @@ const sd_bus_vtable bus_manager_vtable[] = {
@@ -43,7 +43,7 @@ index 9d4f63377..d34ed042f 100644
SD_BUS_METHOD("GetUnit", "s", "o", method_get_unit, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index f46fa2bbf..263457427 100644
+index f46fa2bbf3..2634574279 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1937,3 +1937,42 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un
@@ -90,7 +90,7 @@ index f46fa2bbf..263457427 100644
+ return sd_bus_message_append(reply, "t", u);
+}
diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h
-index 8c8846c6e..d5f4e9750 100644
+index 8c8846c6ee..d5f4e9750d 100644
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@ -214,3 +214,4 @@ int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet);
diff --git a/SOURCES/0488-fstab-generator-remove-bogus-condition.patch b/SOURCES/0488-fstab-generator-remove-bogus-condition.patch
index a62491f..e2369b0 100644
--- a/SOURCES/0488-fstab-generator-remove-bogus-condition.patch
+++ b/SOURCES/0488-fstab-generator-remove-bogus-condition.patch
@@ -16,7 +16,7 @@ Resolves: #1446171
1 file changed, 2 deletions(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 32aca2244..23b5457e4 100644
+index 32aca22444..23b5457e43 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -476,8 +476,6 @@ static int parse_fstab(bool initrd) {
diff --git a/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch b/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch
index 92d72b9..8be0962 100644
--- a/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch
+++ b/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch
@@ -14,7 +14,7 @@ Resolves: #1387095
1 file changed, 3 insertions(+)
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
-index 822a803a4..90f7f70bc 100644
+index 822a803a41..90f7f70bce 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -106,6 +106,9 @@ static int pack_file(FILE *pack, const char *fn, bool on_btrfs) {
diff --git a/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch b/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch
index 101ea0b..0479887 100644
--- a/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch
+++ b/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch
@@ -24,7 +24,7 @@ Related: #1411199
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
-index b447b01f5..d9d51af92 100644
+index b447b01f58..d9d51af929 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -35,7 +35,7 @@ z /var/log/journal 2755 root systemd-journal - -
diff --git a/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch b/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch
index 8848799..677d002 100644
--- a/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch
+++ b/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch
@@ -15,7 +15,7 @@ Related: #1411199
1 file changed, 2 insertions(+)
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
-index d9d51af92..fcd6ec026 100644
+index d9d51af929..fcd6ec0269 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -34,6 +34,8 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
diff --git a/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch b/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch
index 24d608e..56c8b5d 100644
--- a/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch
+++ b/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch
@@ -11,7 +11,7 @@ Resolves: #1411199
1 file changed, 2 insertions(+)
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
-index fcd6ec026..0575408db 100644
+index fcd6ec0269..0575408dbe 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -33,11 +33,13 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
diff --git a/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch b/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch
index 990ea6f..c298efa 100644
--- a/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch
+++ b/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch
@@ -42,7 +42,7 @@ Resolves: #1382244
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 4fb293b9b..bb2bea7cd 100644
+index 4fb293b9b5..bb2bea7cdf 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -90,14 +90,14 @@ static int apply_sysctl(const char *property, const char *value) {
diff --git a/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch b/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch
index fabc78f..eae5ef0 100644
--- a/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch
+++ b/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch
@@ -18,7 +18,7 @@ Resolves: #1444356
1 file changed, 1 deletion(-)
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 8575912bb..c85c34932 100644
+index 8575912bbd..c85c349327 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -19,7 +19,6 @@ Sockets=systemd-journald.socket
diff --git a/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch b/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch
index 1873610..613ba48 100644
--- a/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch
+++ b/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch
@@ -18,7 +18,7 @@ Resolves: #1381743
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/notify/notify.c b/src/notify/notify.c
-index c89a6cc06..0d382992a 100644
+index c89a6cc063..0d382992a5 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -209,7 +209,7 @@ int main(int argc, char* argv[]) {
diff --git a/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch b/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch
index e9c1a13..9703498 100644
--- a/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch
+++ b/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch
@@ -13,7 +13,7 @@ Resolves: #1381743
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
-index 1474321c9..2c4dd9d22 100644
+index 1474321c95..2c4dd9d225 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -397,8 +397,9 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
diff --git a/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch b/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch
index f192f24..fd09328 100644
--- a/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch
+++ b/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch
@@ -22,7 +22,7 @@ rule when generating kdump initrd]
create mode 100644 rules/40-redhat-cpu-hotplug.rules
diff --git a/Makefile.am b/Makefile.am
-index e9ceac98a..94fee02c5 100644
+index e9ceac98a4..94fee02c57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3511,6 +3511,7 @@ dist_udevrules_DATA += \
@@ -35,7 +35,7 @@ index e9ceac98a..94fee02c5 100644
diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules
new file mode 100644
-index 000000000..bc5ddc841
+index 0000000000..bc5ddc8416
--- /dev/null
+++ b/rules/40-redhat-cpu-hotplug.rules
@@ -0,0 +1,4 @@
@@ -44,7 +44,7 @@ index 000000000..bc5ddc841
+# CPU hotadd request
+SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 34a1df9c4..d04c7fc9a 100644
+index 34a1df9c48..d04c7fc9a2 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -1,8 +1,5 @@
diff --git a/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch b/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch
index dd6ae56..396d43c 100644
--- a/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch
+++ b/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch
@@ -13,7 +13,7 @@ Resolves: #1465108
delete mode 100644 rules/40-redhat-cpu-hotplug.rules
diff --git a/Makefile.am b/Makefile.am
-index 94fee02c5..e9ceac98a 100644
+index 94fee02c57..e9ceac98a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3511,7 +3511,6 @@ dist_udevrules_DATA += \
@@ -26,7 +26,7 @@ index 94fee02c5..e9ceac98a 100644
diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules
deleted file mode 100644
-index bc5ddc841..000000000
+index bc5ddc8416..0000000000
--- a/rules/40-redhat-cpu-hotplug.rules
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -35,7 +35,7 @@ index bc5ddc841..000000000
-# CPU hotadd request
-SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index d04c7fc9a..34a1df9c4 100644
+index d04c7fc9a2..34a1df9c48 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -1,5 +1,8 @@
diff --git a/SOURCES/0499-tests-use-XFS-as-root-filesystem-for-system-tests.patch b/SOURCES/0499-tests-use-XFS-as-root-filesystem-for-system-tests.patch
index 7dff683..9d27534 100644
--- a/SOURCES/0499-tests-use-XFS-as-root-filesystem-for-system-tests.patch
+++ b/SOURCES/0499-tests-use-XFS-as-root-filesystem-for-system-tests.patch
@@ -14,7 +14,7 @@ Resolves: #1475870
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
-index 4be2365e2..6e5c53d8b 100755
+index 4be2365e2f..6e5c53d8bd 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -38,7 +38,7 @@ test_setup() {
@@ -36,7 +36,7 @@ index 4be2365e2..6e5c53d8b 100755
)
setup_nspawn_root
diff --git a/test/test-functions b/test/test-functions
-index 901ff4860..f8950e31e 100644
+index 901ff48605..f8950e31e8 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -150,7 +150,7 @@ create_empty_image() {
diff --git a/SOURCES/0500-tests-use-fdisk-instead-of-sfdisk.patch b/SOURCES/0500-tests-use-fdisk-instead-of-sfdisk.patch
index d15f912..ce3f665 100644
--- a/SOURCES/0500-tests-use-fdisk-instead-of-sfdisk.patch
+++ b/SOURCES/0500-tests-use-fdisk-instead-of-sfdisk.patch
@@ -23,7 +23,7 @@ Resolves: #1475870
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/test/test-functions b/test/test-functions
-index f8950e31e..cf5612370 100644
+index f8950e31e8..cf5612370b 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -141,15 +141,26 @@ install_missing_libraries() {
diff --git a/SOURCES/0501-Revert-udev-net_id-add-support-for-phys_port_name-at.patch b/SOURCES/0501-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
index 4b0472f..61ea843 100644
--- a/SOURCES/0501-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
+++ b/SOURCES/0501-Revert-udev-net_id-add-support-for-phys_port_name-at.patch
@@ -14,7 +14,7 @@ Resolves: #1477285
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 7c154355d..19e1f2631 100644
+index 7c154355dd..19e1f2631a 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -38,7 +38,7 @@
diff --git a/SOURCES/0502-core-unset-sysfs-path-after-transition-to-dead-state.patch b/SOURCES/0502-core-unset-sysfs-path-after-transition-to-dead-state.patch
index 9991b10..014c991 100644
--- a/SOURCES/0502-core-unset-sysfs-path-after-transition-to-dead-state.patch
+++ b/SOURCES/0502-core-unset-sysfs-path-after-transition-to-dead-state.patch
@@ -26,7 +26,7 @@ Resolves: #1408916
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index befbae83f..63a04bdd3 100644
+index befbae83fd..63a04bdd3c 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -474,12 +474,16 @@ static void device_update_found_one(Device *d, bool add, DeviceFound found, bool
diff --git a/SOURCES/0503-sysctl-fix-uninitialized-variable.patch b/SOURCES/0503-sysctl-fix-uninitialized-variable.patch
index 821541c..ab23b14 100644
--- a/SOURCES/0503-sysctl-fix-uninitialized-variable.patch
+++ b/SOURCES/0503-sysctl-fix-uninitialized-variable.patch
@@ -13,7 +13,7 @@ Resolves: #1485121
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index bb2bea7cd..7fb016cee 100644
+index bb2bea7cdf..7fb016ceea 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -91,7 +91,7 @@ static int apply_sysctl(const char *property, const char *value) {
diff --git a/SOURCES/0504-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch b/SOURCES/0504-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch
index 9c73445..54f7f64 100644
--- a/SOURCES/0504-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch
+++ b/SOURCES/0504-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch
@@ -12,7 +12,7 @@ Resolves: #1306539
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index bc115f112..0ba079201 100644
+index bc115f112d..0ba079201c 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -610,7 +610,11 @@ static int spawn_wait(struct udev_event *event,
diff --git a/SOURCES/0505-compile-with-Werror.patch b/SOURCES/0505-compile-with-Werror.patch
index 2ba63a3..8f84feb 100644
--- a/SOURCES/0505-compile-with-Werror.patch
+++ b/SOURCES/0505-compile-with-Werror.patch
@@ -27,7 +27,7 @@ Resolves: #1447937
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 2734368dc..def9fe5ce 100644
+index 2734368dc0..def9fe5ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,8 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
@@ -57,7 +57,7 @@ index 2734368dc..def9fe5ce 100644
AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*],
diff --git a/src/core/main.c b/src/core/main.c
-index 50c9714f7..37e3ea0ce 100644
+index 50c9714f78..37e3ea0ced 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1205,7 +1205,6 @@ static int status_welcome(void) {
@@ -69,7 +69,7 @@ index 50c9714f7..37e3ea0ce 100644
c = getenv("container");
if (isempty(c))
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 4575a029f..daf875a7d 100644
+index 4575a029fe..daf875a7d3 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -183,7 +183,7 @@ int session_save(Session *s) {
diff --git a/SOURCES/0506-myhostname-don-t-return-any-ipv6-entries-when-ipv6-i.patch b/SOURCES/0506-myhostname-don-t-return-any-ipv6-entries-when-ipv6-i.patch
index 683a3cc..36a2765 100644
--- a/SOURCES/0506-myhostname-don-t-return-any-ipv6-entries-when-ipv6-i.patch
+++ b/SOURCES/0506-myhostname-don-t-return-any-ipv6-entries-when-ipv6-i.patch
@@ -12,7 +12,7 @@ Resolves: #1444824
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
-index e197cc752..144c83171 100644
+index e197cc752d..144c831719 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -351,6 +351,8 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
diff --git a/SOURCES/0507-core-execute-fix-fork-fail-handling-in-exec_spawn.patch b/SOURCES/0507-core-execute-fix-fork-fail-handling-in-exec_spawn.patch
index 2574d5d..fcaae76 100644
--- a/SOURCES/0507-core-execute-fix-fork-fail-handling-in-exec_spawn.patch
+++ b/SOURCES/0507-core-execute-fix-fork-fail-handling-in-exec_spawn.patch
@@ -16,7 +16,7 @@ Resolves: #1437114
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 4265b9c34..e68276973 100644
+index 4265b9c348..e68276973b 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1977,7 +1977,7 @@ int exec_spawn(ExecCommand *command,
diff --git a/SOURCES/0508-fix-compilation-after-commit-382877acc6c029e59e359a0.patch b/SOURCES/0508-fix-compilation-after-commit-382877acc6c029e59e359a0.patch
index 1f546b2..f3d9fa3 100644
--- a/SOURCES/0508-fix-compilation-after-commit-382877acc6c029e59e359a0.patch
+++ b/SOURCES/0508-fix-compilation-after-commit-382877acc6c029e59e359a0.patch
@@ -12,7 +12,7 @@ Related: #1447937
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index def9fe5ce..ee147e28e 100644
+index def9fe5ce7..ee147e28eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,7 +188,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
diff --git a/SOURCES/0509-Redefine-32bit-time_t-format-to-signed.patch b/SOURCES/0509-Redefine-32bit-time_t-format-to-signed.patch
index 23e502c..e7bbe94 100644
--- a/SOURCES/0509-Redefine-32bit-time_t-format-to-signed.patch
+++ b/SOURCES/0509-Redefine-32bit-time_t-format-to-signed.patch
@@ -23,7 +23,7 @@ Related: #1447937
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.h b/src/shared/util.h
-index f1b6c348f..80ad18c0a 100644
+index f1b6c348f8..80ad18c0ad 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -72,7 +72,7 @@
diff --git a/SOURCES/0510-sd-bus-bus-kernel.c-fix-format-errors-on-ppc64le.patch b/SOURCES/0510-sd-bus-bus-kernel.c-fix-format-errors-on-ppc64le.patch
index 360bd21..2a06f78 100644
--- a/SOURCES/0510-sd-bus-bus-kernel.c-fix-format-errors-on-ppc64le.patch
+++ b/SOURCES/0510-sd-bus-bus-kernel.c-fix-format-errors-on-ppc64le.patch
@@ -11,7 +11,7 @@ Related: #1447937
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
-index e90ee449d..d1c90858e 100644
+index e90ee449d9..d1c90858ee 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -763,7 +763,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) {
diff --git a/SOURCES/0511-tmpfiles-with-e-don-t-attempt-to-set-permissions-whe.patch b/SOURCES/0511-tmpfiles-with-e-don-t-attempt-to-set-permissions-whe.patch
index be7b3bb..a105190 100644
--- a/SOURCES/0511-tmpfiles-with-e-don-t-attempt-to-set-permissions-whe.patch
+++ b/SOURCES/0511-tmpfiles-with-e-don-t-attempt-to-set-permissions-whe.patch
@@ -37,7 +37,7 @@ Resolves: #1445732
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index df7676b57..ed35b8cf0 100644
+index df7676b572..ed35b8cf0d 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -585,8 +585,20 @@ static int path_set_perms(Item *i, const char *path) {
diff --git a/SOURCES/0512-units-introduce-getty-pre.target-6667.patch b/SOURCES/0512-units-introduce-getty-pre.target-6667.patch
index 3d298ba..04c01e9 100644
--- a/SOURCES/0512-units-introduce-getty-pre.target-6667.patch
+++ b/SOURCES/0512-units-introduce-getty-pre.target-6667.patch
@@ -26,7 +26,7 @@ Resolves: #1173080
create mode 100644 units/getty-pre.target
diff --git a/Makefile.am b/Makefile.am
-index e9ceac98a..7c58fd050 100644
+index e9ceac98a4..7c58fd0504 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -462,6 +462,7 @@ dist_systemunit_DATA = \
@@ -38,7 +38,7 @@ index e9ceac98a..7c58fd050 100644
units/kexec.target \
units/local-fs.target \
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 553197d66..eb464f9f8 100644
+index 553197d66e..eb464f9f81 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -61,6 +61,7 @@
@@ -69,7 +69,7 @@ index 553197d66..eb464f9f8 100644
<listitem>
diff --git a/units/getty-pre.target b/units/getty-pre.target
new file mode 100644
-index 000000000..f6c78b6c2
+index 0000000000..f6c78b6c2e
--- /dev/null
+++ b/units/getty-pre.target
@@ -0,0 +1,11 @@
@@ -85,7 +85,7 @@ index 000000000..f6c78b6c2
+Documentation=man:systemd.special(7) man:systemd-getty-generator(8)
+Documentation=http://0pointer.de/blog/projects/serial-console.html
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 46164ab9d..ad4bf2103 100644
+index 46164ab9d8..ad4bf21034 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -9,7 +9,7 @@
@@ -98,7 +98,7 @@ index 46164ab9d..ad4bf2103 100644
After=rc-local.service
)m4_dnl
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index 4522d0d2b..6802333f7 100644
+index 4522d0d2be..6802333f7b 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -10,7 +10,7 @@ Description=Serial Getty on %I
diff --git a/SOURCES/0513-units-order-container-and-console-getty-units-after-.patch b/SOURCES/0513-units-order-container-and-console-getty-units-after-.patch
index 2f1eba6..03dad9d 100644
--- a/SOURCES/0513-units-order-container-and-console-getty-units-after-.patch
+++ b/SOURCES/0513-units-order-container-and-console-getty-units-after-.patch
@@ -13,7 +13,7 @@ Related: #1173080
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
-index 413d94094..61ecf8951 100644
+index 413d94094b..61ecf89517 100644
--- a/units/console-getty.service.m4.in
+++ b/units/console-getty.service.m4.in
@@ -11,7 +11,7 @@ Documentation=man:agetty(8)
@@ -26,7 +26,7 @@ index 413d94094..61ecf8951 100644
Before=getty.target
diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in
-index e126f3a48..4395ef5ce 100644
+index e126f3a489..4395ef5cec 100644
--- a/units/container-getty@.service.m4.in
+++ b/units/container-getty@.service.m4.in
@@ -10,7 +10,7 @@ Description=Container Getty on /dev/pts/%I
diff --git a/SOURCES/0514-log-never-log-into-foreign-fd-2-in-PID-1-or-its-pre-.patch b/SOURCES/0514-log-never-log-into-foreign-fd-2-in-PID-1-or-its-pre-.patch
index 917239d..ccd6334 100644
--- a/SOURCES/0514-log-never-log-into-foreign-fd-2-in-PID-1-or-its-pre-.patch
+++ b/SOURCES/0514-log-never-log-into-foreign-fd-2-in-PID-1-or-its-pre-.patch
@@ -13,7 +13,7 @@ Resolves: #1420505
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 37e3ea0ce..66393ed6a 100644
+index 37e3ea0ced..66393ed6ad 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1310,10 +1310,17 @@ int main(int argc, char *argv[]) {
@@ -37,7 +37,7 @@ index 37e3ea0ce..66393ed6a 100644
/* Running outside of a container as PID 1 */
diff --git a/src/shared/log.c b/src/shared/log.c
-index 646a1d638..349142030 100644
+index 646a1d6389..3491420308 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -52,6 +52,7 @@ static bool show_color = false;
@@ -66,7 +66,7 @@ index 646a1d638..349142030 100644
+ always_reopen_console = b;
+}
diff --git a/src/shared/log.h b/src/shared/log.h
-index 2889e1e77..3c9448f1a 100644
+index 2889e1e77f..3c9448f1a7 100644
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -210,3 +210,4 @@ LogTarget log_target_from_string(const char *s) _pure_;
diff --git a/SOURCES/0515-nspawn-new-option-to-start-as-PID2.patch b/SOURCES/0515-nspawn-new-option-to-start-as-PID2.patch
index e6276cc..05328c2 100644
--- a/SOURCES/0515-nspawn-new-option-to-start-as-PID2.patch
+++ b/SOURCES/0515-nspawn-new-option-to-start-as-PID2.patch
@@ -16,7 +16,7 @@ Resolves: #1417387
create mode 100644 src/nspawn/nspawn-stub-pid1.h
diff --git a/Makefile.am b/Makefile.am
-index 7c58fd050..0e2f8d561 100644
+index 7c58fd0504..0e2f8d561c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2658,6 +2658,8 @@ systemd_cgtop_LDADD = \
@@ -29,7 +29,7 @@ index 7c58fd050..0e2f8d561 100644
src/core/mount-setup.h \
src/core/loopback-setup.c \
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index cbd44d4ab..d0eddaacc 100644
+index cbd44d4aba..d0eddaacc3 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -241,16 +241,69 @@
@@ -110,7 +110,7 @@ index cbd44d4ab..d0eddaacc 100644
<varlistentry>
diff --git a/src/nspawn/nspawn-stub-pid1.c b/src/nspawn/nspawn-stub-pid1.c
new file mode 100644
-index 000000000..11c11560c
+index 0000000000..11c11560c4
--- /dev/null
+++ b/src/nspawn/nspawn-stub-pid1.c
@@ -0,0 +1,196 @@
@@ -312,7 +312,7 @@ index 000000000..11c11560c
+}
diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h
new file mode 100644
-index 000000000..be0f1af4c
+index 0000000000..be0f1af4cb
--- /dev/null
+++ b/src/nspawn/nspawn-stub-pid1.h
@@ -0,0 +1,22 @@
@@ -339,7 +339,7 @@ index 000000000..be0f1af4c
+
+int stub_pid1(sd_id128_t uuid);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index d0003d379..ea365b3f9 100644
+index d0003d3790..ea365b3f9b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -99,6 +99,7 @@
diff --git a/SOURCES/0516-journal-implicitly-flush-to-var-on-recovery-4028.patch b/SOURCES/0516-journal-implicitly-flush-to-var-on-recovery-4028.patch
index 6094a08..cac3de1 100644
--- a/SOURCES/0516-journal-implicitly-flush-to-var-on-recovery-4028.patch
+++ b/SOURCES/0516-journal-implicitly-flush-to-var-on-recovery-4028.patch
@@ -29,7 +29,7 @@ Related: #1364092
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 2b7ecd09a..3e9412d57 100644
+index 2b7ecd09ab..3e9412d577 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -923,6 +923,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
diff --git a/SOURCES/0517-journal-add-use-flushed_flag_is_set-helper-4041.patch b/SOURCES/0517-journal-add-use-flushed_flag_is_set-helper-4041.patch
index 85b7a59..5c1a0cf 100644
--- a/SOURCES/0517-journal-add-use-flushed_flag_is_set-helper-4041.patch
+++ b/SOURCES/0517-journal-add-use-flushed_flag_is_set-helper-4041.patch
@@ -13,7 +13,7 @@ Related: #1364092
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 3e9412d57..96ffda4ec 100644
+index 3e9412d577..96ffda4ec9 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -917,6 +917,9 @@ finish:
diff --git a/SOURCES/0518-journald-don-t-flush-to-var-log-journal-before-we-ge.patch b/SOURCES/0518-journald-don-t-flush-to-var-log-journal-before-we-ge.patch
index d355027..659e6a1 100644
--- a/SOURCES/0518-journald-don-t-flush-to-var-log-journal-before-we-ge.patch
+++ b/SOURCES/0518-journald-don-t-flush-to-var-log-journal-before-we-ge.patch
@@ -37,7 +37,7 @@ Resolves: #1364092
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 96ffda4ec..07426b41e 100644
+index 96ffda4ec9..07426b41e8 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -918,7 +918,7 @@ finish:
@@ -116,7 +116,7 @@ index 96ffda4ec..07426b41e 100644
server_vacuum(s);
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index b1263a758..7a456c2d5 100644
+index b1263a7586..7a456c2d54 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -173,6 +173,6 @@ void server_sync(Server *s);
@@ -128,7 +128,7 @@ index b1263a758..7a456c2d5 100644
void server_maybe_append_tags(Server *s);
int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata);
diff --git a/src/journal/journald.c b/src/journal/journald.c
-index 80f4634f6..15bbcbe3d 100644
+index 80f4634f67..15bbcbe3de 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0519-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch b/SOURCES/0519-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
index 22735ba..7e52882 100644
--- a/SOURCES/0519-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
+++ b/SOURCES/0519-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
@@ -32,7 +32,7 @@ Resolves: #1472439
12 files changed, 242 insertions(+), 62 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 4e066613d..eedd9b824 100644
+index 4e066613d7..eedd9b8243 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -749,7 +749,7 @@ static int automount_start(Unit *u) {
@@ -45,7 +45,7 @@ index 4e066613d..eedd9b824 100644
"Path %s is already a mount point, refusing start for %s",
a->where, u->id);
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
-index d00a53246..1121d373f 100644
+index d00a53246f..1121d373fa 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -203,7 +203,7 @@ int machine_id_commit(const char *root) {
@@ -58,7 +58,7 @@ index d00a53246..1121d373f 100644
return log_error_errno(r, "Failed to determine whether %s is a mount point: %m", etc_machine_id);
if (r == 0) {
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 521545e5c..2b8fbab1a 100644
+index 521545e5ce..2b8fbab1a3 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -160,7 +160,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
@@ -71,7 +71,7 @@ index 521545e5c..2b8fbab1a 100644
return r;
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
-index b3ff3a8b7..5492b1994 100644
+index b3ff3a8b78..5492b19946 100644
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
@@ -84,7 +84,7 @@ index b3ff3a8b7..5492b1994 100644
log_debug("/boot already populated, exiting.");
return EXIT_SUCCESS;
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 00a2141a5..d7b047118 100644
+index 00a2141a58..d7b047118d 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -299,7 +299,7 @@ static int probe_and_add_mount(
@@ -97,7 +97,7 @@ index 00a2141a5..d7b047118 100644
log_debug("%s already populated, ignoring.", where);
return 0;
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index 4298704ce..912c50ebd 100644
+index 4298704cea..912c50ebde 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -320,7 +320,7 @@ static int user_mkdir_runtime_path(User *u) {
@@ -110,7 +110,7 @@ index 4298704ce..912c50ebd 100644
(void) mkdir(p, 0700);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index ea365b3f9..a90a3a5d7 100644
+index ea365b3f9b..a90a3a5d75 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -863,7 +863,7 @@ static int mount_all(const char *dest) {
@@ -159,7 +159,7 @@ index ea365b3f9..a90a3a5d7 100644
log_error_errno(r, "Failed to determine whether directory %s is mount point: %m", arg_directory);
goto finish;
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index c5d9e4bb5..cf085cb5f 100644
+index c5d9e4bb58..cf085cb5ff 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -488,7 +488,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
@@ -172,7 +172,7 @@ index c5d9e4bb5..cf085cb5f 100644
return r < 0 ? r : -ENOENT;
diff --git a/src/shared/condition.c b/src/shared/condition.c
-index 796cc520d..0d2cd2bc3 100644
+index 796cc520d7..0d2cd2bc3a 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -350,7 +350,7 @@ static int condition_test_path_is_mount_point(Condition *c) {
@@ -185,7 +185,7 @@ index 796cc520d..0d2cd2bc3 100644
static int condition_test_path_is_read_write(Condition *c) {
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 1181ffb9d..0f252ec26 100644
+index 1181ffb9d4..0f252ec262 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -36,6 +36,7 @@
@@ -447,7 +447,7 @@ index 1181ffb9d..0f252ec26 100644
int path_is_read_only_fs(const char *path) {
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index 71bb740e9..e16484087 100644
+index 71bb740e98..e16484087f 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -53,7 +53,8 @@ char** path_strv_make_absolute_cwd(char **l);
@@ -461,7 +461,7 @@ index 71bb740e9..e16484087 100644
int path_is_os_tree(const char *path);
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
-index 6396fcb39..8870f178a 100644
+index 6396fcb398..8870f178a1 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -21,6 +21,7 @@
diff --git a/SOURCES/0520-Revert-Revert-journald-allow-restarting-journald-wit.patch b/SOURCES/0520-Revert-Revert-journald-allow-restarting-journald-wit.patch
index c63b3c5..15dd762 100644
--- a/SOURCES/0520-Revert-Revert-journald-allow-restarting-journald-wit.patch
+++ b/SOURCES/0520-Revert-Revert-journald-allow-restarting-journald-wit.patch
@@ -14,7 +14,7 @@ Resolves: #1359939
3 files changed, 340 insertions(+), 60 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 07426b41e..c1358e1e9 100644
+index 07426b41e8..c1358e1e95 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1477,6 +1477,7 @@ static int server_open_hostname(Server *s) {
@@ -69,7 +69,7 @@ index 07426b41e..c1358e1e9 100644
return r;
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index b8607144b..15c9110c0 100644
+index b8607144b3..15c9110c0f 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -28,8 +28,11 @@
@@ -530,7 +530,7 @@ index b8607144b..15c9110c0 100644
return 0;
}
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
-index 8cad01296..94bf955d7 100644
+index 8cad012967..94bf955d78 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -21,8 +21,9 @@
diff --git a/SOURCES/0521-journald-make-sure-we-retain-all-stream-fds-across-r.patch b/SOURCES/0521-journald-make-sure-we-retain-all-stream-fds-across-r.patch
index e3e9898..ca5feaf 100644
--- a/SOURCES/0521-journald-make-sure-we-retain-all-stream-fds-across-r.patch
+++ b/SOURCES/0521-journald-make-sure-we-retain-all-stream-fds-across-r.patch
@@ -21,7 +21,7 @@ Related: #1359939
1 file changed, 1 insertion(+)
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index c85c34932..0d1ea61fe 100644
+index c85c349327..0d1ea61fe8 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -20,6 +20,7 @@ ExecStart=@rootlibexecdir@/systemd-journald
diff --git a/SOURCES/0522-Allow-systemd-tmpfiles-to-set-the-file-directory-att.patch b/SOURCES/0522-Allow-systemd-tmpfiles-to-set-the-file-directory-att.patch
index c15237e..8f27859 100644
--- a/SOURCES/0522-Allow-systemd-tmpfiles-to-set-the-file-directory-att.patch
+++ b/SOURCES/0522-Allow-systemd-tmpfiles-to-set-the-file-directory-att.patch
@@ -15,7 +15,7 @@ Related: #1299714
1 file changed, 150 insertions(+)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index ed35b8cf0..c8c56c722 100644
+index ed35b8cf0d..c8c56c722d 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -40,6 +40,7 @@
diff --git a/SOURCES/0523-tmpfiles-rework-file-attribute-code.patch b/SOURCES/0523-tmpfiles-rework-file-attribute-code.patch
index 859bbdc..bf0ba9d 100644
--- a/SOURCES/0523-tmpfiles-rework-file-attribute-code.patch
+++ b/SOURCES/0523-tmpfiles-rework-file-attribute-code.patch
@@ -29,7 +29,7 @@ Related: #1299714
1 file changed, 114 insertions(+), 93 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index c8c56c722..800e620bc 100644
+index c8c56c722d..800e620bcf 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -92,8 +92,8 @@ typedef enum ItemType {
diff --git a/SOURCES/0524-tmpfiles-warn-if-we-get-an-argument-on-lines-that-do.patch b/SOURCES/0524-tmpfiles-warn-if-we-get-an-argument-on-lines-that-do.patch
index bbd9364..8a78ad6 100644
--- a/SOURCES/0524-tmpfiles-warn-if-we-get-an-argument-on-lines-that-do.patch
+++ b/SOURCES/0524-tmpfiles-warn-if-we-get-an-argument-on-lines-that-do.patch
@@ -12,7 +12,7 @@ Related: #1299714
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 800e620bc..70e0cc2fa 100644
+index 800e620bcf..70e0cc2fa3 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1788,8 +1788,6 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
diff --git a/SOURCES/0525-tmpfiles-substitute-specifiers-in-arguments-for-writ.patch b/SOURCES/0525-tmpfiles-substitute-specifiers-in-arguments-for-writ.patch
index 6e0479d..f4ac6ab 100644
--- a/SOURCES/0525-tmpfiles-substitute-specifiers-in-arguments-for-writ.patch
+++ b/SOURCES/0525-tmpfiles-substitute-specifiers-in-arguments-for-writ.patch
@@ -12,7 +12,7 @@ Related: #1299714
1 file changed, 42 insertions(+), 37 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 70e0cc2fa..ddb274fce 100644
+index 70e0cc2fa3..ddb274fcec 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -151,6 +151,14 @@ static const char conf_file_dirs[] = CONF_DIRS_NULSTR("tmpfiles");
diff --git a/SOURCES/0526-btrfs-util-introduce-btrfs_is_filesystem-and-make-us.patch b/SOURCES/0526-btrfs-util-introduce-btrfs_is_filesystem-and-make-us.patch
index 1b4ed93..22200cd 100644
--- a/SOURCES/0526-btrfs-util-introduce-btrfs_is_filesystem-and-make-us.patch
+++ b/SOURCES/0526-btrfs-util-introduce-btrfs_is_filesystem-and-make-us.patch
@@ -19,7 +19,7 @@ Related: #1299714
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c
-index b34ac8b15..52a214349 100644
+index b34ac8b15a..52a2143494 100644
--- a/src/shared/btrfs-util.c
+++ b/src/shared/btrfs-util.c
@@ -83,10 +83,22 @@ static int extract_subvolume_name(const char *path, const char **subvolume) {
@@ -69,7 +69,7 @@ index b34ac8b15..52a214349 100644
return r;
if (r == 0) {
diff --git a/src/shared/btrfs-util.h b/src/shared/btrfs-util.h
-index 1b9c142e5..1315def87 100644
+index 1b9c142e5c..1315def87e 100644
--- a/src/shared/btrfs-util.h
+++ b/src/shared/btrfs-util.h
@@ -43,7 +43,8 @@ typedef struct BtrfsQuotaInfo {
@@ -83,7 +83,7 @@ index 1b9c142e5..1315def87 100644
int btrfs_subvol_make(const char *path);
int btrfs_subvol_make_label(const char *path);
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
-index c02ee814c..256622928 100644
+index c02ee814c4..2566229282 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -136,12 +136,11 @@ static int image_make(
diff --git a/SOURCES/0527-journal-don-t-force-FS_NOCOW_FL-on-new-journal-files.patch b/SOURCES/0527-journal-don-t-force-FS_NOCOW_FL-on-new-journal-files.patch
index 9d715dd..894b27f 100644
--- a/SOURCES/0527-journal-don-t-force-FS_NOCOW_FL-on-new-journal-files.patch
+++ b/SOURCES/0527-journal-don-t-force-FS_NOCOW_FL-on-new-journal-files.patch
@@ -21,7 +21,7 @@ Resolves: #1299714
1 file changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 8034b771d..0fd59ec07 100644
+index 8034b771de..0fd59ec073 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2543,6 +2543,41 @@ void journal_file_print_header(JournalFile *f) {
diff --git a/SOURCES/0528-tmpfiles-Add-C-attrib-to-the-journal-files-directori.patch b/SOURCES/0528-tmpfiles-Add-C-attrib-to-the-journal-files-directori.patch
index 0aeb0b1..d049f9f 100644
--- a/SOURCES/0528-tmpfiles-Add-C-attrib-to-the-journal-files-directori.patch
+++ b/SOURCES/0528-tmpfiles-Add-C-attrib-to-the-journal-files-directori.patch
@@ -31,7 +31,7 @@ Related: #1299714
diff --git a/tmpfiles.d/journal-nocow.conf b/tmpfiles.d/journal-nocow.conf
new file mode 100644
-index 000000000..e7938c891
+index 0000000000..e7938c8911
--- /dev/null
+++ b/tmpfiles.d/journal-nocow.conf
@@ -0,0 +1,27 @@
diff --git a/SOURCES/0529-Revert-path-util-make-use-of-mnt_id-field-exported-i.patch b/SOURCES/0529-Revert-path-util-make-use-of-mnt_id-field-exported-i.patch
index 0c2ec75..868142e 100644
--- a/SOURCES/0529-Revert-path-util-make-use-of-mnt_id-field-exported-i.patch
+++ b/SOURCES/0529-Revert-path-util-make-use-of-mnt_id-field-exported-i.patch
@@ -25,7 +25,7 @@ Related: #1472439
12 files changed, 62 insertions(+), 242 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index eedd9b824..4e066613d 100644
+index eedd9b8243..4e066613d7 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -749,7 +749,7 @@ static int automount_start(Unit *u) {
@@ -38,7 +38,7 @@ index eedd9b824..4e066613d 100644
"Path %s is already a mount point, refusing start for %s",
a->where, u->id);
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
-index 1121d373f..d00a53246 100644
+index 1121d373fa..d00a53246f 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -203,7 +203,7 @@ int machine_id_commit(const char *root) {
@@ -51,7 +51,7 @@ index 1121d373f..d00a53246 100644
return log_error_errno(r, "Failed to determine whether %s is a mount point: %m", etc_machine_id);
if (r == 0) {
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 2b8fbab1a..521545e5c 100644
+index 2b8fbab1a3..521545e5ce 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -160,7 +160,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
@@ -64,7 +64,7 @@ index 2b8fbab1a..521545e5c 100644
return r;
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
-index 5492b1994..b3ff3a8b7 100644
+index 5492b19946..b3ff3a8b78 100644
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
@@ -77,7 +77,7 @@ index 5492b1994..b3ff3a8b7 100644
log_debug("/boot already populated, exiting.");
return EXIT_SUCCESS;
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index d7b047118..00a2141a5 100644
+index d7b047118d..00a2141a58 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -299,7 +299,7 @@ static int probe_and_add_mount(
@@ -90,7 +90,7 @@ index d7b047118..00a2141a5 100644
log_debug("%s already populated, ignoring.", where);
return 0;
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index 912c50ebd..4298704ce 100644
+index 912c50ebde..4298704cea 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -320,7 +320,7 @@ static int user_mkdir_runtime_path(User *u) {
@@ -103,7 +103,7 @@ index 912c50ebd..4298704ce 100644
(void) mkdir(p, 0700);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index a90a3a5d7..ea365b3f9 100644
+index a90a3a5d75..ea365b3f9b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -863,7 +863,7 @@ static int mount_all(const char *dest) {
@@ -152,7 +152,7 @@ index a90a3a5d7..ea365b3f9 100644
log_error_errno(r, "Failed to determine whether directory %s is mount point: %m", arg_directory);
goto finish;
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index cf085cb5f..c5d9e4bb5 100644
+index cf085cb5ff..c5d9e4bb58 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -488,7 +488,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
@@ -165,7 +165,7 @@ index cf085cb5f..c5d9e4bb5 100644
return r < 0 ? r : -ENOENT;
diff --git a/src/shared/condition.c b/src/shared/condition.c
-index 0d2cd2bc3..796cc520d 100644
+index 0d2cd2bc3a..796cc520d7 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -350,7 +350,7 @@ static int condition_test_path_is_mount_point(Condition *c) {
@@ -178,7 +178,7 @@ index 0d2cd2bc3..796cc520d 100644
static int condition_test_path_is_read_write(Condition *c) {
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 0f252ec26..1181ffb9d 100644
+index 0f252ec262..1181ffb9d4 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -36,7 +36,6 @@
@@ -440,7 +440,7 @@ index 0f252ec26..1181ffb9d 100644
int path_is_read_only_fs(const char *path) {
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index e16484087..71bb740e9 100644
+index e16484087f..71bb740e98 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -53,8 +53,7 @@ char** path_strv_make_absolute_cwd(char **l);
@@ -454,7 +454,7 @@ index e16484087..71bb740e9 100644
int path_is_os_tree(const char *path);
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
-index 8870f178a..6396fcb39 100644
+index 8870f178a1..6396fcb398 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -21,7 +21,6 @@
diff --git a/SOURCES/0530-device-make-sure-to-remove-all-device-units-sharing-.patch b/SOURCES/0530-device-make-sure-to-remove-all-device-units-sharing-.patch
index fddfd6b..aa2631a 100644
--- a/SOURCES/0530-device-make-sure-to-remove-all-device-units-sharing-.patch
+++ b/SOURCES/0530-device-make-sure-to-remove-all-device-units-sharing-.patch
@@ -20,7 +20,7 @@ Related: #1408916
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 63a04bdd3..2afa19f2b 100644
+index 63a04bdd3c..2afa19f2b4 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -487,7 +487,7 @@ static void device_update_found_one(Device *d, bool add, DeviceFound found, bool
diff --git a/SOURCES/0531-manager-when-reexecuting-try-to-connect-to-bus-only-.patch b/SOURCES/0531-manager-when-reexecuting-try-to-connect-to-bus-only-.patch
index bd82b93..b0227cb 100644
--- a/SOURCES/0531-manager-when-reexecuting-try-to-connect-to-bus-only-.patch
+++ b/SOURCES/0531-manager-when-reexecuting-try-to-connect-to-bus-only-.patch
@@ -20,7 +20,7 @@ Resolves: #1465737
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 287cf6a74..041fac46b 100644
+index 287cf6a741..041fac46be 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -799,16 +799,19 @@ static int manager_setup_kdbus(Manager *m) {
diff --git a/SOURCES/0532-doc-document-service-exit-codes.patch b/SOURCES/0532-doc-document-service-exit-codes.patch
index efe4021..3f3c982 100644
--- a/SOURCES/0532-doc-document-service-exit-codes.patch
+++ b/SOURCES/0532-doc-document-service-exit-codes.patch
@@ -15,7 +15,7 @@ Resolves: #1178929
1 file changed, 310 insertions(+)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 1b14ced78..508146f06 100644
+index 1b14ced788..508146f06c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1360,6 +1360,316 @@
diff --git a/SOURCES/0533-units-order-cryptsetup-pre.target-before-cryptsetup..patch b/SOURCES/0533-units-order-cryptsetup-pre.target-before-cryptsetup..patch
index ba9d7a6..08c61e7 100644
--- a/SOURCES/0533-units-order-cryptsetup-pre.target-before-cryptsetup..patch
+++ b/SOURCES/0533-units-order-cryptsetup-pre.target-before-cryptsetup..patch
@@ -15,7 +15,7 @@ Resolves: #1384014
1 file changed, 1 insertion(+)
diff --git a/units/cryptsetup-pre.target b/units/cryptsetup-pre.target
-index 65353419f..42e35dd4e 100644
+index 65353419fc..42e35dd4e4 100644
--- a/units/cryptsetup-pre.target
+++ b/units/cryptsetup-pre.target
@@ -9,3 +9,4 @@
diff --git a/SOURCES/0534-man-add-an-explicit-description-of-_netdev-to-system.patch b/SOURCES/0534-man-add-an-explicit-description-of-_netdev-to-system.patch
index 0709d77..4f17c57 100644
--- a/SOURCES/0534-man-add-an-explicit-description-of-_netdev-to-system.patch
+++ b/SOURCES/0534-man-add-an-explicit-description-of-_netdev-to-system.patch
@@ -14,7 +14,7 @@ Resolves: #1384014
1 file changed, 15 insertions(+)
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 04ed1e1cf..dfa437b5d 100644
+index 04ed1e1cf4..dfa437b5d2 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -202,6 +202,21 @@
diff --git a/SOURCES/0535-units-add-remote-cryptsetup.target-and-remote-crypts.patch b/SOURCES/0535-units-add-remote-cryptsetup.target-and-remote-crypts.patch
index 3c3e8b8..d0b752d 100644
--- a/SOURCES/0535-units-add-remote-cryptsetup.target-and-remote-crypts.patch
+++ b/SOURCES/0535-units-add-remote-cryptsetup.target-and-remote-crypts.patch
@@ -22,7 +22,7 @@ Resolves: #1384014
create mode 100644 units/remote-cryptsetup.target
diff --git a/Makefile.am b/Makefile.am
-index 0e2f8d561..a1ebf5cb0 100644
+index 0e2f8d561c..a1ebf5cb07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4861,7 +4861,9 @@ systemgenerator_PROGRAMS += \
@@ -37,7 +37,7 @@ index 0e2f8d561..a1ebf5cb0 100644
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index eb464f9f8..5529d3bf7 100644
+index eb464f9f81..5529d3bf7e 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -81,6 +81,8 @@
@@ -78,7 +78,7 @@ index eb464f9f8..5529d3bf7 100644
<term><filename>remote-fs.target</filename></term>
<listitem>
diff --git a/units/cryptsetup-pre.target b/units/cryptsetup-pre.target
-index 42e35dd4e..6cb28a61a 100644
+index 42e35dd4e4..6cb28a61ae 100644
--- a/units/cryptsetup-pre.target
+++ b/units/cryptsetup-pre.target
@@ -6,7 +6,7 @@
@@ -91,7 +91,7 @@ index 42e35dd4e..6cb28a61a 100644
RefuseManualStart=yes
Before=cryptsetup.target
diff --git a/units/cryptsetup.target b/units/cryptsetup.target
-index 25d3e33f6..10b17fd38 100644
+index 25d3e33f6a..10b17fd387 100644
--- a/units/cryptsetup.target
+++ b/units/cryptsetup.target
@@ -6,5 +6,5 @@
@@ -103,7 +103,7 @@ index 25d3e33f6..10b17fd38 100644
Documentation=man:systemd.special(7)
diff --git a/units/remote-cryptsetup-pre.target b/units/remote-cryptsetup-pre.target
new file mode 100644
-index 000000000..a375e6188
+index 0000000000..a375e61889
--- /dev/null
+++ b/units/remote-cryptsetup-pre.target
@@ -0,0 +1,15 @@
@@ -124,7 +124,7 @@ index 000000000..a375e6188
+Wants=network-online.target
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
new file mode 100644
-index 000000000..60943bd1c
+index 0000000000..60943bd1cb
--- /dev/null
+++ b/units/remote-cryptsetup.target
@@ -0,0 +1,10 @@
diff --git a/SOURCES/0536-cryptsetup-generator-use-remote-cryptsetup.target-wh.patch b/SOURCES/0536-cryptsetup-generator-use-remote-cryptsetup.target-wh.patch
index 449d99d..f424f51 100644
--- a/SOURCES/0536-cryptsetup-generator-use-remote-cryptsetup.target-wh.patch
+++ b/SOURCES/0536-cryptsetup-generator-use-remote-cryptsetup.target-wh.patch
@@ -17,7 +17,7 @@ Resolves: #1384014
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index 3e249ad23..7085a1623 100644
+index 3e249ad23e..7085a16234 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -189,6 +189,19 @@
@@ -41,7 +41,7 @@ index 3e249ad23..7085a1623 100644
<term><option>noauto</option></term>
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index d191def5f..49dc8f14b 100644
+index d191def5f8..49dc8f14b4 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -60,7 +60,7 @@ static int create_disk(
diff --git a/SOURCES/0537-Support-rdma-as-a-ListenNetlink-argument-6626.patch b/SOURCES/0537-Support-rdma-as-a-ListenNetlink-argument-6626.patch
index ebae836..430dbf5 100644
--- a/SOURCES/0537-Support-rdma-as-a-ListenNetlink-argument-6626.patch
+++ b/SOURCES/0537-Support-rdma-as-a-ListenNetlink-argument-6626.patch
@@ -13,7 +13,7 @@ Resolves: #1494610
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index 79d1582d4..baab6353e 100644
+index 79d1582d49..baab6353e1 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -725,7 +725,8 @@ static const char* const netlink_family_table[] = {
diff --git a/SOURCES/0538-core-namespace-Protect-usr-instead-of-home-with-Prot.patch b/SOURCES/0538-core-namespace-Protect-usr-instead-of-home-with-Prot.patch
index de5b807..270115a 100644
--- a/SOURCES/0538-core-namespace-Protect-usr-instead-of-home-with-Prot.patch
+++ b/SOURCES/0538-core-namespace-Protect-usr-instead-of-home-with-Prot.patch
@@ -15,7 +15,7 @@ Resolves: #1493047
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 574746273..217dd36cb 100644
+index 5747462736..217dd36cbd 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -521,7 +521,7 @@ int setup_namespace(
diff --git a/SOURCES/0539-udev-Use-parent-bus-id-for-virtio-disk-builtin-path-.patch b/SOURCES/0539-udev-Use-parent-bus-id-for-virtio-disk-builtin-path-.patch
index 3edfc86..e8bb067 100644
--- a/SOURCES/0539-udev-Use-parent-bus-id-for-virtio-disk-builtin-path-.patch
+++ b/SOURCES/0539-udev-Use-parent-bus-id-for-virtio-disk-builtin-path-.patch
@@ -35,7 +35,7 @@ Resolves: #1496697
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 06e3329cc..10642a1fd 100644
+index 06e3329cc9..10642a1fd8 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -71,6 +71,10 @@ ENV{DEVTYPE}=="partition", ENV{ID_SAS_PATH}=="?*", SYMLINK+="disk/by-path/$env{I
@@ -50,7 +50,7 @@ index 06e3329cc..10642a1fd 100644
KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", \
IMPORT{builtin}="blkid --offset=$env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}"
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 19447201b..d113ff21b 100644
+index 19447201b4..d113ff21b0 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -688,11 +688,8 @@ restart:
diff --git a/SOURCES/0540-socket-util-socket_address_parse-should-not-log-erro.patch b/SOURCES/0540-socket-util-socket_address_parse-should-not-log-erro.patch
index 95d622a..127ec32 100644
--- a/SOURCES/0540-socket-util-socket_address_parse-should-not-log-erro.patch
+++ b/SOURCES/0540-socket-util-socket_address_parse-should-not-log-erro.patch
@@ -25,7 +25,7 @@ Related: #1497639
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 58e44b89b..0c0fa0f50 100644
+index 58e44b89b2..0c0fa0f506 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -365,7 +365,7 @@ int config_parse_socket_listen(const char *unit,
@@ -38,7 +38,7 @@ index 58e44b89b..0c0fa0f50 100644
if (r != -EAFNOSUPPORT)
log_syntax(unit, LOG_ERR, filename, line, -r,
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index baab6353e..b14e36817 100644
+index baab6353e1..b14e368176 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -55,11 +55,6 @@ int socket_address_parse(SocketAddress *a, const char *s) {
@@ -92,7 +92,7 @@ index baab6353e..b14e36817 100644
int family;
unsigned group = 0;
diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
-index 6bfb677fb..9200ce882 100644
+index 6bfb677fb5..9200ce8822 100644
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -67,6 +67,7 @@ typedef enum SocketAddressBindIPv6Only {
diff --git a/SOURCES/0541-test-fix-failing-test-socket-util-when-running-with-.patch b/SOURCES/0541-test-fix-failing-test-socket-util-when-running-with-.patch
index 870294e..00328e4 100644
--- a/SOURCES/0541-test-fix-failing-test-socket-util-when-running-with-.patch
+++ b/SOURCES/0541-test-fix-failing-test-socket-util-when-running-with-.patch
@@ -16,7 +16,7 @@ Resolves: #1497639
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
-index 6fb4a4094..85f222993 100644
+index 6fb4a40944..85f2229937 100644
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -38,28 +38,25 @@ static void test_socket_address_parse(void) {
diff --git a/SOURCES/0542-scsi_id-add-missing-options-to-getopt_long-6501.patch b/SOURCES/0542-scsi_id-add-missing-options-to-getopt_long-6501.patch
index 2f1e33b..e60a628 100644
--- a/SOURCES/0542-scsi_id-add-missing-options-to-getopt_long-6501.patch
+++ b/SOURCES/0542-scsi_id-add-missing-options-to-getopt_long-6501.patch
@@ -11,7 +11,7 @@ Resolves: #1476910
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
-index a1b8e75fa..eae7e2955 100644
+index a1b8e75fac..eae7e29557 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -333,7 +333,7 @@ static int set_options(struct udev *udev,
diff --git a/SOURCES/0543-unmount-Pass-in-mount-options-when-remounting-read-o.patch b/SOURCES/0543-unmount-Pass-in-mount-options-when-remounting-read-o.patch
index addea4f..2a27d34 100644
--- a/SOURCES/0543-unmount-Pass-in-mount-options-when-remounting-read-o.patch
+++ b/SOURCES/0543-unmount-Pass-in-mount-options-when-remounting-read-o.patch
@@ -19,7 +19,7 @@ Related: #1312002
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index dd7df194d..bfd8aa5f8 100644
+index dd7df194de..bfd8aa5f88 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -28,6 +28,7 @@
diff --git a/SOURCES/0544-shutdown-don-t-remount-ro-network-filesystems.-6588.patch b/SOURCES/0544-shutdown-don-t-remount-ro-network-filesystems.-6588.patch
index bc4ca5e..1a44036 100644
--- a/SOURCES/0544-shutdown-don-t-remount-ro-network-filesystems.-6588.patch
+++ b/SOURCES/0544-shutdown-don-t-remount-ro-network-filesystems.-6588.patch
@@ -16,7 +16,7 @@ Resolves: #1312002
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index bfd8aa5f8..6e8ccc794 100644
+index bfd8aa5f88..6e8ccc794f 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -41,6 +41,7 @@
diff --git a/SOURCES/0545-shutdown-fix-incorrect-fscanf-result-check-6806.patch b/SOURCES/0545-shutdown-fix-incorrect-fscanf-result-check-6806.patch
index 0b18ab2..09acd7c 100644
--- a/SOURCES/0545-shutdown-fix-incorrect-fscanf-result-check-6806.patch
+++ b/SOURCES/0545-shutdown-fix-incorrect-fscanf-result-check-6806.patch
@@ -15,7 +15,7 @@ Related: #1312002
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index 6e8ccc794..3eec0d459 100644
+index 6e8ccc794f..3eec0d4592 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -93,7 +93,7 @@ static int mount_points_list_get(MountPoint **head) {
diff --git a/SOURCES/0546-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch b/SOURCES/0546-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
index 32331d9..0c34767 100644
--- a/SOURCES/0546-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
+++ b/SOURCES/0546-path-util-make-use-of-mnt_id-field-exported-in-proc-.patch
@@ -24,7 +24,7 @@ Resolves: #1472439
4 files changed, 235 insertions(+), 49 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index ea365b3f9..ee2e1832f 100644
+index ea365b3f9b..ee2e1832f1 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -990,7 +990,7 @@ static int mount_cgroup_hierarchy(const char *dest, const char *controller, cons
@@ -37,7 +37,7 @@ index ea365b3f9..ee2e1832f 100644
if (r > 0)
return 0;
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 1181ffb9d..5d4de9ec4 100644
+index 1181ffb9d4..5d4de9ec4d 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -36,6 +36,7 @@
@@ -307,7 +307,7 @@ index 1181ffb9d..5d4de9ec4 100644
int path_is_read_only_fs(const char *path) {
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index 71bb740e9..34c016229 100644
+index 71bb740e98..34c016229c 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -53,6 +53,7 @@ char** path_strv_make_absolute_cwd(char **l);
@@ -319,7 +319,7 @@ index 71bb740e9..34c016229 100644
int path_is_read_only_fs(const char *path);
int path_is_os_tree(const char *path);
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
-index 6396fcb39..a4fec07e7 100644
+index 6396fcb398..a4fec07e7c 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -21,6 +21,7 @@
diff --git a/SOURCES/0547-support-ranges-when-parsing-CPUAffinity.patch b/SOURCES/0547-support-ranges-when-parsing-CPUAffinity.patch
index a5acc8e..909f647 100644
--- a/SOURCES/0547-support-ranges-when-parsing-CPUAffinity.patch
+++ b/SOURCES/0547-support-ranges-when-parsing-CPUAffinity.patch
@@ -19,7 +19,7 @@ Resolves: #1493976
5 files changed, 417 insertions(+), 76 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 0c0fa0f50..a10e1903a 100644
+index 0c0fa0f506..a10e1903a4 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -884,50 +884,29 @@ int config_parse_exec_cpu_affinity(const char *unit,
@@ -88,7 +88,7 @@ index 0c0fa0f50..a10e1903a 100644
return 0;
}
diff --git a/src/core/main.c b/src/core/main.c
-index 66393ed6a..5554ef468 100644
+index 66393ed6ad..5554ef468d 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -438,49 +438,15 @@ static int config_parse_cpu_affinity2(
@@ -149,7 +149,7 @@ index 66393ed6a..5554ef468 100644
return 0;
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index bbb457759..39359fcc8 100644
+index bbb4577590..39359fcc8a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2727,6 +2727,43 @@ int parse_size(const char *t, off_t base, off_t *size) {
@@ -258,7 +258,7 @@ index bbb457759..39359fcc8 100644
static const char status_indent[] = " "; /* "[" STATUS "] " */
_cleanup_free_ char *s = NULL;
diff --git a/src/shared/util.h b/src/shared/util.h
-index 80ad18c0a..526a6fe84 100644
+index 80ad18c0ad..526a6fe848 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -136,6 +136,11 @@ bool streq_ptr(const char *a, const char *b) _pure_;
@@ -306,7 +306,7 @@ index 80ad18c0a..526a6fe84 100644
_malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
if (_unlikely_(b != 0 && a > ((size_t) -1) / b))
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index 971f97d7c..fcf5416c0 100644
+index 971f97d7c3..fcf5416c02 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -689,6 +689,300 @@ static void test_parse_size(void) {
diff --git a/SOURCES/0548-man-Update-man-page-documentation-for-CPUAffinity.patch b/SOURCES/0548-man-Update-man-page-documentation-for-CPUAffinity.patch
index 3eebde9..552ab77 100644
--- a/SOURCES/0548-man-Update-man-page-documentation-for-CPUAffinity.patch
+++ b/SOURCES/0548-man-Update-man-page-documentation-for-CPUAffinity.patch
@@ -16,7 +16,7 @@ Resolves: #1493976
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 53e8ff665..1861bb03f 100644
+index 53e8ff665a..1861bb03f0 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -117,8 +117,10 @@
@@ -33,7 +33,7 @@ index 53e8ff665..1861bb03f 100644
<varlistentry>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 508146f06..d7503b8e8 100644
+index 508146f06c..d7503b8e81 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -211,8 +211,10 @@
diff --git a/SOURCES/0549-test-path-util-force-rm_rf.patch b/SOURCES/0549-test-path-util-force-rm_rf.patch
index eb867e1..c65af5d 100644
--- a/SOURCES/0549-test-path-util-force-rm_rf.patch
+++ b/SOURCES/0549-test-path-util-force-rm_rf.patch
@@ -14,7 +14,7 @@ Related: #1472439
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
-index a4fec07e7..aee1f4e03 100644
+index a4fec07e7c..aee1f4e036 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -157,7 +157,7 @@ static void test_path_is_mount_point(void) {
diff --git a/SOURCES/0550-Export-NVMe-WWID-udev-attribute-5348.patch b/SOURCES/0550-Export-NVMe-WWID-udev-attribute-5348.patch
index e4e4964..3ef1786 100644
--- a/SOURCES/0550-Export-NVMe-WWID-udev-attribute-5348.patch
+++ b/SOURCES/0550-Export-NVMe-WWID-udev-attribute-5348.patch
@@ -15,7 +15,7 @@ Resolves: #1503253
1 file changed, 1 insertion(+)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 10642a1fd..ba619633b 100644
+index 10642a1fd8..ba619633b7 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -27,6 +27,7 @@ KERNEL=="nvme*[0-9]n*[0-9]", ATTR{wwid}=="?*", SYMLINK+="disk/by-id/nvme-$attr{w
diff --git a/SOURCES/0551-mount-make-sure-we-unmount-tmpfs-mounts-before-we-de.patch b/SOURCES/0551-mount-make-sure-we-unmount-tmpfs-mounts-before-we-de.patch
index 6115327..76a4f5d 100644
--- a/SOURCES/0551-mount-make-sure-we-unmount-tmpfs-mounts-before-we-de.patch
+++ b/SOURCES/0551-mount-make-sure-we-unmount-tmpfs-mounts-before-we-de.patch
@@ -25,7 +25,7 @@ Resolves: #1437518
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
-index 53fe4edc3..04beba631 100644
+index 53fe4edc34..04beba631b 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -90,20 +90,12 @@ static int property_get_type(
@@ -51,7 +51,7 @@ index 53fe4edc3..04beba631 100644
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, mount_result, MountResult);
diff --git a/src/core/mount.c b/src/core/mount.c
-index 7ca7f5a25..a6d93b869 100644
+index 7ca7f5a258..a6d93b8691 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -119,6 +119,21 @@ static bool needs_quota(const MountParameters *p) {
@@ -100,7 +100,7 @@ index 7ca7f5a25..a6d93b869 100644
}
diff --git a/src/core/mount.h b/src/core/mount.h
-index d6987e6fa..353222000 100644
+index d6987e6fa1..353222000f 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -130,3 +130,4 @@ const char* mount_result_to_string(MountResult i) _const_;
@@ -109,7 +109,7 @@ index d6987e6fa..353222000 100644
void warn_if_dir_nonempty(const char *unit, const char* where);
+const char *mount_get_fstype(const Mount *m);
diff --git a/units/tmp.mount b/units/tmp.mount
-index 8c53a8705..af0cf4a55 100644
+index 8c53a87052..af0cf4a551 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -13,7 +13,6 @@ ConditionPathIsSymbolicLink=!/tmp
diff --git a/SOURCES/0552-journald-never-accept-fds-from-file-systems-with-man.patch b/SOURCES/0552-journald-never-accept-fds-from-file-systems-with-man.patch
index 6203c9e..b54596e 100644
--- a/SOURCES/0552-journald-never-accept-fds-from-file-systems-with-man.patch
+++ b/SOURCES/0552-journald-never-accept-fds-from-file-systems-with-man.patch
@@ -16,7 +16,7 @@ Resolves: #1501017
1 file changed, 30 insertions(+)
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
-index 2c9cf6e7a..fdb1a38dd 100644
+index 2c9cf6e7a8..fdb1a38ddc 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -23,6 +23,7 @@
diff --git a/SOURCES/0553-udev-builtin-keyboard-move-fetching-the-device-node-.patch b/SOURCES/0553-udev-builtin-keyboard-move-fetching-the-device-node-.patch
index cf020a9..f51089c 100644
--- a/SOURCES/0553-udev-builtin-keyboard-move-fetching-the-device-node-.patch
+++ b/SOURCES/0553-udev-builtin-keyboard-move-fetching-the-device-node-.patch
@@ -14,7 +14,7 @@ Resolves: #1500119
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index d8ee4cbb6..bde7bf07f 100644
+index d8ee4cbb61..bde7bf07fb 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -75,6 +75,13 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/SOURCES/0554-udev-builtin-keyboard-immediately-EVIOCSKEYCODE-when.patch b/SOURCES/0554-udev-builtin-keyboard-immediately-EVIOCSKEYCODE-when.patch
index dfb0433..269de4a 100644
--- a/SOURCES/0554-udev-builtin-keyboard-immediately-EVIOCSKEYCODE-when.patch
+++ b/SOURCES/0554-udev-builtin-keyboard-immediately-EVIOCSKEYCODE-when.patch
@@ -18,7 +18,7 @@ Resolves: #1500119
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index bde7bf07f..515edd45c 100644
+index bde7bf07fb..515edd45ce 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -71,10 +71,10 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/SOURCES/0555-udev-builtin-keyboard-move-actual-key-mapping-to-a-h.patch b/SOURCES/0555-udev-builtin-keyboard-move-actual-key-mapping-to-a-h.patch
index ab4fd37..aac66e8 100644
--- a/SOURCES/0555-udev-builtin-keyboard-move-actual-key-mapping-to-a-h.patch
+++ b/SOURCES/0555-udev-builtin-keyboard-move-actual-key-mapping-to-a-h.patch
@@ -17,7 +17,7 @@ Resolves: #1500119
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index 515edd45c..f33401790 100644
+index 515edd45ce..f33401790c 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -66,12 +66,41 @@ static int install_force_release(struct udev_device *dev, const unsigned *releas
diff --git a/SOURCES/0556-udev-builtin-keyboard-invert-a-condition.patch b/SOURCES/0556-udev-builtin-keyboard-invert-a-condition.patch
index 81b8ee6..3c5b0fd 100644
--- a/SOURCES/0556-udev-builtin-keyboard-invert-a-condition.patch
+++ b/SOURCES/0556-udev-builtin-keyboard-invert-a-condition.patch
@@ -13,7 +13,7 @@ Resolves: #1500119
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index f33401790..86f4018ef 100644
+index f33401790c..86f4018ef5 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -115,43 +115,43 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/SOURCES/0557-udev-builtin-keyboard-add-support-for-EVDEV_ABS_.patch b/SOURCES/0557-udev-builtin-keyboard-add-support-for-EVDEV_ABS_.patch
index f9a2169..75437b4 100644
--- a/SOURCES/0557-udev-builtin-keyboard-add-support-for-EVDEV_ABS_.patch
+++ b/SOURCES/0557-udev-builtin-keyboard-add-support-for-EVDEV_ABS_.patch
@@ -48,7 +48,7 @@ Resolves: #1500119
create mode 100644 rules/60-evdev.rules
diff --git a/Makefile.am b/Makefile.am
-index a1ebf5cb0..13c93f485 100644
+index a1ebf5cb07..13c93f485e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3499,6 +3499,7 @@ dist_udevrules_DATA += \
@@ -69,7 +69,7 @@ index a1ebf5cb0..13c93f485 100644
hwdb/70-touchpad.hwdb
diff --git a/hwdb/60-evdev.hwdb b/hwdb/60-evdev.hwdb
new file mode 100644
-index 000000000..ad2d09e72
+index 0000000000..ad2d09e721
--- /dev/null
+++ b/hwdb/60-evdev.hwdb
@@ -0,0 +1,37 @@
@@ -112,7 +112,7 @@ index 000000000..ad2d09e72
+# be present. e.g. ::45 sets the resolution to 45 units/mm.
diff --git a/rules/60-evdev.rules b/rules/60-evdev.rules
new file mode 100644
-index 000000000..67308ad23
+index 0000000000..67308ad230
--- /dev/null
+++ b/rules/60-evdev.rules
@@ -0,0 +1,14 @@
@@ -131,7 +131,7 @@ index 000000000..67308ad23
+
+LABEL="evdev_end"
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index 86f4018ef..eaa21abf6 100644
+index 86f4018ef5..eaa21abf60 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -99,6 +99,69 @@ static void map_keycode(int fd, const char *devnode, int scancode, const char *k
diff --git a/SOURCES/0558-hwdb-sync-60-evdev.hwdb-from-systemd-v235.patch b/SOURCES/0558-hwdb-sync-60-evdev.hwdb-from-systemd-v235.patch
index d41090c..2bfd83a 100644
--- a/SOURCES/0558-hwdb-sync-60-evdev.hwdb-from-systemd-v235.patch
+++ b/SOURCES/0558-hwdb-sync-60-evdev.hwdb-from-systemd-v235.patch
@@ -9,7 +9,7 @@ Resolves: rhbz#1500119
1 file changed, 400 insertions(+), 7 deletions(-)
diff --git a/hwdb/60-evdev.hwdb b/hwdb/60-evdev.hwdb
-index ad2d09e72..f688ef269 100644
+index ad2d09e721..f688ef269f 100644
--- a/hwdb/60-evdev.hwdb
+++ b/hwdb/60-evdev.hwdb
@@ -15,17 +15,17 @@
diff --git a/SOURCES/0559-journal-ensure-open-journals-from-find_journal-3973.patch b/SOURCES/0559-journal-ensure-open-journals-from-find_journal-3973.patch
index ec014cd..1cab202 100644
--- a/SOURCES/0559-journal-ensure-open-journals-from-find_journal-3973.patch
+++ b/SOURCES/0559-journal-ensure-open-journals-from-find_journal-3973.patch
@@ -23,7 +23,7 @@ Resolves: #1493846
1 file changed, 114 insertions(+), 103 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index c1358e1e9..96e7d6156 100644
+index c1358e1e95..96e7d61565 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -239,6 +239,109 @@ finish:
diff --git a/SOURCES/0560-journal-only-check-available-space-when-journal-is-o.patch b/SOURCES/0560-journal-only-check-available-space-when-journal-is-o.patch
index 3fce2ef..57e6a69 100644
--- a/SOURCES/0560-journal-only-check-available-space-when-journal-is-o.patch
+++ b/SOURCES/0560-journal-only-check-available-space-when-journal-is-o.patch
@@ -11,7 +11,7 @@ Related: #1493846
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 96e7d6156..f6f8c30eb 100644
+index 96e7d61565..f6f8c30eb2 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -253,12 +253,12 @@ static int system_journal_open(Server *s, bool flush_requested) {
diff --git a/SOURCES/0561-automount-if-an-automount-unit-is-masked-don-t-react.patch b/SOURCES/0561-automount-if-an-automount-unit-is-masked-don-t-react.patch
index 74e0aad..7aa06a3 100644
--- a/SOURCES/0561-automount-if-an-automount-unit-is-masked-don-t-react.patch
+++ b/SOURCES/0561-automount-if-an-automount-unit-is-masked-don-t-react.patch
@@ -19,7 +19,7 @@ Resolves: #1498318
1 file changed, 50 insertions(+), 24 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 4e066613d..20a5de8ca 100644
+index 4e066613d7..20a5de8cae 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -106,18 +106,18 @@ static void unmount_autofs(Automount *a) {
diff --git a/SOURCES/0562-units-add-Install-section-to-remote-cryptsetup.targe.patch b/SOURCES/0562-units-add-Install-section-to-remote-cryptsetup.targe.patch
index a8693a1..6f76317 100644
--- a/SOURCES/0562-units-add-Install-section-to-remote-cryptsetup.targe.patch
+++ b/SOURCES/0562-units-add-Install-section-to-remote-cryptsetup.targe.patch
@@ -17,7 +17,7 @@ Resolves: #1477757
2 files changed, 7 insertions(+)
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
-index 24963f062..a011ec67a 100644
+index 24963f0623..a011ec67ab 100644
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -9,6 +9,7 @@
@@ -29,7 +29,7 @@ index 24963f062..a011ec67a 100644
enable getty@.service
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
-index 60943bd1c..c306d521f 100644
+index 60943bd1cb..c306d521f7 100644
--- a/units/remote-cryptsetup.target
+++ b/units/remote-cryptsetup.target
@@ -8,3 +8,9 @@
diff --git a/SOURCES/0563-units-replace-remote-cryptsetup-pre.target-with-remo.patch b/SOURCES/0563-units-replace-remote-cryptsetup-pre.target-with-remo.patch
index 6ef7b47..c221625 100644
--- a/SOURCES/0563-units-replace-remote-cryptsetup-pre.target-with-remo.patch
+++ b/SOURCES/0563-units-replace-remote-cryptsetup-pre.target-with-remo.patch
@@ -32,7 +32,7 @@ Resolves: #1477757
delete mode 100644 units/remote-cryptsetup-pre.target
diff --git a/Makefile.am b/Makefile.am
-index 13c93f485..f06bc29c2 100644
+index 13c93f485e..f06bc29c25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4864,8 +4864,7 @@ systemgenerator_PROGRAMS += \
@@ -46,7 +46,7 @@ index 13c93f485..f06bc29c2 100644
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index 7085a1623..a9197ab40 100644
+index 7085a16234..a9197ab40e 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -196,7 +196,7 @@
@@ -59,7 +59,7 @@ index 7085a1623..a9197ab40 100644
<filename>cryptsetup-pre.target</filename> and
<filename>cryptsetup.target</filename>.</para></listitem>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 5529d3bf7..e04f08bd3 100644
+index 5529d3bf7e..e04f08bd37 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -81,7 +81,6 @@
@@ -104,7 +104,7 @@ index 5529d3bf7..e04f08bd3 100644
all remote mounts pulls it in via a
<varname>Wants=</varname> type dependency. If the unit wants
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 49dc8f14b..82a280d86 100644
+index 49dc8f14b4..82a280d865 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -114,7 +114,7 @@ static int create_disk(
@@ -118,7 +118,7 @@ index 49dc8f14b..82a280d86 100644
fprintf(f,
diff --git a/units/remote-cryptsetup-pre.target b/units/remote-cryptsetup-pre.target
deleted file mode 100644
-index a375e6188..000000000
+index a375e61889..0000000000
--- a/units/remote-cryptsetup-pre.target
+++ /dev/null
@@ -1,15 +0,0 @@
@@ -138,7 +138,7 @@ index a375e6188..000000000
-After=network.target network-online.target
-Wants=network-online.target
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
-index c306d521f..d485b0672 100644
+index c306d521f7..d485b06726 100644
--- a/units/remote-cryptsetup.target
+++ b/units/remote-cryptsetup.target
@@ -8,7 +8,7 @@
diff --git a/SOURCES/0564-man-add-a-note-about-_netdev-usage.patch b/SOURCES/0564-man-add-a-note-about-_netdev-usage.patch
index c72084c..89964d6 100644
--- a/SOURCES/0564-man-add-a-note-about-_netdev-usage.patch
+++ b/SOURCES/0564-man-add-a-note-about-_netdev-usage.patch
@@ -10,7 +10,7 @@ Resolves: #1477757
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index a9197ab40..e4ecab3dc 100644
+index a9197ab40e..e4ecab3dcb 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -199,7 +199,16 @@
diff --git a/SOURCES/0565-units-make-remote-cryptsetup.target-also-after-crypt.patch b/SOURCES/0565-units-make-remote-cryptsetup.target-also-after-crypt.patch
index 5fb3090..278d9ce 100644
--- a/SOURCES/0565-units-make-remote-cryptsetup.target-also-after-crypt.patch
+++ b/SOURCES/0565-units-make-remote-cryptsetup.target-also-after-crypt.patch
@@ -14,7 +14,7 @@ Resolves: #1477757
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target
-index d485b0672..ac4e1b71d 100644
+index d485b06726..ac4e1b71db 100644
--- a/units/remote-cryptsetup.target
+++ b/units/remote-cryptsetup.target
@@ -8,7 +8,7 @@
diff --git a/SOURCES/0566-cryptsetup-generator-use-after-free.patch b/SOURCES/0566-cryptsetup-generator-use-after-free.patch
index 9cdfb0c..a14049d 100644
--- a/SOURCES/0566-cryptsetup-generator-use-after-free.patch
+++ b/SOURCES/0566-cryptsetup-generator-use-after-free.patch
@@ -11,7 +11,7 @@ Related: #1477757
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 82a280d86..c387e2104 100644
+index 82a280d865..c387e2104c 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -214,10 +214,8 @@ static int create_disk(
diff --git a/SOURCES/0567-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch b/SOURCES/0567-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch
index d6ee4d4..64f5b34 100644
--- a/SOURCES/0567-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch
+++ b/SOURCES/0567-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch
@@ -20,7 +20,7 @@ Related: #1465737
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 041fac46b..47b09e1e9 100644
+index 041fac46be..47b09e1e93 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -809,7 +809,7 @@ static int manager_connect_bus(Manager *m, bool reexecuting) {
diff --git a/SOURCES/0568-journal-remote-make-url-option-support-arbitrary-url.patch b/SOURCES/0568-journal-remote-make-url-option-support-arbitrary-url.patch
index 59537ff..26b86f0 100644
--- a/SOURCES/0568-journal-remote-make-url-option-support-arbitrary-url.patch
+++ b/SOURCES/0568-journal-remote-make-url-option-support-arbitrary-url.patch
@@ -19,7 +19,7 @@ Resolves: #1505385
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index 4fac55cc9..a455fb6bd 100644
+index 4fac55cc9a..a455fb6bd8 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -894,7 +894,14 @@ static int remoteserver_init(RemoteServer *s,
diff --git a/SOURCES/0569-journald-make-maximum-size-of-stream-log-lines-confi.patch b/SOURCES/0569-journald-make-maximum-size-of-stream-log-lines-confi.patch
index 0faa4e1..3751536 100644
--- a/SOURCES/0569-journald-make-maximum-size-of-stream-log-lines-confi.patch
+++ b/SOURCES/0569-journald-make-maximum-size-of-stream-log-lines-confi.patch
@@ -52,7 +52,7 @@ conflicts in a code that was totally unrelated.]
7 files changed, 209 insertions(+), 20 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 46a498b67..e2d6a1225 100644
+index 46a498b673..e2d6a12252 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -354,6 +354,24 @@
@@ -81,7 +81,7 @@ index 46a498b67..e2d6a1225 100644
</refsect1>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
-index 7d6c5c715..a53f8def2 100644
+index 7d6c5c715f..a53f8def2d 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -311,6 +311,28 @@
@@ -114,7 +114,7 @@ index 7d6c5c715..a53f8def2 100644
</refsect1>
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
-index 74554c1c3..73327c10e 100644
+index 74554c1c34..73327c10e9 100644
--- a/src/journal/journald-gperf.gperf
+++ b/src/journal/journald-gperf.gperf
@@ -40,3 +40,4 @@ Journal.MaxLevelKMsg, config_parse_log_level, 0, offsetof(Server, max_lev
@@ -124,7 +124,7 @@ index 74554c1c3..73327c10e 100644
+Journal.LineMax, config_parse_line_max, 0, offsetof(Server, line_max)
\ No newline at end of file
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index f6f8c30eb..daeecd519 100644
+index f6f8c30eb2..daeecd5191 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -67,6 +67,10 @@
@@ -220,7 +220,7 @@ index f6f8c30eb..daeecd519 100644
memset(&s->runtime_metrics, 0xFF, sizeof(s->runtime_metrics));
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index 7a456c2d5..b29410778 100644
+index 7a456c2d54..b294107788 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -143,6 +143,8 @@ typedef struct Server {
@@ -241,7 +241,7 @@ index 7a456c2d5..b29410778 100644
const char *storage_to_string(Storage s) _const_;
Storage storage_from_string(const char *s) _pure_;
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 15c9110c0..4d6b7ad18 100644
+index 15c9110c0f..4d6b7ad189 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -53,6 +53,16 @@ typedef enum StdoutStreamState {
@@ -515,7 +515,7 @@ index 15c9110c0..4d6b7ad18 100644
}
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 3907dfb7f..5355ec2b2 100644
+index 3907dfb7ff..5355ec2b2f 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -37,3 +37,4 @@
diff --git a/SOURCES/0570-service-serialize-information-about-currently-execut.patch b/SOURCES/0570-service-serialize-information-about-currently-execut.patch
index be20b54..76f7396 100644
--- a/SOURCES/0570-service-serialize-information-about-currently-execut.patch
+++ b/SOURCES/0570-service-serialize-information-about-currently-execut.patch
@@ -75,7 +75,7 @@ Resolves: #1404657,#1471230
1 file changed, 180 insertions(+), 15 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 3bd6c3338..9ad3a0eb0 100644
+index 3bd6c33381..9ad3a0eb01 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1950,6 +1950,80 @@ _pure_ static bool service_can_reload(Unit *u) {
diff --git a/SOURCES/0571-tests-add-new-test-for-issue-518.patch b/SOURCES/0571-tests-add-new-test-for-issue-518.patch
index 58c29f8..a3beba4 100644
--- a/SOURCES/0571-tests-add-new-test-for-issue-518.patch
+++ b/SOURCES/0571-tests-add-new-test-for-issue-518.patch
@@ -13,7 +13,7 @@ Related: #1404657, #1471230
create mode 100755 test/test-exec-deserialization.py
diff --git a/Makefile.am b/Makefile.am
-index f06bc29c2..c4a96e1fd 100644
+index f06bc29c25..c4a96e1fd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5711,7 +5711,8 @@ EXTRA_DIST += \
@@ -28,7 +28,7 @@ index f06bc29c2..c4a96e1fd 100644
src/network/networkd-network-gperf.c \
diff --git a/test/test-exec-deserialization.py b/test/test-exec-deserialization.py
new file mode 100755
-index 000000000..b974b1c13
+index 0000000000..b974b1c133
--- /dev/null
+++ b/test/test-exec-deserialization.py
@@ -0,0 +1,192 @@
diff --git a/SOURCES/0572-tests-in-RHEL-7-we-don-t-have-python3-by-default.patch b/SOURCES/0572-tests-in-RHEL-7-we-don-t-have-python3-by-default.patch
index cfd15f3..1fda35b 100644
--- a/SOURCES/0572-tests-in-RHEL-7-we-don-t-have-python3-by-default.patch
+++ b/SOURCES/0572-tests-in-RHEL-7-we-don-t-have-python3-by-default.patch
@@ -16,7 +16,7 @@ Related: #1404657, #1471230
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test-exec-deserialization.py b/test/test-exec-deserialization.py
-index b974b1c13..859778a7a 100755
+index b974b1c133..859778a7a8 100755
--- a/test/test-exec-deserialization.py
+++ b/test/test-exec-deserialization.py
@@ -1,4 +1,4 @@
diff --git a/SOURCES/0573-service-attempt-to-execute-next-main-command-only-fo.patch b/SOURCES/0573-service-attempt-to-execute-next-main-command-only-fo.patch
index c922fe2..6fe55cc 100644
--- a/SOURCES/0573-service-attempt-to-execute-next-main-command-only-fo.patch
+++ b/SOURCES/0573-service-attempt-to-execute-next-main-command-only-fo.patch
@@ -26,7 +26,7 @@ Related: #1404657, #1471230
2 files changed, 32 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
-index 9ad3a0eb0..ceed1cc2e 100644
+index 9ad3a0eb01..ceed1cc2e3 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2612,6 +2612,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
@@ -38,7 +38,7 @@ index 9ad3a0eb0..ceed1cc2e 100644
/* There is another command to *
diff --git a/test/test-exec-deserialization.py b/test/test-exec-deserialization.py
-index 859778a7a..61623da99 100755
+index 859778a7a8..61623da995 100755
--- a/test/test-exec-deserialization.py
+++ b/test/test-exec-deserialization.py
@@ -178,6 +178,37 @@ class ExecutionResumeTest(unittest.TestCase):
diff --git a/SOURCES/0574-timedatectl-stop-using-xstrftime.patch b/SOURCES/0574-timedatectl-stop-using-xstrftime.patch
index cf23b1d..eec0665 100644
--- a/SOURCES/0574-timedatectl-stop-using-xstrftime.patch
+++ b/SOURCES/0574-timedatectl-stop-using-xstrftime.patch
@@ -34,7 +34,7 @@ Resolves: #1503942
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/shared/time-util.h b/src/shared/time-util.h
-index f2789142f..32e90902a 100644
+index f2789142fe..32e90902a8 100644
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -108,5 +108,3 @@ int get_timezones(char ***l);
@@ -44,7 +44,7 @@ index f2789142f..32e90902a 100644
-
-#define xstrftime(buf, fmt, tm) assert_se(strftime(buf, ELEMENTSOF(buf), fmt, tm) > 0)
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
-index 1accccb68..3e9b657bc 100644
+index 1accccb688..3e9b657bc4 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -93,8 +93,8 @@ static const char *jump_str(int delta_minutes, char *s, size_t size) {
diff --git a/SOURCES/0575-Add-support-to-read-lz4-compressed-journals.patch b/SOURCES/0575-Add-support-to-read-lz4-compressed-journals.patch
index 8f6516a..fdb7151 100644
--- a/SOURCES/0575-Add-support-to-read-lz4-compressed-journals.patch
+++ b/SOURCES/0575-Add-support-to-read-lz4-compressed-journals.patch
@@ -34,7 +34,7 @@ changes to .spec file:
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/journal/compress.c b/src/journal/compress.c
-index 4fb09f596..3baf9e4ad 100644
+index 4fb09f5965..3baf9e4ad7 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -98,7 +98,12 @@ int compress_blob_lz4(const void *src, uint64_t src_size, void *dst, size_t *dst
@@ -70,7 +70,7 @@ index 4fb09f596..3baf9e4ad 100644
}
diff --git a/src/journal/compress.h b/src/journal/compress.h
-index 136dda6d3..0f62a58d6 100644
+index 136dda6d39..0f62a58d6e 100644
--- a/src/journal/compress.h
+++ b/src/journal/compress.h
@@ -35,15 +35,9 @@ int compress_blob_lz4(const void *src, uint64_t src_size, void *dst, size_t *dst
@@ -103,7 +103,7 @@ index 136dda6d3..0f62a58d6 100644
int decompress_stream(const char *filename, int fdf, int fdt, off_t max_bytes);
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 0fd59ec07..ebc8e6230 100644
+index 0fd59ec073..ebc8e62305 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2615,9 +2615,8 @@ int journal_file_open(
diff --git a/SOURCES/0576-journald-never-block-when-sending-messages-on-NOTIFY.patch b/SOURCES/0576-journald-never-block-when-sending-messages-on-NOTIFY.patch
index 048a0e9..96f12eb 100644
--- a/SOURCES/0576-journald-never-block-when-sending-messages-on-NOTIFY.patch
+++ b/SOURCES/0576-journald-never-block-when-sending-messages-on-NOTIFY.patch
@@ -28,7 +28,7 @@ Resolves: #1511565
6 files changed, 201 insertions(+), 22 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index daeecd519..a810829b2 100644
+index daeecd5191..a810829b24 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -67,6 +67,8 @@
@@ -211,7 +211,7 @@ index daeecd519..a810829b2 100644
if (s->rate_limit)
journal_rate_limit_free(s->rate_limit);
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index b29410778..e59ff35e2 100644
+index b294107788..e59ff35e22 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -27,12 +27,15 @@
@@ -282,7 +282,7 @@ index b29410778..e59ff35e2 100644
#define N_IOVEC_META_FIELDS 20
#define N_IOVEC_KERNEL_FIELDS 64
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 4d6b7ad18..9118d1a31 100644
+index 4d6b7ad189..9118d1a318 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -80,6 +80,7 @@ struct StdoutStream {
@@ -393,7 +393,7 @@ index 4d6b7ad18..9118d1a31 100644
+
+}
diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h
-index 94bf955d7..fd8c94fb6 100644
+index 94bf955d78..fd8c94fb65 100644
--- a/src/journal/journald-stream.h
+++ b/src/journal/journald-stream.h
@@ -21,9 +21,12 @@
@@ -410,7 +410,7 @@ index 94bf955d7..fd8c94fb6 100644
void stdout_stream_free(StdoutStream *s);
+void stdout_stream_send_notify(StdoutStream *s);
diff --git a/src/journal/journald.c b/src/journal/journald.c
-index 15bbcbe3d..b7ba2b6ec 100644
+index 15bbcbe3de..b7ba2b6ec5 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -64,10 +64,6 @@ int main(int argc, char *argv[]) {
@@ -436,7 +436,7 @@ index 15bbcbe3d..b7ba2b6ec 100644
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 0d1ea61fe..c94c0bfba 100644
+index 0d1ea61fe8..c94c0bfba1 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -22,7 +22,6 @@ RestartSec=0
diff --git a/SOURCES/0577-journal-restore-watchdog-support.patch b/SOURCES/0577-journal-restore-watchdog-support.patch
index babeb46..26d4e11 100644
--- a/SOURCES/0577-journal-restore-watchdog-support.patch
+++ b/SOURCES/0577-journal-restore-watchdog-support.patch
@@ -17,7 +17,7 @@ Related: #1511565
3 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index a810829b2..6e7568b60 100644
+index a810829b24..6e7568b60b 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1572,10 +1572,10 @@ static int dispatch_notify_event(sd_event_source *es, int fd, uint32_t revents,
@@ -130,7 +130,7 @@ index a810829b2..6e7568b60 100644
safe_close(s->syslog_fd);
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index e59ff35e2..f046fde83 100644
+index e59ff35e22..f046fde834 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -78,6 +78,7 @@ struct Server {
@@ -171,7 +171,7 @@ index e59ff35e2..f046fde83 100644
};
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index c94c0bfba..0d1ea61fe 100644
+index c94c0bfba1..0d1ea61fe8 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -22,6 +22,7 @@ RestartSec=0
diff --git a/SOURCES/0578-cgroup-resource-property-setting-ignored-if-einval.patch b/SOURCES/0578-cgroup-resource-property-setting-ignored-if-einval.patch
index 550a15e..e0998ce 100644
--- a/SOURCES/0578-cgroup-resource-property-setting-ignored-if-einval.patch
+++ b/SOURCES/0578-cgroup-resource-property-setting-ignored-if-einval.patch
@@ -18,7 +18,7 @@ Cherry-picked from: d53d94743c5e5e3a4a6, 3fdf9ad
9 files changed, 205 insertions(+), 158 deletions(-)
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
-index f507c6748..6ab17e8cb 100644
+index f507c67487..6ab17e8cb9 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -118,10 +118,11 @@
@@ -46,7 +46,7 @@ index f507c6748..6ab17e8cb 100644
url="https://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt">blkio-controller.txt</ulink>.
The available IO bandwidth is split up among all units within
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index d4a8f9cbe..0779fa555 100644
+index d4a8f9cbe3..0779fa5552 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -35,14 +35,16 @@ void cgroup_context_init(CGroupContext *c) {
@@ -172,7 +172,7 @@ index d4a8f9cbe..0779fa555 100644
c->blockio_device_bandwidths)
mask |= CGROUP_BLKIO;
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
-index 8af3eaa3a..870f39c52 100644
+index 8af3eaa3ae..870f39c520 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -58,7 +58,7 @@ struct CGroupDeviceAllow {
@@ -214,7 +214,7 @@ index 8af3eaa3a..870f39c52 100644
#include "unit.h"
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index fa76c60c1..ffeeb5aa9 100644
+index fa76c60c1f..ffeeb5aa9a 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -133,34 +133,16 @@ static int property_get_device_allow(
@@ -436,7 +436,7 @@ index fa76c60c1..ffeeb5aa9 100644
fflush(f);
unit_write_drop_in_private(u, mode, name, buf);
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index a10e1903a..da58bcc5c 100644
+index a10e1903a4..da58bcc5c9 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2951,26 +2951,19 @@ int config_parse_cpu_shares(
@@ -561,7 +561,7 @@ index a10e1903a..da58bcc5c 100644
LIST_PREPEND(device_weights, c->blockio_device_weights, w);
return 0;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 6a2ad6ed3..8c0fde878 100644
+index 6a2ad6ed38..8c0fde8784 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1178,8 +1178,8 @@ static int unit_add_startup_units(Unit *u) {
@@ -576,7 +576,7 @@ index 6a2ad6ed3..8c0fde878 100644
r = set_put(u->manager->startup_units, u);
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index 263457427..cbf1eccf7 100644
+index 2634574279..cbf1eccf77 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -23,20 +23,23 @@
@@ -637,7 +637,7 @@ index 263457427..cbf1eccf7 100644
log_error("Failed to parse %s value %s.", field, eq);
return -EINVAL;
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index c5d9e4bb5..f67b53b4d 100644
+index c5d9e4bb58..f67b53b4de 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1795,3 +1795,44 @@ int cg_kernel_controllers(Set *controllers) {
@@ -686,7 +686,7 @@ index c5d9e4bb5..f67b53b4d 100644
+ return 0;
+}
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
-index 31bd8d311..615c1f03e 100644
+index 31bd8d311f..615c1f03e3 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -39,6 +39,30 @@ typedef enum CGroupControllerMask {
diff --git a/SOURCES/0579-fileio-add-new-helper-call-read_line-as-bounded-getl.patch b/SOURCES/0579-fileio-add-new-helper-call-read_line-as-bounded-getl.patch
index 8b5a9ce..6492448 100644
--- a/SOURCES/0579-fileio-add-new-helper-call-read_line-as-bounded-getl.patch
+++ b/SOURCES/0579-fileio-add-new-helper-call-read_line-as-bounded-getl.patch
@@ -19,7 +19,7 @@ Resolves: #1503106
3 files changed, 123 insertions(+)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index ff6b1a7ed..107737573 100644
+index ff6b1a7ed7..1077375735 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -815,3 +815,80 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
@@ -104,7 +104,7 @@ index ff6b1a7ed..107737573 100644
+ return (int) count;
+}
diff --git a/src/shared/fileio.h b/src/shared/fileio.h
-index 5ae51c1e2..f33464dce 100644
+index 5ae51c1e28..f33464dce7 100644
--- a/src/shared/fileio.h
+++ b/src/shared/fileio.h
@@ -43,3 +43,5 @@ int write_env_file(const char *fname, char **l);
@@ -114,7 +114,7 @@ index 5ae51c1e2..f33464dce 100644
+
+int read_line(FILE *f, size_t limit, char **ret);
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
-index 63e4a19b7..fc5969322 100644
+index 63e4a19b76..fc59693228 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -392,6 +392,49 @@ static void test_load_env_file_pairs(void) {
diff --git a/SOURCES/0580-def-add-new-constant-LONG_LINE_MAX.patch b/SOURCES/0580-def-add-new-constant-LONG_LINE_MAX.patch
index 2798123..76917fd 100644
--- a/SOURCES/0580-def-add-new-constant-LONG_LINE_MAX.patch
+++ b/SOURCES/0580-def-add-new-constant-LONG_LINE_MAX.patch
@@ -17,7 +17,7 @@ Resolves: #1503106
1 file changed, 2 insertions(+)
diff --git a/src/shared/def.h b/src/shared/def.h
-index 76daf012d..9e008a6d2 100644
+index 76daf012d7..9e008a6d2d 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -87,3 +87,5 @@
diff --git a/SOURCES/0581-fileio-rework-read_one_line_file-on-top-of-read_line.patch b/SOURCES/0581-fileio-rework-read_one_line_file-on-top-of-read_line.patch
index 5be44af..3a785d4 100644
--- a/SOURCES/0581-fileio-rework-read_one_line_file-on-top-of-read_line.patch
+++ b/SOURCES/0581-fileio-rework-read_one_line_file-on-top-of-read_line.patch
@@ -11,7 +11,7 @@ Resolves: #1503106
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index 107737573..be775f982 100644
+index 1077375735..be775f982a 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -25,6 +25,7 @@
diff --git a/SOURCES/0582-cgroup-util-replace-one-use-of-fgets-by-read_line.patch b/SOURCES/0582-cgroup-util-replace-one-use-of-fgets-by-read_line.patch
index fa3a207..65afd76 100644
--- a/SOURCES/0582-cgroup-util-replace-one-use-of-fgets-by-read_line.patch
+++ b/SOURCES/0582-cgroup-util-replace-one-use-of-fgets-by-read_line.patch
@@ -11,7 +11,7 @@ Resolves: #1503106
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index f67b53b4d..4585450b3 100644
+index f67b53b4de..4585450b39 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1747,7 +1747,6 @@ CGroupControllerMask cg_mask_supported(void) {
diff --git a/SOURCES/0583-conf-parse-remove-4K-line-length-limit.patch b/SOURCES/0583-conf-parse-remove-4K-line-length-limit.patch
index d4edd07..77bccb4 100644
--- a/SOURCES/0583-conf-parse-remove-4K-line-length-limit.patch
+++ b/SOURCES/0583-conf-parse-remove-4K-line-length-limit.patch
@@ -15,7 +15,7 @@ Resolves: #1503106
2 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index 0b1af6c57..73e4d49ea 100644
+index 0b1af6c577..73e4d49ea1 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -28,6 +28,8 @@
@@ -111,7 +111,7 @@ index 0b1af6c57..73e4d49ea 100644
}
}
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
-index 77f663438..d31737061 100644
+index 77f663438e..d31737061c 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -26,6 +26,7 @@
diff --git a/SOURCES/0584-test-conf-parser-add-tests-for-config-parser.patch b/SOURCES/0584-test-conf-parser-add-tests-for-config-parser.patch
index 96cce9d..09695d8 100644
--- a/SOURCES/0584-test-conf-parser-add-tests-for-config-parser.patch
+++ b/SOURCES/0584-test-conf-parser-add-tests-for-config-parser.patch
@@ -17,7 +17,7 @@ Resolves: #1503106
create mode 100644 src/test/test-conf-parser.c
diff --git a/Makefile.am b/Makefile.am
-index c4a96e1fd..8c73326fa 100644
+index c4a96e1fd1..8c73326fa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1416,6 +1416,7 @@ tests += \
@@ -43,7 +43,7 @@ index c4a96e1fd..8c73326fa 100644
.PHONY: coverage lcov-run lcov-report coverage-sync
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
new file mode 100644
-index 000000000..4052d0095
+index 0000000000..4052d0095e
--- /dev/null
+++ b/src/test/test-conf-parser.c
@@ -0,0 +1,155 @@
diff --git a/SOURCES/0585-fileio-use-_cleanup_-for-FILE-unlocking.patch b/SOURCES/0585-fileio-use-_cleanup_-for-FILE-unlocking.patch
index 67190f5..3150493 100644
--- a/SOURCES/0585-fileio-use-_cleanup_-for-FILE-unlocking.patch
+++ b/SOURCES/0585-fileio-use-_cleanup_-for-FILE-unlocking.patch
@@ -11,7 +11,7 @@ Resolves: #1503106
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index be775f982..4880a4941 100644
+index be775f982a..4880a4941f 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -802,10 +802,13 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
diff --git a/SOURCES/0586-test-fileio-also-test-read_line-with-actual-files.patch b/SOURCES/0586-test-fileio-also-test-read_line-with-actual-files.patch
index 5d7b768..7f75626 100644
--- a/SOURCES/0586-test-fileio-also-test-read_line-with-actual-files.patch
+++ b/SOURCES/0586-test-fileio-also-test-read_line-with-actual-files.patch
@@ -14,7 +14,7 @@ Resolves: #1503106
1 file changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
-index fc5969322..791bfc97b 100644
+index fc59693228..791bfc97b0 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -392,20 +392,17 @@ static void test_load_env_file_pairs(void) {
diff --git a/SOURCES/0587-fileio-return-0-from-read_one_line_file-on-success.patch b/SOURCES/0587-fileio-return-0-from-read_one_line_file-on-success.patch
index 35fdb0b..349c80b 100644
--- a/SOURCES/0587-fileio-return-0-from-read_one_line_file-on-success.patch
+++ b/SOURCES/0587-fileio-return-0-from-read_one_line_file-on-success.patch
@@ -13,7 +13,7 @@ Resolves: #1503106
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index 4880a4941..65a0753c2 100644
+index 4880a4941f..65a0753c24 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -109,6 +109,7 @@ int write_string_file_atomic(const char *fn, const char *line) {
diff --git a/SOURCES/0588-man-fix-description-of-force-in-halt-8-7392.patch b/SOURCES/0588-man-fix-description-of-force-in-halt-8-7392.patch
index c6309e0..1b447d3 100644
--- a/SOURCES/0588-man-fix-description-of-force-in-halt-8-7392.patch
+++ b/SOURCES/0588-man-fix-description-of-force-in-halt-8-7392.patch
@@ -12,7 +12,7 @@ Resolves: #1515130
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/man/halt.xml b/man/halt.xml
-index a06dbd009..d0fc25c20 100644
+index a06dbd0097..d0fc25c209 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -112,8 +112,13 @@
diff --git a/SOURCES/0589-journal-return-better-error-for-empty-files.patch b/SOURCES/0589-journal-return-better-error-for-empty-files.patch
index 8210792..e037f68 100644
--- a/SOURCES/0589-journal-return-better-error-for-empty-files.patch
+++ b/SOURCES/0589-journal-return-better-error-for-empty-files.patch
@@ -18,7 +18,7 @@ Related: #1465759
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index ebc8e6230..2bb3a9757 100644
+index ebc8e62305..2bb3a97574 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2693,7 +2693,7 @@ int journal_file_open(
diff --git a/SOURCES/0590-journalctl-continue-operation-even-if-we-run-into-an.patch b/SOURCES/0590-journalctl-continue-operation-even-if-we-run-into-an.patch
index e2c0f6f..209acb3 100644
--- a/SOURCES/0590-journalctl-continue-operation-even-if-we-run-into-an.patch
+++ b/SOURCES/0590-journalctl-continue-operation-even-if-we-run-into-an.patch
@@ -12,7 +12,7 @@ Related: #1465759
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index c771cff8b..8c8379732 100644
+index c771cff8b8..8c83797328 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1804,15 +1804,12 @@ static int access_check(sd_journal *j) {
diff --git a/SOURCES/0591-journal-remove-error-check-that-never-happens.patch b/SOURCES/0591-journal-remove-error-check-that-never-happens.patch
index 1e8f057..1281f0b 100644
--- a/SOURCES/0591-journal-remove-error-check-that-never-happens.patch
+++ b/SOURCES/0591-journal-remove-error-check-that-never-happens.patch
@@ -15,7 +15,7 @@ Related: #1465759
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 72f312b67..3749f9e89 100644
+index 72f312b67c..3749f9e895 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1487,7 +1487,7 @@ static int add_root_directory(sd_journal *j, const char *p) {
diff --git a/SOURCES/0592-sd-journal-various-clean-ups-and-modernizations.patch b/SOURCES/0592-sd-journal-various-clean-ups-and-modernizations.patch
index 5eacdb3..927ff5e 100644
--- a/SOURCES/0592-sd-journal-various-clean-ups-and-modernizations.patch
+++ b/SOURCES/0592-sd-journal-various-clean-ups-and-modernizations.patch
@@ -32,7 +32,7 @@ Related: #1465759
1 file changed, 111 insertions(+), 131 deletions(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 3749f9e89..9895d9608 100644
+index 3749f9e895..9895d9608f 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1171,6 +1171,8 @@ static bool file_has_type_prefix(const char *prefix, const char *filename) {
diff --git a/SOURCES/0593-journalctl-when-we-fail-to-open-a-journal-file-print.patch b/SOURCES/0593-journalctl-when-we-fail-to-open-a-journal-file-print.patch
index 5cf1c10..b0bb8f1 100644
--- a/SOURCES/0593-journalctl-when-we-fail-to-open-a-journal-file-print.patch
+++ b/SOURCES/0593-journalctl-when-we-fail-to-open-a-journal-file-print.patch
@@ -24,7 +24,7 @@ Resolves: #1465759
3 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
-index 115d7776d..eb23ac28a 100644
+index 115d7776da..eb23ac28ad 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -123,7 +123,7 @@ struct sd_journal {
@@ -37,7 +37,7 @@ index 115d7776d..eb23ac28a 100644
char *journal_make_match_string(sd_journal *j);
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 8c8379732..0be70764e 100644
+index 8c83797328..0be70764ef 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1783,33 +1783,50 @@ static int access_check_var_log_journal(sd_journal *j) {
@@ -97,7 +97,7 @@ index 8c8379732..0be70764e 100644
return r;
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9895d9608..14b65cfed 100644
+index 9895d9608f..14b65cfedd 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -62,19 +62,46 @@ static bool journal_pid_changed(sd_journal *j) {
diff --git a/SOURCES/0594-journald-fix-accuracy-of-watchdog-timer-event.patch b/SOURCES/0594-journald-fix-accuracy-of-watchdog-timer-event.patch
index e80a7e6..d70b612 100644
--- a/SOURCES/0594-journald-fix-accuracy-of-watchdog-timer-event.patch
+++ b/SOURCES/0594-journald-fix-accuracy-of-watchdog-timer-event.patch
@@ -17,7 +17,7 @@ Related: #1511565
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 6e7568b60..7c69061f4 100644
+index 6e7568b60b..7c69061f47 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1716,7 +1716,7 @@ static int server_connect_notify(Server *s) {
diff --git a/SOURCES/0595-core-fix-the-reversed-sanity-check-when-setting-Star.patch b/SOURCES/0595-core-fix-the-reversed-sanity-check-when-setting-Star.patch
index 498bad3..7991505 100644
--- a/SOURCES/0595-core-fix-the-reversed-sanity-check-when-setting-Star.patch
+++ b/SOURCES/0595-core-fix-the-reversed-sanity-check-when-setting-Star.patch
@@ -14,7 +14,7 @@ Resolves: #1302305
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
-index ffeeb5aa9..66b1324fe 100644
+index ffeeb5aa9a..66b1324fe9 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -324,7 +324,7 @@ int bus_cgroup_set_property(
diff --git a/SOURCES/0596-shared-dropin-ignore-ENAMETOOLONG-when-checking-drop.patch b/SOURCES/0596-shared-dropin-ignore-ENAMETOOLONG-when-checking-drop.patch
index 180ee6d..6a30e00 100644
--- a/SOURCES/0596-shared-dropin-ignore-ENAMETOOLONG-when-checking-drop.patch
+++ b/SOURCES/0596-shared-dropin-ignore-ENAMETOOLONG-when-checking-drop.patch
@@ -17,7 +17,7 @@ Resolves: #1489095
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
-index d1baad619..b674d307a 100644
+index d1baad6192..b674d307a2 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -129,8 +129,12 @@ static int iterate_dir(
diff --git a/SOURCES/0597-cryptsetup-when-unlocking-always-put-path-to-the-obj.patch b/SOURCES/0597-cryptsetup-when-unlocking-always-put-path-to-the-obj.patch
index 3d5962d..430d327 100644
--- a/SOURCES/0597-cryptsetup-when-unlocking-always-put-path-to-the-obj.patch
+++ b/SOURCES/0597-cryptsetup-when-unlocking-always-put-path-to-the-obj.patch
@@ -38,7 +38,7 @@ Resolves: #1511043
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 5dedb073e..c57d2b294 100644
+index 5dedb073e4..c57d2b2948 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -342,7 +342,7 @@ static int get_password(const char *vol, const char *src, usec_t until, bool acc
diff --git a/SOURCES/0598-cryptsetup-use-more-descriptive-name-for-the-variabl.patch b/SOURCES/0598-cryptsetup-use-more-descriptive-name-for-the-variabl.patch
index d72df21..fa3baba 100644
--- a/SOURCES/0598-cryptsetup-use-more-descriptive-name-for-the-variabl.patch
+++ b/SOURCES/0598-cryptsetup-use-more-descriptive-name-for-the-variabl.patch
@@ -22,7 +22,7 @@ Related: #1511043
1 file changed, 8 insertions(+), 33 deletions(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index c57d2b294..69a015614 100644
+index c57d2b2948..69a0156144 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -217,23 +217,6 @@ static void log_glue(int level, const char *msg, void *usrptr) {
diff --git a/SOURCES/0599-cryptsetup-generator-do-not-bind-to-the-decrypted-de.patch b/SOURCES/0599-cryptsetup-generator-do-not-bind-to-the-decrypted-de.patch
index e53a384..4f06f67 100644
--- a/SOURCES/0599-cryptsetup-generator-do-not-bind-to-the-decrypted-de.patch
+++ b/SOURCES/0599-cryptsetup-generator-do-not-bind-to-the-decrypted-de.patch
@@ -18,7 +18,7 @@ Related: #1511043
1 file changed, 1 deletion(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index c387e2104..5f29093f5 100644
+index c387e2104c..5f29093f54 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -110,7 +110,6 @@ static int create_disk(
diff --git a/SOURCES/0600-shared-cgroup-utils-_CGROUP_CONTROLLER_MASK_ALL-does.patch b/SOURCES/0600-shared-cgroup-utils-_CGROUP_CONTROLLER_MASK_ALL-does.patch
index 288ad7b..38eaa34 100644
--- a/SOURCES/0600-shared-cgroup-utils-_CGROUP_CONTROLLER_MASK_ALL-does.patch
+++ b/SOURCES/0600-shared-cgroup-utils-_CGROUP_CONTROLLER_MASK_ALL-does.patch
@@ -14,7 +14,7 @@ Resolves: #1532586
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
-index 615c1f03e..b6f28c5c2 100644
+index 615c1f03e3..b6f28c5c2f 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -36,7 +36,7 @@ typedef enum CGroupControllerMask {
diff --git a/SOURCES/0601-automount-ack-automount-requests-even-when-already-m.patch b/SOURCES/0601-automount-ack-automount-requests-even-when-already-m.patch
index d0b9e21..8fca977 100644
--- a/SOURCES/0601-automount-ack-automount-requests-even-when-already-m.patch
+++ b/SOURCES/0601-automount-ack-automount-requests-even-when-already-m.patch
@@ -26,7 +26,7 @@ Resolves: #1535135
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 20a5de8ca..182ba5240 100644
+index 20a5de8cae..182ba5240f 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -712,7 +712,7 @@ static int automount_start_expire(Automount *a) {
diff --git a/SOURCES/0602-udev-net_id-add-support-for-platform-bus-ACPI-mostly.patch b/SOURCES/0602-udev-net_id-add-support-for-platform-bus-ACPI-mostly.patch
index 76ffbda..abfdf6a 100644
--- a/SOURCES/0602-udev-net_id-add-support-for-platform-bus-ACPI-mostly.patch
+++ b/SOURCES/0602-udev-net_id-add-support-for-platform-bus-ACPI-mostly.patch
@@ -15,7 +15,7 @@ Resolves: #1529633
1 file changed, 72 insertions(+)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 19e1f2631..69cee5a72 100644
+index 19e1f2631a..69cee5a723 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -42,6 +42,7 @@
diff --git a/SOURCES/0603-journald-native-Fix-typo-in-MANDLOCK-message.patch b/SOURCES/0603-journald-native-Fix-typo-in-MANDLOCK-message.patch
index 1e36686..faf2789 100644
--- a/SOURCES/0603-journald-native-Fix-typo-in-MANDLOCK-message.patch
+++ b/SOURCES/0603-journald-native-Fix-typo-in-MANDLOCK-message.patch
@@ -10,7 +10,7 @@ Resolves: #1501017
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
-index fdb1a38dd..cf3349393 100644
+index fdb1a38ddc..cf3349393f 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -406,7 +406,7 @@ void server_process_native_file(
diff --git a/SOURCES/0604-process-util-make-our-freeze-routine-do-something-us.patch b/SOURCES/0604-process-util-make-our-freeze-routine-do-something-us.patch
index 4507872..2ed4747 100644
--- a/SOURCES/0604-process-util-make-our-freeze-routine-do-something-us.patch
+++ b/SOURCES/0604-process-util-make-our-freeze-routine-do-something-us.patch
@@ -22,7 +22,7 @@ Resolves: #1540941
1 file changed, 11 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 39359fcc8..af0953273 100644
+index 39359fcc8a..af09532733 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4158,6 +4158,17 @@ noreturn void freeze(void) {
diff --git a/SOURCES/0605-dbus-propagate-errors-from-bus_init_system-and-bus_i.patch b/SOURCES/0605-dbus-propagate-errors-from-bus_init_system-and-bus_i.patch
index bc131c8..aeb2133 100644
--- a/SOURCES/0605-dbus-propagate-errors-from-bus_init_system-and-bus_i.patch
+++ b/SOURCES/0605-dbus-propagate-errors-from-bus_init_system-and-bus_i.patch
@@ -37,7 +37,7 @@ Resolves: #1541061
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/src/core/dbus.c b/src/core/dbus.c
-index 0061211fa..d551eab01 100644
+index 0061211faa..d551eab016 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -811,27 +811,21 @@ static int bus_init_api(Manager *m) {
diff --git a/SOURCES/0606-bus-util.c-fix-TasksMax-property-assignment.patch b/SOURCES/0606-bus-util.c-fix-TasksMax-property-assignment.patch
index 2630ceb..8135678 100644
--- a/SOURCES/0606-bus-util.c-fix-TasksMax-property-assignment.patch
+++ b/SOURCES/0606-bus-util.c-fix-TasksMax-property-assignment.patch
@@ -14,7 +14,7 @@ Resolves: #1537147
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
-index cbf1eccf7..b1bdbad2d 100644
+index cbf1eccf77..b1bdbad2dd 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1418,20 +1418,13 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
diff --git a/SOURCES/0607-sparse-avoid-clash-with-__bitwise-and-__force-from-4.patch b/SOURCES/0607-sparse-avoid-clash-with-__bitwise-and-__force-from-4.patch
index 8912fa8..59f8465 100644
--- a/SOURCES/0607-sparse-avoid-clash-with-__bitwise-and-__force-from-4.patch
+++ b/SOURCES/0607-sparse-avoid-clash-with-__bitwise-and-__force-from-4.patch
@@ -18,7 +18,7 @@ Related: #1447937
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/shared/sparse-endian.h b/src/shared/sparse-endian.h
-index c913fda8c..a3573b84a 100644
+index c913fda8c5..a3573b84a9 100644
--- a/src/shared/sparse-endian.h
+++ b/src/shared/sparse-endian.h
@@ -26,19 +26,19 @@
diff --git a/SOURCES/0608-core-Let-two-more-booleans-survive-a-daemon-reload.patch b/SOURCES/0608-core-Let-two-more-booleans-survive-a-daemon-reload.patch
index 67a3ed9..6f654b4 100644
--- a/SOURCES/0608-core-Let-two-more-booleans-survive-a-daemon-reload.patch
+++ b/SOURCES/0608-core-Let-two-more-booleans-survive-a-daemon-reload.patch
@@ -19,7 +19,7 @@ Resolves: #1542391
2 files changed, 20 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
-index ceed1cc2e..71ec5e37c 100644
+index ceed1cc2e3..71ec5e37c9 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2044,6 +2044,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
@@ -46,7 +46,7 @@ index ceed1cc2e..71ec5e37c 100644
char *t;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 8c0fde878..41d7b63d7 100644
+index 8c0fde8784..41d7b63d73 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2619,6 +2619,7 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
diff --git a/SOURCES/0609-core-don-t-choke-if-a-unit-another-unit-triggers-van.patch b/SOURCES/0609-core-don-t-choke-if-a-unit-another-unit-triggers-van.patch
index 3a6a0a8..11aaa8f 100644
--- a/SOURCES/0609-core-don-t-choke-if-a-unit-another-unit-triggers-van.patch
+++ b/SOURCES/0609-core-don-t-choke-if-a-unit-another-unit-triggers-van.patch
@@ -15,7 +15,7 @@ Resolves: #1545676
3 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 182ba5240..679fe071e 100644
+index 182ba5240f..679fe071e7 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -715,6 +715,7 @@ static int automount_start_expire(Automount *a) {
@@ -87,7 +87,7 @@ index 182ba5240..679fe071e 100644
log_unit_warning(UNIT(a)->id,
"%s failed to queue umount startup job: %s",
diff --git a/src/core/path.c b/src/core/path.c
-index 51e36fa8b..0533bb4e2 100644
+index 51e36fa8be..0533bb4e21 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -475,6 +475,7 @@ static void path_enter_dead(Path *p, PathResult f) {
@@ -135,7 +135,7 @@ index 51e36fa8b..0533bb4e2 100644
path_mkdir(p);
diff --git a/src/core/timer.c b/src/core/timer.c
-index f318dc6f4..91d8db67e 100644
+index f318dc6f44..91d8db67e8 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -343,8 +343,18 @@ static void timer_enter_waiting(Timer *t, bool initial) {
diff --git a/SOURCES/0610-sd-journal-properly-handle-inotify-queue-overflow.patch b/SOURCES/0610-sd-journal-properly-handle-inotify-queue-overflow.patch
index 5ef42a9..64c4aef 100644
--- a/SOURCES/0610-sd-journal-properly-handle-inotify-queue-overflow.patch
+++ b/SOURCES/0610-sd-journal-properly-handle-inotify-queue-overflow.patch
@@ -29,7 +29,7 @@ Resolves: #1540538
5 files changed, 206 insertions(+), 51 deletions(-)
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index c74ad5fc5..dd8ef52d2 100644
+index c74ad5fc58..dd8ef52d2a 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -121,6 +121,8 @@ typedef struct JournalFile {
@@ -42,7 +42,7 @@ index c74ad5fc5..dd8ef52d2 100644
} JournalFile;
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
-index eb23ac28a..999e9d8cb 100644
+index eb23ac28ad..999e9d8cb6 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -81,6 +81,7 @@ struct Directory {
@@ -62,7 +62,7 @@ index eb23ac28a..999e9d8cb 100644
char *unique_field;
JournalFile *unique_file;
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 14b65cfed..9186f5188 100644
+index 14b65cfedd..9186f5188e 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1229,8 +1229,16 @@ static int add_any_file(sd_journal *j, const char *path) {
@@ -406,7 +406,7 @@ index 14b65cfed..9186f5188 100644
d = hashmap_get(j->directories_by_wd, INT_TO_PTR(e->wd));
if (d) {
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 5d4de9ec4..fcc591686 100644
+index 5d4de9ec4d..fcc591686f 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -861,3 +861,17 @@ char *prefix_root(const char *root, const char *path) {
@@ -428,7 +428,7 @@ index 5d4de9ec4..fcc591686 100644
+ return r;
+}
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index 34c016229..96490e12b 100644
+index 34c016229c..96490e12b1 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -66,6 +66,8 @@ int fsck_exists(const char *fstype);
diff --git a/SOURCES/0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch b/SOURCES/0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch
index 26c212a..a297a73 100644
--- a/SOURCES/0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch
+++ b/SOURCES/0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch
@@ -21,7 +21,7 @@ Related: #1540538
1 file changed, 3 insertions(+)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9186f5188..e1cde6e1c 100644
+index 9186f5188e..e1cde6e1c2 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2329,6 +2329,9 @@ _public_ int sd_journal_process(sd_journal *j) {
diff --git a/SOURCES/0612-journalctl-Periodically-call-sd_journal_process-in-j.patch b/SOURCES/0612-journalctl-Periodically-call-sd_journal_process-in-j.patch
index 026f18b..daa6808 100644
--- a/SOURCES/0612-journalctl-Periodically-call-sd_journal_process-in-j.patch
+++ b/SOURCES/0612-journalctl-Periodically-call-sd_journal_process-in-j.patch
@@ -24,7 +24,7 @@ Related: #1540538
1 file changed, 16 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 0be70764e..1e6d0761c 100644
+index 0be70764ef..1e6d0761c7 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -67,6 +67,8 @@
diff --git a/SOURCES/0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch b/SOURCES/0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
index 94dca30..ddac438 100644
--- a/SOURCES/0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
+++ b/SOURCES/0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch
@@ -22,7 +22,7 @@ Related: #1540538
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index e1cde6e1c..004fe646d 100644
+index e1cde6e1c2..004fe646d4 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1224,20 +1224,43 @@ static bool file_type_wanted(int flags, const char *filename) {
diff --git a/SOURCES/0614-tmpfiles-don-t-skip-cleanup-of-read-only-root-owned-.patch b/SOURCES/0614-tmpfiles-don-t-skip-cleanup-of-read-only-root-owned-.patch
index 67a051a..8616dc6 100644
--- a/SOURCES/0614-tmpfiles-don-t-skip-cleanup-of-read-only-root-owned-.patch
+++ b/SOURCES/0614-tmpfiles-don-t-skip-cleanup-of-read-only-root-owned-.patch
@@ -10,7 +10,7 @@ Resolves: #1533638
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index ddb274fce..5212d72f5 100644
+index ddb274fcec..5212d72f56 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -367,6 +367,7 @@ static int dir_cleanup(
diff --git a/SOURCES/0615-timer-we-already-got-the-trigger-before-no-need-to-c.patch b/SOURCES/0615-timer-we-already-got-the-trigger-before-no-need-to-c.patch
index 7af159f..44ac991 100644
--- a/SOURCES/0615-timer-we-already-got-the-trigger-before-no-need-to-c.patch
+++ b/SOURCES/0615-timer-we-already-got-the-trigger-before-no-need-to-c.patch
@@ -14,7 +14,7 @@ Resolves: #1549119
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/timer.c b/src/core/timer.c
-index 91d8db67e..0a264f60d 100644
+index 91d8db67e8..0a264f60d9 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -421,7 +421,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
diff --git a/SOURCES/0616-doc-fix-links-to-binfmt_misc-kernel-documentation.patch b/SOURCES/0616-doc-fix-links-to-binfmt_misc-kernel-documentation.patch
index 4440cec..6157912 100644
--- a/SOURCES/0616-doc-fix-links-to-binfmt_misc-kernel-documentation.patch
+++ b/SOURCES/0616-doc-fix-links-to-binfmt_misc-kernel-documentation.patch
@@ -13,7 +13,7 @@ Resolves: #1572244
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
-index 5b63cfb4c..1a57517d0 100644
+index 5b63cfb4c3..1a57517d0c 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -67,7 +67,7 @@
@@ -26,7 +26,7 @@ index 5b63cfb4c..1a57517d0 100644
and how to write rules.</para>
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index fcf5416c0..f2c52edce 100644
+index fcf5416c02..f2c52edcee 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1213,7 +1213,7 @@ static void test_files_same(void) {
@@ -39,7 +39,7 @@ index fcf5416c0..f2c52edce 100644
assert_se(documentation_url_is_valid("man:systemd.special(7)"));
assert_se(documentation_url_is_valid("info:bar"));
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 6be38937b..b28bf9bb8 100644
+index 6be38937b1..b28bf9bb8a 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -7,7 +7,7 @@
@@ -52,7 +52,7 @@ index 6be38937b..b28bf9bb8 100644
DefaultDependencies=no
Before=sysinit.target
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
-index 8c7c38631..8d22dc908 100644
+index 8c7c386318..8d22dc9089 100644
--- a/units/proc-sys-fs-binfmt_misc.mount
+++ b/units/proc-sys-fs-binfmt_misc.mount
@@ -7,7 +7,7 @@
@@ -65,7 +65,7 @@ index 8c7c38631..8d22dc908 100644
DefaultDependencies=no
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index 02dfe774d..e066f7fec 100644
+index 02dfe774df..e066f7fec9 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -8,7 +8,7 @@
diff --git a/SOURCES/0617-man-udevadm-remove-superfluous-version-from-subcomma.patch b/SOURCES/0617-man-udevadm-remove-superfluous-version-from-subcomma.patch
index cc5cc2d..9a5096b 100644
--- a/SOURCES/0617-man-udevadm-remove-superfluous-version-from-subcomma.patch
+++ b/SOURCES/0617-man-udevadm-remove-superfluous-version-from-subcomma.patch
@@ -9,7 +9,7 @@ Resolves: #1553076
1 file changed, 6 deletions(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index 8ef9e23aa..99eae387f 100644
+index 8ef9e23aa2..99eae387f5 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -187,12 +187,6 @@
diff --git a/SOURCES/0618-man-udevadm-correctly-show-the-short-version-of-exit.patch b/SOURCES/0618-man-udevadm-correctly-show-the-short-version-of-exit.patch
index f367e87..8ec42aa 100644
--- a/SOURCES/0618-man-udevadm-correctly-show-the-short-version-of-exit.patch
+++ b/SOURCES/0618-man-udevadm-correctly-show-the-short-version-of-exit.patch
@@ -9,7 +9,7 @@ Resolves: #1552712
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index 99eae387f..e11c2cb2e 100644
+index 99eae387f5..e11c2cb2e3 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -374,7 +374,7 @@
diff --git a/SOURCES/0619-core-timer-downgrade-message-about-random-time-addit.patch b/SOURCES/0619-core-timer-downgrade-message-about-random-time-addit.patch
index e7a2256..a5f3e84 100644
--- a/SOURCES/0619-core-timer-downgrade-message-about-random-time-addit.patch
+++ b/SOURCES/0619-core-timer-downgrade-message-about-random-time-addit.patch
@@ -16,7 +16,7 @@ Resolves: #1587906
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/timer.c b/src/core/timer.c
-index 0a264f60d..d32b007c7 100644
+index 0a264f60d9..d32b007c7c 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -335,7 +335,7 @@ static void add_random(Timer *t, usec_t *v) {
diff --git a/SOURCES/0620-fd-util-add-new-acquire_data_fd-API-helper.patch b/SOURCES/0620-fd-util-add-new-acquire_data_fd-API-helper.patch
index ab6b094..d3742c9 100644
--- a/SOURCES/0620-fd-util-add-new-acquire_data_fd-API-helper.patch
+++ b/SOURCES/0620-fd-util-add-new-acquire_data_fd-API-helper.patch
@@ -20,7 +20,7 @@ Related: #1446095
3 files changed, 215 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index af0953273..982f5e044 100644
+index af09532733..982f5e044f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -95,6 +95,7 @@
@@ -191,7 +191,7 @@ index af0953273..982f5e044 100644
+ return -EOPNOTSUPP;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index 526a6fe84..9c4be0256 100644
+index 526a6fe848..9c4be02566 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1112,3 +1112,13 @@ int parse_percent(const char *p);
@@ -209,7 +209,7 @@ index 526a6fe84..9c4be0256 100644
+
+int acquire_data_fd(const void *data, size_t size, unsigned flags);
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index f2c52edce..efb02ff53 100644
+index f2c52edcee..efb02ff530 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1861,6 +1861,54 @@ static void test_system_tasks_max_scale(void) {
diff --git a/SOURCES/0621-systemd-analyze-make-dump-work-for-large-of-units.patch b/SOURCES/0621-systemd-analyze-make-dump-work-for-large-of-units.patch
index d6a8fa4..2e827fe 100644
--- a/SOURCES/0621-systemd-analyze-make-dump-work-for-large-of-units.patch
+++ b/SOURCES/0621-systemd-analyze-make-dump-work-for-large-of-units.patch
@@ -17,7 +17,7 @@ Resolves: #1446095
3 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index ff84f6894..7116aaa88 100644
+index ff84f6894f..7116aaa88d 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -29,6 +29,7 @@
@@ -116,7 +116,7 @@ index ff84f6894..7116aaa88 100644
static int set_log_level(sd_bus *bus, char **args) {
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index d34ed042f..1766163b3 100644
+index d34ed042f6..1766163b33 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1064,7 +1064,7 @@ static int method_unsubscribe(sd_bus *bus, sd_bus_message *message, void *userda
@@ -173,7 +173,7 @@ index d34ed042f..1766163b3 100644
SD_BUS_METHOD("RemoveSnapshot", "s", NULL, method_remove_snapshot, 0),
SD_BUS_METHOD("Reload", NULL, NULL, method_reload, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/core/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf
-index 3997dd0b4..8187cf173 100644
+index 3997dd0b4e..8187cf1731 100644
--- a/src/core/org.freedesktop.systemd1.conf
+++ b/src/core/org.freedesktop.systemd1.conf
@@ -96,6 +96,10 @@
diff --git a/SOURCES/0622-use-max.-message-size-allowed-by-DBus-spec-8936.patch b/SOURCES/0622-use-max.-message-size-allowed-by-DBus-spec-8936.patch
index 18fbab6..2d6d9ab 100644
--- a/SOURCES/0622-use-max.-message-size-allowed-by-DBus-spec-8936.patch
+++ b/SOURCES/0622-use-max.-message-size-allowed-by-DBus-spec-8936.patch
@@ -13,7 +13,7 @@ Related: #1446095
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
-index 6a106862e..9c1e5a35b 100644
+index 6a106862ee..9c1e5a35b8 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -329,7 +329,7 @@ struct sd_bus {
diff --git a/SOURCES/0623-cryptsetup-support-LUKS2-on-disk-format.patch b/SOURCES/0623-cryptsetup-support-LUKS2-on-disk-format.patch
index a6fd5b4..0eabca8 100644
--- a/SOURCES/0623-cryptsetup-support-LUKS2-on-disk-format.patch
+++ b/SOURCES/0623-cryptsetup-support-LUKS2-on-disk-format.patch
@@ -17,7 +17,7 @@ Resolves: #1573838
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 69a015614..528c36c48 100644
+index 69a0156144..528c36c48b 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -36,7 +36,15 @@
diff --git a/SOURCES/0624-core-scope-fix-missing-fragment_path.patch b/SOURCES/0624-core-scope-fix-missing-fragment_path.patch
index 43fd578..b675eb5 100644
--- a/SOURCES/0624-core-scope-fix-missing-fragment_path.patch
+++ b/SOURCES/0624-core-scope-fix-missing-fragment_path.patch
@@ -24,7 +24,7 @@ u->fragment_path.
2 files changed, 9 insertions(+)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index da58bcc5c..f3d0851fe 100644
+index da58bcc5c9..f3d0851fe2 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3950,6 +3950,11 @@ int unit_load_fragment(Unit *u) {
@@ -40,7 +40,7 @@ index da58bcc5c..f3d0851fe 100644
* for unit files in the default directories, to make it easy
* to override things by placing things in /etc/systemd/system */
diff --git a/src/core/scope.c b/src/core/scope.c
-index ae6614fbf..29954ba28 100644
+index ae6614fbf0..29954ba285 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -150,6 +150,10 @@ static int scope_load(Unit *u) {
diff --git a/SOURCES/0625-units-don-t-put-udev-to-its-own-mount-namespace-with.patch b/SOURCES/0625-units-don-t-put-udev-to-its-own-mount-namespace-with.patch
index 8a4703c..2281a7e 100644
--- a/SOURCES/0625-units-don-t-put-udev-to-its-own-mount-namespace-with.patch
+++ b/SOURCES/0625-units-don-t-put-udev-to-its-own-mount-namespace-with.patch
@@ -16,7 +16,7 @@ Resolves: #1432211
1 file changed, 1 deletion(-)
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
-index 32f04d901..46b079515 100644
+index 32f04d901a..46b0795151 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -21,5 +21,4 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
diff --git a/SOURCES/0626-rules-disable-support-for-Lenovo-IR-cameras.patch b/SOURCES/0626-rules-disable-support-for-Lenovo-IR-cameras.patch
index ffdd7e3..1408f93 100644
--- a/SOURCES/0626-rules-disable-support-for-Lenovo-IR-cameras.patch
+++ b/SOURCES/0626-rules-disable-support-for-Lenovo-IR-cameras.patch
@@ -11,7 +11,7 @@ Resolves: #1540418
create mode 100644 rules/40-redhat-disable-lenovo-ir-camera.rules
diff --git a/Makefile.am b/Makefile.am
-index 8c73326fa..cbc120dad 100644
+index 8c73326fa8..cbc120dade 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3522,6 +3522,7 @@ dist_udevrules_DATA += \
@@ -24,7 +24,7 @@ index 8c73326fa..cbc120dad 100644
diff --git a/rules/40-redhat-disable-lenovo-ir-camera.rules b/rules/40-redhat-disable-lenovo-ir-camera.rules
new file mode 100644
-index 000000000..ea326d4ab
+index 0000000000..ea326d4aba
--- /dev/null
+++ b/rules/40-redhat-disable-lenovo-ir-camera.rules
@@ -0,0 +1,6 @@
diff --git a/SOURCES/0627-core-make-sure-systemctl-reload-or-try-restart-is-ac.patch b/SOURCES/0627-core-make-sure-systemctl-reload-or-try-restart-is-ac.patch
index ad3a14e..78ddada 100644
--- a/SOURCES/0627-core-make-sure-systemctl-reload-or-try-restart-is-ac.patch
+++ b/SOURCES/0627-core-make-sure-systemctl-reload-or-try-restart-is-ac.patch
@@ -18,7 +18,7 @@ Resolves: #1191920
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 1d0d6f67c..f0f75e01b 100644
+index 1d0d6f67c7..f0f75e01b0 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -850,7 +850,7 @@ int bus_unit_queue_job(
@@ -31,7 +31,7 @@ index 1d0d6f67c..f0f75e01b 100644
r = mac_selinux_unit_access_check(
diff --git a/src/core/job.c b/src/core/job.c
-index 1617e24c0..c9a43a4cb 100644
+index 1617e24c03..c9a43a4cb5 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -404,6 +404,13 @@ JobType job_type_collapse(JobType t, Unit *u) {
@@ -57,7 +57,7 @@ index 1617e24c0..c9a43a4cb 100644
};
diff --git a/src/core/job.h b/src/core/job.h
-index ce81607de..535052b48 100644
+index ce81607de8..535052b48f 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -63,6 +63,9 @@ enum JobType {
@@ -71,7 +71,7 @@ index ce81607de..535052b48 100644
* from transaction merging (there's no way for JOB_RELOAD and
* JOB_START to meet in one transaction). It can result from a merge
diff --git a/src/core/unit.c b/src/core/unit.c
-index 41d7b63d7..6d535ae12 100644
+index 41d7b63d73..6d535ae12e 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1868,6 +1868,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
diff --git a/SOURCES/0628-core-fix-confusing-logging-of-instantaneous-jobs.patch b/SOURCES/0628-core-fix-confusing-logging-of-instantaneous-jobs.patch
index f10ca96..3ee76b9 100644
--- a/SOURCES/0628-core-fix-confusing-logging-of-instantaneous-jobs.patch
+++ b/SOURCES/0628-core-fix-confusing-logging-of-instantaneous-jobs.patch
@@ -35,7 +35,7 @@ Resolves: #1506256
3 files changed, 58 insertions(+), 44 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index c9a43a4cb..612caa604 100644
+index c9a43a4cb5..612caa6048 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -504,10 +504,48 @@ static void job_change_type(Job *j, JobType newtype) {
@@ -145,7 +145,7 @@ index c9a43a4cb..612caa604 100644
if (r == -EALREADY)
r = job_finish_and_invalidate(j, JOB_DONE, true, true);
diff --git a/src/core/unit.c b/src/core/unit.c
-index 6d535ae12..907a4bf7f 100644
+index 6d535ae12e..907a4bf7fd 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1417,6 +1417,15 @@ static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
@@ -234,7 +234,7 @@ index 6d535ae12..907a4bf7f 100644
bool unit_can_reload(Unit *u) {
diff --git a/src/core/unit.h b/src/core/unit.h
-index 85f52df18..480e2e95f 100644
+index 85f52df187..480e2e95f1 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -562,6 +562,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants, UnitDependency d);
diff --git a/SOURCES/0629-core-correct-return-value-from-reload-methods.patch b/SOURCES/0629-core-correct-return-value-from-reload-methods.patch
index f140ed2..a5fc1db 100644
--- a/SOURCES/0629-core-correct-return-value-from-reload-methods.patch
+++ b/SOURCES/0629-core-correct-return-value-from-reload-methods.patch
@@ -16,7 +16,7 @@ Related: #1506256
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index a6d93b869..f726d9659 100644
+index a6d93b8691..f726d96591 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1081,7 +1081,7 @@ static int mount_reload(Unit *u) {
@@ -29,7 +29,7 @@ index a6d93b869..f726d9659 100644
static int mount_serialize(Unit *u, FILE *f, FDSet *fds) {
diff --git a/src/core/service.c b/src/core/service.c
-index 71ec5e37c..9622ce11f 100644
+index 71ec5e37c9..9622ce11ff 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1939,7 +1939,7 @@ static int service_reload(Unit *u) {
diff --git a/SOURCES/0630-core-always-try-harder-to-get-unit-status-message-fo.patch b/SOURCES/0630-core-always-try-harder-to-get-unit-status-message-fo.patch
index d0579ac..dd1ac1a 100644
--- a/SOURCES/0630-core-always-try-harder-to-get-unit-status-message-fo.patch
+++ b/SOURCES/0630-core-always-try-harder-to-get-unit-status-message-fo.patch
@@ -25,7 +25,7 @@ Related: #1506256
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 907a4bf7f..a33cbdf73 100644
+index 907a4bf7fd..a33cbdf73f 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1328,32 +1328,21 @@ static bool unit_assert_test(Unit *u) {
diff --git a/SOURCES/0631-core-unit_get_status_message_format-never-returns-NU.patch b/SOURCES/0631-core-unit_get_status_message_format-never-returns-NU.patch
index a838a48..b840498 100644
--- a/SOURCES/0631-core-unit_get_status_message_format-never-returns-NU.patch
+++ b/SOURCES/0631-core-unit_get_status_message_format-never-returns-NU.patch
@@ -15,7 +15,7 @@ Related: #1506256
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index a33cbdf73..22d9beed7 100644
+index a33cbdf73f..22d9beed76 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1332,10 +1332,9 @@ _pure_ static const char* unit_get_status_message_format(Unit *u, JobType t) {
diff --git a/SOURCES/0632-core-try-harder-to-get-job-completion-messages-too.patch b/SOURCES/0632-core-try-harder-to-get-job-completion-messages-too.patch
index ba4ecb0..0a8aef3 100644
--- a/SOURCES/0632-core-try-harder-to-get-job-completion-messages-too.patch
+++ b/SOURCES/0632-core-try-harder-to-get-job-completion-messages-too.patch
@@ -16,7 +16,7 @@ Related: #1506256
1 file changed, 68 insertions(+), 124 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 612caa604..f371f914d 100644
+index 612caa6048..f371f914d4 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -622,156 +622,100 @@ int job_run_and_invalidate(Job *j) {
diff --git a/SOURCES/0633-core-remove-generic-job-completion-messages-from-uni.patch b/SOURCES/0633-core-remove-generic-job-completion-messages-from-uni.patch
index 64e31a3..105ad63 100644
--- a/SOURCES/0633-core-remove-generic-job-completion-messages-from-uni.patch
+++ b/SOURCES/0633-core-remove-generic-job-completion-messages-from-uni.patch
@@ -23,7 +23,7 @@ Related: #1506256
8 files changed, 12 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 679fe071e..08519e49c 100644
+index 679fe071e7..08519e49ca 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -1126,7 +1126,6 @@ const UnitVTable automount_vtable = {
@@ -35,7 +35,7 @@ index 679fe071e..08519e49c 100644
.finished_stop_job = {
[JOB_DONE] = "Unset automount %s.",
diff --git a/src/core/busname.c b/src/core/busname.c
-index f626ba96d..a5e659049 100644
+index f626ba96d0..a5e659049d 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -1064,13 +1064,10 @@ const UnitVTable busname_vtable = {
@@ -53,7 +53,7 @@ index f626ba96d..a5e659049 100644
},
};
diff --git a/src/core/mount.c b/src/core/mount.c
-index f726d9659..0dc67dde6 100644
+index f726d96591..0dc67dde69 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1978,7 +1978,6 @@ const UnitVTable mount_vtable = {
@@ -65,7 +65,7 @@ index f726d9659..0dc67dde6 100644
},
.finished_stop_job = {
diff --git a/src/core/service.c b/src/core/service.c
-index 9622ce11f..8303a1e7e 100644
+index 9622ce11ff..8303a1e7ee 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3398,13 +3398,10 @@ const UnitVTable service_vtable = {
@@ -83,7 +83,7 @@ index 9622ce11f..8303a1e7e 100644
},
};
diff --git a/src/core/slice.c b/src/core/slice.c
-index 9154558b7..1cce3e121 100644
+index 9154558b7b..1cce3e1217 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -299,7 +299,6 @@ const UnitVTable slice_vtable = {
@@ -95,7 +95,7 @@ index 9154558b7..1cce3e121 100644
.finished_stop_job = {
[JOB_DONE] = "Removed slice %s.",
diff --git a/src/core/socket.c b/src/core/socket.c
-index 771af0d24..efefe7ce5 100644
+index 771af0d241..efefe7ce5d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2736,7 +2736,6 @@ const UnitVTable socket_vtable = {
@@ -107,7 +107,7 @@ index 771af0d24..efefe7ce5 100644
},
.finished_stop_job = {
diff --git a/src/core/swap.c b/src/core/swap.c
-index 984be2d9a..e71de4e65 100644
+index 984be2d9a9..e71de4e657 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1525,7 +1525,6 @@ const UnitVTable swap_vtable = {
@@ -119,7 +119,7 @@ index 984be2d9a..e71de4e65 100644
},
.finished_stop_job = {
diff --git a/src/core/target.c b/src/core/target.c
-index 2411a8e75..45248ad02 100644
+index 2411a8e758..45248ad025 100644
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -231,7 +231,6 @@ const UnitVTable target_vtable = {
diff --git a/SOURCES/0634-core-do-not-log-done-failed-condition-jobs-as-if-uni.patch b/SOURCES/0634-core-do-not-log-done-failed-condition-jobs-as-if-uni.patch
index 7223ea3..6453ca8 100644
--- a/SOURCES/0634-core-do-not-log-done-failed-condition-jobs-as-if-uni.patch
+++ b/SOURCES/0634-core-do-not-log-done-failed-condition-jobs-as-if-uni.patch
@@ -15,7 +15,7 @@ Related: #1506256
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index f371f914d..5e582b3d3 100644
+index f371f914d4..5e582b3d3c 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -692,13 +692,6 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
diff --git a/SOURCES/0635-core-log-completion-of-remaining-job-types.patch b/SOURCES/0635-core-log-completion-of-remaining-job-types.patch
index 6208a2b..33b4f51 100644
--- a/SOURCES/0635-core-log-completion-of-remaining-job-types.patch
+++ b/SOURCES/0635-core-log-completion-of-remaining-job-types.patch
@@ -14,7 +14,7 @@ Related: #1506256
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 5e582b3d3..086050aa7 100644
+index 5e582b3d3c..086050aa75 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -743,8 +743,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
diff --git a/SOURCES/0636-core-adjust-job-completion-message-log-levels.patch b/SOURCES/0636-core-adjust-job-completion-message-log-levels.patch
index 2d8d576..db83f86 100644
--- a/SOURCES/0636-core-adjust-job-completion-message-log-levels.patch
+++ b/SOURCES/0636-core-adjust-job-completion-message-log-levels.patch
@@ -18,7 +18,7 @@ Related: #1506256
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 086050aa7..1861c8a63 100644
+index 086050aa75..1861c8a633 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -714,6 +714,17 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
diff --git a/SOURCES/0637-mount-add-new-LazyUnmount-setting-for-mount-units-ma.patch b/SOURCES/0637-mount-add-new-LazyUnmount-setting-for-mount-units-ma.patch
index 87b4410..bcefc7a 100644
--- a/SOURCES/0637-mount-add-new-LazyUnmount-setting-for-mount-units-ma.patch
+++ b/SOURCES/0637-mount-add-new-LazyUnmount-setting-for-mount-units-ma.patch
@@ -16,7 +16,7 @@ Resolves: #1497264
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index dfa437b5d..1590c44ce 100644
+index dfa437b5d2..1590c44cec 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -329,6 +329,19 @@
@@ -40,7 +40,7 @@ index dfa437b5d..1590c44ce 100644
<term><varname>DirectoryMode=</varname></term>
<listitem><para>Directories of mount points (and any parent
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
-index 04beba631..cbb842f70 100644
+index 04beba631b..cbb842f706 100644
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -110,6 +110,7 @@ const sd_bus_vtable bus_mount_vtable[] = {
@@ -52,7 +52,7 @@ index 04beba631..cbb842f70 100644
BUS_EXEC_COMMAND_VTABLE("ExecMount", offsetof(Mount, exec_command[MOUNT_EXEC_MOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
BUS_EXEC_COMMAND_VTABLE("ExecUnmount", offsetof(Mount, exec_command[MOUNT_EXEC_UNMOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index b2fe627af..664bba0ef 100644
+index b2fe627af3..664bba0ef6 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -316,6 +316,7 @@ Mount.Type, config_parse_string, 0,
@@ -64,7 +64,7 @@ index b2fe627af..664bba0ef 100644
CGROUP_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
diff --git a/src/core/mount.c b/src/core/mount.c
-index 0dc67dde6..5fd7a86dd 100644
+index 0dc67dde69..5fd7a86ddd 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -690,7 +690,8 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
@@ -97,7 +97,7 @@ index 0dc67dde6..5fd7a86dd 100644
goto fail;
diff --git a/src/core/mount.h b/src/core/mount.h
-index 353222000..4e870299c 100644
+index 353222000f..4e870299cb 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -90,6 +90,8 @@ struct Mount {
diff --git a/SOURCES/0638-rules-Add-MODEL_ID-for-NVMe-device-7037.patch b/SOURCES/0638-rules-Add-MODEL_ID-for-NVMe-device-7037.patch
index 7d742c7..742172d 100644
--- a/SOURCES/0638-rules-Add-MODEL_ID-for-NVMe-device-7037.patch
+++ b/SOURCES/0638-rules-Add-MODEL_ID-for-NVMe-device-7037.patch
@@ -22,7 +22,7 @@ Resolves: #1397264
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index ba619633b..4aae97a9f 100644
+index ba619633b7..4aae97a9fb 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -28,10 +28,12 @@ KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{wwid}=="?*"
diff --git a/SOURCES/0639-umount-always-use-MNT_FORCE-in-umount_all-7213.patch b/SOURCES/0639-umount-always-use-MNT_FORCE-in-umount_all-7213.patch
index 95946ca..49fab27 100644
--- a/SOURCES/0639-umount-always-use-MNT_FORCE-in-umount_all-7213.patch
+++ b/SOURCES/0639-umount-always-use-MNT_FORCE-in-umount_all-7213.patch
@@ -36,7 +36,7 @@ Resolves: #1571098
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index 3eec0d459..91d67c06c 100644
+index 3eec0d4592..91d67c06ca 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -377,7 +377,9 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
diff --git a/SOURCES/0640-core-Implement-timeout-based-umount-remount-limit.patch b/SOURCES/0640-core-Implement-timeout-based-umount-remount-limit.patch
index e91ddac..8506c01 100644
--- a/SOURCES/0640-core-Implement-timeout-based-umount-remount-limit.patch
+++ b/SOURCES/0640-core-Implement-timeout-based-umount-remount-limit.patch
@@ -26,7 +26,7 @@ Related: #1571098
5 files changed, 168 insertions(+), 24 deletions(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index 91d67c06c..bd3896612 100644
+index 91d67c06ca..bd38966124 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -363,7 +363,84 @@ static int delete_dm(dev_t devnum) {
@@ -179,7 +179,7 @@ index 91d67c06c..bd3896612 100644
mount_points_list_free(&mp_list_head);
diff --git a/src/shared/def.h b/src/shared/def.h
-index 9e008a6d2..f193ab1f9 100644
+index 9e008a6d2d..f193ab1f9f 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -21,8 +21,6 @@
@@ -192,7 +192,7 @@ index 9e008a6d2..f193ab1f9 100644
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
#define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)
diff --git a/src/shared/login-shared.c b/src/shared/login-shared.c
-index 054c77503..5da0f0583 100644
+index 054c77503b..5da0f05838 100644
--- a/src/shared/login-shared.c
+++ b/src/shared/login-shared.c
@@ -21,6 +21,7 @@
@@ -204,7 +204,7 @@ index 054c77503..5da0f0583 100644
bool session_id_valid(const char *id) {
assert(id);
diff --git a/src/shared/util.c b/src/shared/util.c
-index 982f5e044..3216f004a 100644
+index 982f5e044f..3216f004ad 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -9049,3 +9049,64 @@ try_dev_shm_without_o_tmpfile:
@@ -273,7 +273,7 @@ index 982f5e044..3216f004a 100644
+ return -EPROTO;
+}
diff --git a/src/shared/util.h b/src/shared/util.h
-index 9c4be0256..998f882bb 100644
+index 9c4be02566..998f882bbb 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -22,6 +22,7 @@
diff --git a/SOURCES/0641-core-Implement-sync_with_progress.patch b/SOURCES/0641-core-Implement-sync_with_progress.patch
index fa25ccc..68442a6 100644
--- a/SOURCES/0641-core-Implement-sync_with_progress.patch
+++ b/SOURCES/0641-core-Implement-sync_with_progress.patch
@@ -19,7 +19,7 @@ Related: #1571098
1 file changed, 111 insertions(+), 5 deletions(-)
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 71f001ac1..0b0a54a7d 100644
+index 71f001ac13..0b0a54a7de 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -53,6 +53,9 @@
diff --git a/SOURCES/0642-journal-fix-HMAC-calculation-when-appending-a-data-o.patch b/SOURCES/0642-journal-fix-HMAC-calculation-when-appending-a-data-o.patch
index 0a34165..86699fb 100644
--- a/SOURCES/0642-journal-fix-HMAC-calculation-when-appending-a-data-o.patch
+++ b/SOURCES/0642-journal-fix-HMAC-calculation-when-appending-a-data-o.patch
@@ -17,7 +17,7 @@ objects are scanned sequentially.
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 2bb3a9757..586f620e2 100644
+index 2bb3a97574..586f620e21 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1099,6 +1099,12 @@ static int journal_file_append_data(
diff --git a/SOURCES/0643-journal-forward-messages-from-dev-log-unmodified-to-.patch b/SOURCES/0643-journal-forward-messages-from-dev-log-unmodified-to-.patch
index d9243ad..8c655fa 100644
--- a/SOURCES/0643-journal-forward-messages-from-dev-log-unmodified-to-.patch
+++ b/SOURCES/0643-journal-forward-messages-from-dev-log-unmodified-to-.patch
@@ -14,7 +14,7 @@ Resolves: #1409659
3 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 7c69061f4..7e67e055e 100644
+index 7c69061f47..7e67e055e3 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1294,7 +1294,7 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
@@ -27,7 +27,7 @@ index 7c69061f4..7e67e055e 100644
log_warning("Got file descriptors via syslog socket. Ignoring.");
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index b499a0d38..01d2bf69f 100644
+index b499a0d381..01d2bf69f4 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -109,7 +109,7 @@ static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned
@@ -121,7 +121,7 @@ index b499a0d38..01d2bf69f 100644
IOVEC_SET_STRING(iovec[n++], message);
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
-index 3774ebdf0..e593be99a 100644
+index 3774ebdf05..e593be99ab 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -29,7 +29,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid);
diff --git a/SOURCES/0644-tmpfiles-use-safe_glob.patch b/SOURCES/0644-tmpfiles-use-safe_glob.patch
index e231fd9..8539686 100644
--- a/SOURCES/0644-tmpfiles-use-safe_glob.patch
+++ b/SOURCES/0644-tmpfiles-use-safe_glob.patch
@@ -22,7 +22,7 @@ Resolves: #1436004
3 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 3216f004a..78967103a 100644
+index 3216f004ad..78967103a6 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -49,7 +49,6 @@
@@ -110,7 +110,7 @@ index 3216f004a..78967103a 100644
_cleanup_globfree_ glob_t g = {};
int k;
diff --git a/src/shared/util.h b/src/shared/util.h
-index 998f882bb..cf096aa07 100644
+index 998f882bbb..cf096aa07b 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -44,6 +44,7 @@
@@ -130,7 +130,7 @@ index 998f882bb..cf096aa07 100644
int dirent_ensure_type(DIR *d, struct dirent *de);
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 5212d72f5..8a75efb22 100644
+index 5212d72f56..8a75efb229 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1095,19 +1095,14 @@ static int item_do_children(Item *i, const char *path, action_t action) {
diff --git a/SOURCES/0645-Fix-SELinux-labels-in-cgroup-filesystem-root-directo.patch b/SOURCES/0645-Fix-SELinux-labels-in-cgroup-filesystem-root-directo.patch
index 76c05e5..d243fea 100644
--- a/SOURCES/0645-Fix-SELinux-labels-in-cgroup-filesystem-root-directo.patch
+++ b/SOURCES/0645-Fix-SELinux-labels-in-cgroup-filesystem-root-directo.patch
@@ -23,7 +23,7 @@ and remounted back read-only.
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 521545e5c..7a2cae4a3 100644
+index 521545e5ce..7a2cae4a39 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -363,14 +363,22 @@ int mount_setup(bool loaded_policy) {
diff --git a/SOURCES/0646-core-dont-t-remount-sys-fs-cgroup-for-relabel-if-not.patch b/SOURCES/0646-core-dont-t-remount-sys-fs-cgroup-for-relabel-if-not.patch
index 0a3f6e4..a182180 100644
--- a/SOURCES/0646-core-dont-t-remount-sys-fs-cgroup-for-relabel-if-not.patch
+++ b/SOURCES/0646-core-dont-t-remount-sys-fs-cgroup-for-relabel-if-not.patch
@@ -30,7 +30,7 @@ Fixes #7901.
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 7a2cae4a3..ed493cbe3 100644
+index 7a2cae4a39..ed493cbe36 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -25,6 +25,8 @@
diff --git a/SOURCES/0647-fix-race-between-daemon-reload-and-other-commands.patch b/SOURCES/0647-fix-race-between-daemon-reload-and-other-commands.patch
index 088800a..8fc4936 100644
--- a/SOURCES/0647-fix-race-between-daemon-reload-and-other-commands.patch
+++ b/SOURCES/0647-fix-race-between-daemon-reload-and-other-commands.patch
@@ -28,7 +28,7 @@ during it and sends JobRemoved after the reload has finished.
4 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index 1861c8a63..275503169 100644
+index 1861c8a633..275503169b 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -53,6 +53,7 @@ Job* job_new_raw(Unit *unit) {
@@ -123,7 +123,7 @@ index 1861c8a63..275503169 100644
/* Fail depending jobs on failure */
if (result != JOB_DONE && recursive) {
diff --git a/src/core/job.h b/src/core/job.h
-index 535052b48..4ae6f2802 100644
+index 535052b48f..4ae6f28020 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -172,10 +172,12 @@ struct Job {
@@ -140,7 +140,7 @@ index 535052b48..4ae6f2802 100644
Job* job_install(Job *j);
int job_install_deserialized(Job *j);
diff --git a/src/core/manager.c b/src/core/manager.c
-index 47b09e1e9..9c406bb5b 100644
+index 47b09e1e93..9c406bb5bf 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2702,6 +2702,18 @@ finish:
@@ -173,7 +173,7 @@ index 47b09e1e9..9c406bb5b 100644
return r;
diff --git a/src/core/manager.h b/src/core/manager.h
-index e91e7bd8b..90d2d982e 100644
+index e91e7bd8b3..90d2d982e1 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -270,6 +270,9 @@ struct Manager {
diff --git a/SOURCES/0648-core-delay-adding-target-dependencies-until-all-unit.patch b/SOURCES/0648-core-delay-adding-target-dependencies-until-all-unit.patch
index 4145956..82e9556 100644
--- a/SOURCES/0648-core-delay-adding-target-dependencies-until-all-unit.patch
+++ b/SOURCES/0648-core-delay-adding-target-dependencies-until-all-unit.patch
@@ -42,7 +42,7 @@ Resolves: #1368856
4 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 9c406bb5b..0466e4bb8 100644
+index 9c406bb5bf..0466e4bb8a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1373,6 +1373,41 @@ Unit *manager_get_unit(Manager *m, const char *name) {
@@ -100,7 +100,7 @@ index 9c406bb5b..0466e4bb8 100644
}
diff --git a/src/core/manager.h b/src/core/manager.h
-index 90d2d982e..b0e4cad1f 100644
+index 90d2d982e1..b0e4cad1fc 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -114,6 +114,9 @@ struct Manager {
@@ -114,7 +114,7 @@ index 90d2d982e..b0e4cad1f 100644
/* We use two hash tables here, since the same PID might be
diff --git a/src/core/unit.c b/src/core/unit.c
-index 22d9beed7..cfddce34d 100644
+index 22d9beed76..cfddce34d4 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -519,6 +519,9 @@ void unit_free(Unit *u) {
@@ -192,7 +192,7 @@ index 22d9beed7..cfddce34d 100644
r = unit_add_slice_dependencies(u);
if (r < 0)
diff --git a/src/core/unit.h b/src/core/unit.h
-index 480e2e95f..dfec9cea0 100644
+index 480e2e95f1..dfec9cea01 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -162,6 +162,9 @@ struct Unit {
diff --git a/SOURCES/0649-man-correct-the-meaning-of-TimeoutStopSec.patch b/SOURCES/0649-man-correct-the-meaning-of-TimeoutStopSec.patch
index aa55434..c652988 100644
--- a/SOURCES/0649-man-correct-the-meaning-of-TimeoutStopSec.patch
+++ b/SOURCES/0649-man-correct-the-meaning-of-TimeoutStopSec.patch
@@ -11,7 +11,7 @@ Resolves: #1305509
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index a274db480..d147e449a 100644
+index a274db4803..d147e449a6 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -429,12 +429,12 @@
diff --git a/SOURCES/0650-rules-mark-hotplugged-memory-as-movable.patch b/SOURCES/0650-rules-mark-hotplugged-memory-as-movable.patch
index 996c107..2941fce 100644
--- a/SOURCES/0650-rules-mark-hotplugged-memory-as-movable.patch
+++ b/SOURCES/0650-rules-mark-hotplugged-memory-as-movable.patch
@@ -18,7 +18,7 @@ Resolves: #1563532
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 34a1df9c4..26f726001 100644
+index 34a1df9c48..26f7260010 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -4,7 +4,7 @@
diff --git a/SOURCES/0651-udev-add-ID_INPUT_SWITCH-for-devices-with-switch-cap.patch b/SOURCES/0651-udev-add-ID_INPUT_SWITCH-for-devices-with-switch-cap.patch
index 712b78f..e6c95f2 100644
--- a/SOURCES/0651-udev-add-ID_INPUT_SWITCH-for-devices-with-switch-cap.patch
+++ b/SOURCES/0651-udev-add-ID_INPUT_SWITCH-for-devices-with-switch-cap.patch
@@ -12,7 +12,7 @@ Resolves: #1597240
1 file changed, 3 insertions(+)
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
-index 46f1c539d..d6ae07304 100644
+index 46f1c539d2..d6ae073044 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -250,6 +250,9 @@ static int builtin_input_id(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/SOURCES/0652-rules-disable-support-for-Dell-IR-cameras.patch b/SOURCES/0652-rules-disable-support-for-Dell-IR-cameras.patch
index f1348c2..3db00a5 100644
--- a/SOURCES/0652-rules-disable-support-for-Dell-IR-cameras.patch
+++ b/SOURCES/0652-rules-disable-support-for-Dell-IR-cameras.patch
@@ -11,7 +11,7 @@ Resolves: #1591316
create mode 100644 rules/40-redhat-disable-dell-ir-camera.rules
diff --git a/Makefile.am b/Makefile.am
-index cbc120dad..40ebbe98e 100644
+index cbc120dade..40ebbe98ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3523,6 +3523,7 @@ dist_udevrules_DATA += \
@@ -24,7 +24,7 @@ index cbc120dad..40ebbe98e 100644
diff --git a/rules/40-redhat-disable-dell-ir-camera.rules b/rules/40-redhat-disable-dell-ir-camera.rules
new file mode 100644
-index 000000000..2806482a5
+index 0000000000..2806482a58
--- /dev/null
+++ b/rules/40-redhat-disable-dell-ir-camera.rules
@@ -0,0 +1,2 @@
diff --git a/SOURCES/0653-rpm-fix-systemd_user_post-macro.patch b/SOURCES/0653-rpm-fix-systemd_user_post-macro.patch
index 0a2c82b..3367553 100644
--- a/SOURCES/0653-rpm-fix-systemd_user_post-macro.patch
+++ b/SOURCES/0653-rpm-fix-systemd_user_post-macro.patch
@@ -22,7 +22,7 @@ Related: #1582383
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
-index bea6ef1da..662791ccc 100644
+index bea6ef1da3..662791cccc 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -43,7 +43,7 @@ if [ $1 -eq 1 ] ; then \
diff --git a/SOURCES/0654-rpm-remove-confusing-user-before-global.patch b/SOURCES/0654-rpm-remove-confusing-user-before-global.patch
index 965083e..8cb35b3 100644
--- a/SOURCES/0654-rpm-remove-confusing-user-before-global.patch
+++ b/SOURCES/0654-rpm-remove-confusing-user-before-global.patch
@@ -12,7 +12,7 @@ Resolves: #1582383
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
-index 662791ccc..3d6e41274 100644
+index 662791cccc..3d6e412744 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -43,7 +43,7 @@ if [ $1 -eq 1 ] ; then \
diff --git a/SOURCES/0655-automount-handle-state-changes-of-the-corresponding-.patch b/SOURCES/0655-automount-handle-state-changes-of-the-corresponding-.patch
index f835f2f..cf4b0c6 100644
--- a/SOURCES/0655-automount-handle-state-changes-of-the-corresponding-.patch
+++ b/SOURCES/0655-automount-handle-state-changes-of-the-corresponding-.patch
@@ -16,7 +16,7 @@ Resolves: #1596241
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index 08519e49c..f57782b9b 100644
+index 08519e49ca..f57782b9b8 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -499,6 +499,7 @@ static int automount_send_ready(Automount *a, Set *tokens, int status) {
diff --git a/SOURCES/0656-man-document-that-SIGCONT-always-follows-SIGTERM.patch b/SOURCES/0656-man-document-that-SIGCONT-always-follows-SIGTERM.patch
index a288f3b..9bec6e0 100644
--- a/SOURCES/0656-man-document-that-SIGCONT-always-follows-SIGTERM.patch
+++ b/SOURCES/0656-man-document-that-SIGCONT-always-follows-SIGTERM.patch
@@ -12,7 +12,7 @@ Resolves: #1601794
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
-index e57f0e724..1292f4f51 100644
+index e57f0e7242..1292f4f513 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -136,7 +136,13 @@
diff --git a/SOURCES/0657-rules-add-udev-rule-that-automatically-offline-HW-at.patch b/SOURCES/0657-rules-add-udev-rule-that-automatically-offline-HW-at.patch
index fcef9bc..2bc5b6b 100644
--- a/SOURCES/0657-rules-add-udev-rule-that-automatically-offline-HW-at.patch
+++ b/SOURCES/0657-rules-add-udev-rule-that-automatically-offline-HW-at.patch
@@ -12,7 +12,7 @@ Resolves: #1597958
create mode 100644 rules/40-redhat-hotunplug.rules
diff --git a/Makefile.am b/Makefile.am
-index 40ebbe98e..3995dcce8 100644
+index 40ebbe98ee..3995dcce89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3524,6 +3524,7 @@ dist_udevrules_DATA += \
@@ -25,7 +25,7 @@ index 40ebbe98e..3995dcce8 100644
diff --git a/rules/40-redhat-hotunplug.rules b/rules/40-redhat-hotunplug.rules
new file mode 100644
-index 000000000..3befdaffc
+index 0000000000..3befdaffc8
--- /dev/null
+++ b/rules/40-redhat-hotunplug.rules
@@ -0,0 +1,14 @@
diff --git a/SOURCES/0658-Revert-rules-mark-hotplugged-memory-as-movable.patch b/SOURCES/0658-Revert-rules-mark-hotplugged-memory-as-movable.patch
index 264a428..65bdb91 100644
--- a/SOURCES/0658-Revert-rules-mark-hotplugged-memory-as-movable.patch
+++ b/SOURCES/0658-Revert-rules-mark-hotplugged-memory-as-movable.patch
@@ -11,7 +11,7 @@ Resolves: #1614686
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 26f726001..34a1df9c4 100644
+index 26f7260010..34a1df9c48 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -4,7 +4,7 @@
diff --git a/SOURCES/0659-rules-implement-new-memory-hotplug-policy.patch b/SOURCES/0659-rules-implement-new-memory-hotplug-policy.patch
index 250ce61..b9566f7 100644
--- a/SOURCES/0659-rules-implement-new-memory-hotplug-policy.patch
+++ b/SOURCES/0659-rules-implement-new-memory-hotplug-policy.patch
@@ -28,7 +28,7 @@ Resolves: #1614686
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
-index 34a1df9c4..1b10e173d 100644
+index 34a1df9c48..1b10e173d6 100644
--- a/rules/40-redhat.rules
+++ b/rules/40-redhat.rules
@@ -4,7 +4,14 @@
diff --git a/SOURCES/0660-Revert-rules-add-udev-rule-that-automatically-offlin.patch b/SOURCES/0660-Revert-rules-add-udev-rule-that-automatically-offlin.patch
index 26899fc..8a9674c 100644
--- a/SOURCES/0660-Revert-rules-add-udev-rule-that-automatically-offlin.patch
+++ b/SOURCES/0660-Revert-rules-add-udev-rule-that-automatically-offlin.patch
@@ -14,7 +14,7 @@ Related: #1597958
delete mode 100644 rules/40-redhat-hotunplug.rules
diff --git a/Makefile.am b/Makefile.am
-index 3995dcce8..40ebbe98e 100644
+index 3995dcce89..40ebbe98ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3524,7 +3524,6 @@ dist_udevrules_DATA += \
@@ -27,7 +27,7 @@ index 3995dcce8..40ebbe98e 100644
diff --git a/rules/40-redhat-hotunplug.rules b/rules/40-redhat-hotunplug.rules
deleted file mode 100644
-index 3befdaffc..000000000
+index 3befdaffc8..0000000000
--- a/rules/40-redhat-hotunplug.rules
+++ /dev/null
@@ -1,14 +0,0 @@
diff --git a/SOURCES/0661-cryptsetup-generator-introduce-basic-keydev-support.patch b/SOURCES/0661-cryptsetup-generator-introduce-basic-keydev-support.patch
index b25d5ac..a36b021 100644
--- a/SOURCES/0661-cryptsetup-generator-introduce-basic-keydev-support.patch
+++ b/SOURCES/0661-cryptsetup-generator-introduce-basic-keydev-support.patch
@@ -31,7 +31,7 @@ Resolves: #1619743
2 files changed, 131 insertions(+), 5 deletions(-)
diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
-index b6270358e..8cfd8b6a8 100644
+index b6270358ea..8cfd8b6a8a 100644
--- a/man/systemd-cryptsetup-generator.xml
+++ b/man/systemd-cryptsetup-generator.xml
@@ -168,6 +168,20 @@
@@ -56,7 +56,7 @@ index b6270358e..8cfd8b6a8 100644
is honored only by initial RAM disk
(initrd) while
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 5f29093f5..42c30c5ca 100644
+index 5f29093f54..42c30c5ca9 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -38,6 +38,7 @@
diff --git a/SOURCES/0662-cryptsetup-generator-don-t-return-error-if-target-di.patch b/SOURCES/0662-cryptsetup-generator-don-t-return-error-if-target-di.patch
index 2282395..1af0941 100644
--- a/SOURCES/0662-cryptsetup-generator-don-t-return-error-if-target-di.patch
+++ b/SOURCES/0662-cryptsetup-generator-don-t-return-error-if-target-di.patch
@@ -10,7 +10,7 @@ Related: #1619743
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 42c30c5ca..a9598180c 100644
+index 42c30c5ca9..a9598180c6 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -63,11 +63,11 @@ static int generate_keydev_mount(const char *name, const char *keydev, char **un
diff --git a/SOURCES/0663-cryptsetup-generator-allow-whitespace-characters-in-.patch b/SOURCES/0663-cryptsetup-generator-allow-whitespace-characters-in-.patch
index 0f31200..6bea064 100644
--- a/SOURCES/0663-cryptsetup-generator-allow-whitespace-characters-in-.patch
+++ b/SOURCES/0663-cryptsetup-generator-allow-whitespace-characters-in-.patch
@@ -14,7 +14,7 @@ Related: #1619743
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index a9598180c..7b90d2615 100644
+index a9598180c6..7b90d26156 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -421,27 +421,36 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
diff --git a/SOURCES/0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch b/SOURCES/0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
index 192052c..fcb096c 100644
--- a/SOURCES/0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
+++ b/SOURCES/0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
@@ -17,7 +17,7 @@ Resolves: #1619743
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index cfddce34d..e8532a057 100644
+index cfddce34d4..e8532a057d 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1131,13 +1131,23 @@ static int unit_add_mount_dependencies(Unit *u) {
diff --git a/SOURCES/0665-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/SOURCES/0665-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
index d4b5fae..6c89f6f 100644
--- a/SOURCES/0665-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
+++ b/SOURCES/0665-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
@@ -14,7 +14,7 @@ Resolves: CVE-2018-15688
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
-index ea863f45e..649bbea30 100644
+index ea863f45e4..649bbea304 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -100,7 +100,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) {
diff --git a/SOURCES/0666-test-functions-fix-dbus-1-installation.patch b/SOURCES/0666-test-functions-fix-dbus-1-installation.patch
new file mode 100644
index 0000000..e139dbb
--- /dev/null
+++ b/SOURCES/0666-test-functions-fix-dbus-1-installation.patch
@@ -0,0 +1,29 @@
+From f22596b2032c31e2014c17bf182737c57cf3b83a Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Wed, 4 Nov 2015 18:33:37 +0000
+Subject: [PATCH] test-functions: fix dbus-1 installation
+
+The basic setup for the well-known system and session buses is
+now done in read-only files in ${datadir} (normally /usr/share).
+See the NEWS entry for 1.9.18 for details.
+
+http://cgit.freedesktop.org/dbus/dbus/tree/NEWS
+
+Cherry-picked from: e63b61be5350dbe92ea12e1eeb96dde251ed9292
+---
+ test/test-functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-functions b/test/test-functions
+index cf5612370b..def16d3277 100644
+--- a/test/test-functions
++++ b/test/test-functions
+@@ -271,7 +271,7 @@ install_dbus() {
+ inst $ROOTLIBDIR/system/dbus.service
+
+ find \
+- /etc/dbus-1 -xtype f \
++ /etc/dbus-1 /usr/share/dbus-1 -xtype f \
+ | while read file; do
+ inst $file
+ done
diff --git a/SOURCES/0667-journald-do-not-store-the-iovec-entry-for-process-co.patch b/SOURCES/0667-journald-do-not-store-the-iovec-entry-for-process-co.patch
new file mode 100644
index 0000000..7608c0d
--- /dev/null
+++ b/SOURCES/0667-journald-do-not-store-the-iovec-entry-for-process-co.patch
@@ -0,0 +1,376 @@
+From 78c1a16731f8bec0e854ed570292afc8bf3d8030 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 3 Jan 2019 11:35:22 +0100
+Subject: [PATCH] journald: do not store the iovec entry for process
+ commandline on stack
+
+This fixes a crash where we would read the commandline, whose length is under
+control of the sending program, and then crash when trying to create a stack
+allocation for it.
+
+CVE-2018-16864
+https://bugzilla.redhat.com/show_bug.cgi?id=1653855
+
+The message actually doesn't get written to disk, because
+journal_file_append_entry() returns -E2BIG.
+
+Resolves: #1657788
+---
+ src/journal/coredump.c | 189 +++++++++++++---------------------
+ src/journal/journald-server.c | 13 +--
+ src/shared/util.c | 17 +++
+ src/shared/util.h | 7 ++
+ 4 files changed, 98 insertions(+), 128 deletions(-)
+
+diff --git a/src/journal/coredump.c b/src/journal/coredump.c
+index 59ccd46bb0..40de86f050 100644
+--- a/src/journal/coredump.c
++++ b/src/journal/coredump.c
+@@ -526,14 +526,6 @@ static int compose_open_fds(pid_t pid, char **open_fds) {
+ }
+
+ int main(int argc, char* argv[]) {
+-
+- /* The small core field we allocate on the stack, to keep things simple */
+- char
+- *core_pid = NULL, *core_uid = NULL, *core_gid = NULL, *core_signal = NULL,
+- *core_session = NULL, *core_exe = NULL, *core_comm = NULL, *core_cmdline = NULL,
+- *core_cgroup = NULL, *core_cwd = NULL, *core_root = NULL, *core_unit = NULL,
+- *core_slice = NULL;
+-
+ /* The larger ones we allocate on the heap */
+ _cleanup_free_ char
+ *core_timestamp = NULL, *core_message = NULL, *coredump_data = NULL, *core_owner_uid = NULL,
+@@ -547,7 +539,8 @@ int main(int argc, char* argv[]) {
+
+ struct iovec iovec[26];
+ off_t coredump_size;
+- int r, j = 0;
++ int r;
++ unsigned int n_iovec = 0;
+ uid_t uid, owner_uid;
+ gid_t gid;
+ pid_t pid;
+@@ -634,151 +627,107 @@ int main(int argc, char* argv[]) {
+ goto finish;
+ }
+
+- core_unit = strjoina("COREDUMP_UNIT=", t);
+- free(t);
+-
+- } else if (cg_pid_get_user_unit(pid, &t) >= 0) {
+- core_unit = strjoina("COREDUMP_USER_UNIT=", t);
+- free(t);
++ if (!set_iovec_field_free(iovec, &n_iovec, "COREDUMP_UNIT=", t)) {
++ r = log_oom();
++ goto finish;
++ }
+ }
+
+- if (core_unit)
+- IOVEC_SET_STRING(iovec[j++], core_unit);
++ if (cg_pid_get_user_unit(pid, &t) >= 0) {
++ if (!set_iovec_field_free(iovec, &n_iovec, "COREDUMP_USER_UNIT=", t)) {
++ r = log_oom();
++ goto finish;
++ }
++ }
+
+ /* OK, now we know it's not the journal, hence we can make use
+ * of it now. */
+ log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
+ log_open();
+
+- core_pid = strjoina("COREDUMP_PID=", info[INFO_PID]);
+- IOVEC_SET_STRING(iovec[j++], core_pid);
+-
+- core_uid = strjoina("COREDUMP_UID=", info[INFO_UID]);
+- IOVEC_SET_STRING(iovec[j++], core_uid);
+-
+- core_gid = strjoina("COREDUMP_GID=", info[INFO_GID]);
+- IOVEC_SET_STRING(iovec[j++], core_gid);
+-
+- core_signal = strjoina("COREDUMP_SIGNAL=", info[INFO_SIGNAL]);
+- IOVEC_SET_STRING(iovec[j++], core_signal);
+-
+- if (sd_pid_get_session(pid, &t) >= 0) {
+- core_session = strjoina("COREDUMP_SESSION=", t);
+- free(t);
+-
+- IOVEC_SET_STRING(iovec[j++], core_session);
++ if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_PID=", info[INFO_PID])) {
++ r = log_oom();
++ goto finish;
+ }
+
+- if (sd_pid_get_owner_uid(pid, &owner_uid) >= 0) {
+- r = asprintf(&core_owner_uid,
+- "COREDUMP_OWNER_UID=" UID_FMT, owner_uid);
+- if (r > 0)
+- IOVEC_SET_STRING(iovec[j++], core_owner_uid);
++ if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_UID=", info[INFO_UID])) {
++ r = log_oom();
++ goto finish;
+ }
+
+- if (sd_pid_get_slice(pid, &t) >= 0) {
+- core_slice = strjoina("COREDUMP_SLICE=", t);
+- free(t);
++ if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_GID=", info[INFO_GID])) {
++ r = log_oom();
++ goto finish;
++ }
+
+- IOVEC_SET_STRING(iovec[j++], core_slice);
++ if (!set_iovec_string_field(iovec, &n_iovec, "COREDUMP_SIGNAL=", info[INFO_SIGNAL])) {
++ r = log_oom();
++ goto finish;
+ }
+
+- if (comm) {
+- core_comm = strjoina("COREDUMP_COMM=", comm);
+- IOVEC_SET_STRING(iovec[j++], core_comm);
++ if (comm && !set_iovec_string_field(iovec, &n_iovec, "COREDUMP_COMM=", comm)) {
++ r = log_oom();
++ goto finish;
+ }
+
+- if (exe) {
+- core_exe = strjoina("COREDUMP_EXE=", exe);
+- IOVEC_SET_STRING(iovec[j++], core_exe);
++ if (exe && !set_iovec_string_field(iovec, &n_iovec, "COREDUMP_EXE=", exe)) {
++ r = log_oom();
++ goto finish;
+ }
+
+- if (get_process_cmdline(pid, 0, false, &t) >= 0) {
+- core_cmdline = strjoina("COREDUMP_CMDLINE=", t);
+- free(t);
++ if (sd_pid_get_session(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_SESSION=", t);
+
+- IOVEC_SET_STRING(iovec[j++], core_cmdline);
++ if (sd_pid_get_owner_uid(pid, &owner_uid) >= 0) {
++ r = asprintf(&core_owner_uid,
++ "COREDUMP_OWNER_UID=" UID_FMT, owner_uid);
++ if (r > 0)
++ IOVEC_SET_STRING(iovec[n_iovec++], core_owner_uid);
+ }
+
+- if (cg_pid_get_path_shifted(pid, NULL, &t) >= 0) {
+- core_cgroup = strjoina("COREDUMP_CGROUP=", t);
+- free(t);
++ if (sd_pid_get_slice(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_SLICE=", t);
+
+- IOVEC_SET_STRING(iovec[j++], core_cgroup);
+- }
++ if (get_process_cmdline(pid, 0, false, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CMDLINE=", t);
+
+- if (compose_open_fds(pid, &t) >= 0) {
+- core_open_fds = strappend("COREDUMP_OPEN_FDS=", t);
+- free(t);
++ if (cg_pid_get_path_shifted(pid, NULL, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CGROUP=", t);
+
+- if (core_open_fds)
+- IOVEC_SET_STRING(iovec[j++], core_open_fds);
+- }
++ if (compose_open_fds(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_OPEN_FDS=", t);
+
+ p = procfs_file_alloca(pid, "status");
+- if (read_full_file(p, &t, NULL) >= 0) {
+- core_proc_status = strappend("COREDUMP_PROC_STATUS=", t);
+- free(t);
+-
+- if (core_proc_status)
+- IOVEC_SET_STRING(iovec[j++], core_proc_status);
+- }
++ if (read_full_file(p, &t, NULL) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_STATUS=", t);
+
+ p = procfs_file_alloca(pid, "maps");
+- if (read_full_file(p, &t, NULL) >= 0) {
+- core_proc_maps = strappend("COREDUMP_PROC_MAPS=", t);
+- free(t);
+-
+- if (core_proc_maps)
+- IOVEC_SET_STRING(iovec[j++], core_proc_maps);
+- }
++ if (read_full_file(p, &t, NULL) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_MAPS=", t);
+
+ p = procfs_file_alloca(pid, "limits");
+- if (read_full_file(p, &t, NULL) >= 0) {
+- core_proc_limits = strappend("COREDUMP_PROC_LIMITS=", t);
+- free(t);
+-
+- if (core_proc_limits)
+- IOVEC_SET_STRING(iovec[j++], core_proc_limits);
+- }
++ if (read_full_file(p, &t, NULL) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_LIMITS=", t);
+
+ p = procfs_file_alloca(pid, "cgroup");
+- if (read_full_file(p, &t, NULL) >=0) {
+- core_proc_cgroup = strappend("COREDUMP_PROC_CGROUP=", t);
+- free(t);
++ if (read_full_file(p, &t, NULL) >=0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_PROC_CGROUP=", t);
+
+- if (core_proc_cgroup)
+- IOVEC_SET_STRING(iovec[j++], core_proc_cgroup);
+- }
+-
+- if (get_process_cwd(pid, &t) >= 0) {
+- core_cwd = strjoina("COREDUMP_CWD=", t);
+- free(t);
++ if (get_process_cwd(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_CWD=", t);
+
+- IOVEC_SET_STRING(iovec[j++], core_cwd);
+- }
++ if (get_process_root(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_ROOT=", t);
+
+- if (get_process_root(pid, &t) >= 0) {
+- core_root = strjoina("COREDUMP_ROOT=", t);
+- free(t);
+-
+- IOVEC_SET_STRING(iovec[j++], core_root);
+- }
+-
+- if (get_process_environ(pid, &t) >= 0) {
+- core_environ = strappend("COREDUMP_ENVIRON=", t);
+- free(t);
+-
+- if (core_environ)
+- IOVEC_SET_STRING(iovec[j++], core_environ);
+- }
++ if (get_process_environ(pid, &t) >= 0)
++ set_iovec_field_free(iovec, &n_iovec, "COREDUMP_ENVIRON=", t);
+
+ core_timestamp = strjoin("COREDUMP_TIMESTAMP=", info[INFO_TIMESTAMP], "000000", NULL);
+ if (core_timestamp)
+- IOVEC_SET_STRING(iovec[j++], core_timestamp);
++ IOVEC_SET_STRING(iovec[n_iovec++], core_timestamp);
+
+- IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");
+- IOVEC_SET_STRING(iovec[j++], "PRIORITY=2");
++ IOVEC_SET_STRING(iovec[n_iovec++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");
++ IOVEC_SET_STRING(iovec[n_iovec++], "PRIORITY=2");
+
+ /* Vacuum before we write anything again */
+ coredump_vacuum(-1, arg_keep_free, arg_max_use);
+@@ -800,7 +749,7 @@ int main(int argc, char* argv[]) {
+ const char *coredump_filename;
+
+ coredump_filename = strjoina("COREDUMP_FILENAME=", filename);
+- IOVEC_SET_STRING(iovec[j++], coredump_filename);
++ IOVEC_SET_STRING(iovec[n_iovec++], coredump_filename);
+ }
+
+ /* Vacuum again, but exclude the coredump we just created */
+@@ -838,7 +787,7 @@ int main(int argc, char* argv[]) {
+ log:
+ core_message = strjoin("MESSAGE=Process ", info[INFO_PID], " (", comm, ") of user ", info[INFO_UID], " dumped core.", NULL);
+ if (core_message)
+- IOVEC_SET_STRING(iovec[j++], core_message);
++ IOVEC_SET_STRING(iovec[n_iovec++], core_message);
+
+ /* Optionally store the entire coredump in the journal */
+ if (IN_SET(arg_storage, COREDUMP_STORAGE_JOURNAL, COREDUMP_STORAGE_BOTH) &&
+@@ -849,13 +798,13 @@ log:
+
+ r = allocate_journal_field(coredump_fd, (size_t) coredump_size, &coredump_data, &sz);
+ if (r >= 0) {
+- iovec[j].iov_base = coredump_data;
+- iovec[j].iov_len = sz;
+- j++;
++ iovec[n_iovec].iov_base = coredump_data;
++ iovec[n_iovec].iov_len = sz;
++ n_iovec++;
+ }
+ }
+
+- r = sd_journal_sendv(iovec, j);
++ r = sd_journal_sendv(iovec, n_iovec);
+ if (r < 0)
+ log_error_errno(r, "Failed to log coredump: %m");
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 7e67e055e3..c35858247b 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -788,9 +788,9 @@ static void dispatch_message_real(
+
+ r = get_process_cmdline(ucred->pid, 0, false, &t);
+ if (r >= 0) {
+- x = strjoina("_CMDLINE=", t);
+- free(t);
+- IOVEC_SET_STRING(iovec[n++], x);
++ /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack.
++ * Let's use a heap allocation for this one. */
++ set_iovec_field_free(iovec, &n, "_CMDLINE=", t);
+ }
+
+ r = get_process_capeff(ucred->pid, &t);
+@@ -915,11 +915,8 @@ static void dispatch_message_real(
+ }
+
+ r = get_process_cmdline(object_pid, 0, false, &t);
+- if (r >= 0) {
+- x = strjoina("OBJECT_CMDLINE=", t);
+- free(t);
+- IOVEC_SET_STRING(iovec[n++], x);
+- }
++ if (r >= 0)
++ set_iovec_field_free(iovec, &n, "OBJECT_CMDLINE=", t);
+
+ #ifdef HAVE_AUDIT
+ r = audit_session_from_pid(object_pid, &audit);
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 78967103a6..c71e021cd7 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -2275,6 +2275,23 @@ int flush_fd(int fd) {
+ }
+ }
+
++char* set_iovec_string_field(struct iovec *iovec, unsigned int *n_iovec, const char *field, const char *value) {
++ char *x;
++
++ x = strappend(field, value);
++ if (x)
++ iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x);
++ return x;
++}
++
++char* set_iovec_field_free(struct iovec *iovec, unsigned int *n_iovec, const char *field, char *value) {
++ char *x;
++
++ x = set_iovec_string_field(iovec, n_iovec, field, value);
++ free(value);
++ return x;
++}
++
+ int acquire_terminal(
+ const char *name,
+ bool fail,
+diff --git a/src/shared/util.h b/src/shared/util.h
+index cf096aa07b..8fc237495a 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -1140,3 +1140,10 @@ static inline void block_signals_reset(sigset_t *ss) {
+ _t; \
+ })
+
++#define IOVEC_INIT(base, len) { .iov_base = (base), .iov_len = (len) }
++#define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len)
++#define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string))
++#define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string)
++
++char* set_iovec_string_field(struct iovec *iovec, unsigned int *n_iovec, const char *field, const char *value);
++char* set_iovec_field_free(struct iovec *iovec, unsigned int *n_iovec, const char *field, char *value);
diff --git a/SOURCES/0668-journald-set-a-limit-on-the-number-of-fields-1k.patch b/SOURCES/0668-journald-set-a-limit-on-the-number-of-fields-1k.patch
new file mode 100644
index 0000000..534ea2f
--- /dev/null
+++ b/SOURCES/0668-journald-set-a-limit-on-the-number-of-fields-1k.patch
@@ -0,0 +1,52 @@
+From 9dbac61cf123a57c1f39a2f134389f1a5877dc29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 3 Jan 2019 16:09:05 +0100
+Subject: [PATCH] journald: set a limit on the number of fields (1k)
+
+We allocate a iovec entry for each field, so with many short entries,
+our memory usage and processing time can be large, even with a relatively
+small message size. Let's refuse overly long entries.
+
+CVE-2018-16865
+https://bugzilla.redhat.com/show_bug.cgi?id=1653861
+
+What from I can see, the problem is not from an alloca, despite what the CVE
+description says, but from the attack multiplication that comes from creating
+many very small iovecs: (void* + size_t) for each three bytes of input
+message.
+
+Resolves: #1657792
+---
+ src/journal/journal-file.h | 3 +++
+ src/journal/journald-native.c | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
+index dd8ef52d2a..37749c4459 100644
+--- a/src/journal/journal-file.h
++++ b/src/journal/journal-file.h
+@@ -158,6 +158,9 @@ int journal_file_open_reliably(
+ * files without adding too many zeros. */
+ #define OFSfmt "%06"PRIx64
+
++/* The maximum number of fields in an entry */
++#define ENTRY_FIELD_COUNT_MAX 1024
++
+ static inline bool VALID_REALTIME(uint64_t u) {
+ /* This considers timestamps until the year 3112 valid. That should be plenty room... */
+ return u > 0 && u < (1ULL << 55);
+diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
+index cf3349393f..0c451274f7 100644
+--- a/src/journal/journald-native.c
++++ b/src/journal/journald-native.c
+@@ -134,6 +134,10 @@ void server_process_native_message(
+ }
+
+ /* A property follows */
++ if (n > ENTRY_FIELD_COUNT_MAX) {
++ log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry.");
++ goto finish;
++ }
+
+ /* n existing properties, 1 new, +1 for _TRANSPORT */
+ if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS + N_IOVEC_OBJECT_FIELDS)) {
diff --git a/SOURCES/0669-journal-remote-set-a-limit-on-the-number-of-fields-i.patch b/SOURCES/0669-journal-remote-set-a-limit-on-the-number-of-fields-i.patch
new file mode 100644
index 0000000..0b8d0d5
--- /dev/null
+++ b/SOURCES/0669-journal-remote-set-a-limit-on-the-number-of-fields-i.patch
@@ -0,0 +1,83 @@
+From dec34b2c3b66f9ccf3977e3a45d3a8365ba92027 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Thu, 3 Jan 2019 16:28:30 +0100
+Subject: [PATCH] journal-remote: set a limit on the number of fields in a
+ message
+
+Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is
+reused for the new error condition (too many fields).
+
+This matches the change done for systemd-journald, hence forming the second
+part of the fix for CVE-2018-16865
+(https://bugzilla.redhat.com/show_bug.cgi?id=1653861).
+
+Resolves: #1657792
+---
+ src/journal-remote/journal-remote-parse.c | 2 +-
+ src/journal-remote/journal-remote-write.c | 3 +++
+ src/journal-remote/journal-remote.c | 14 ++++++++++++--
+ 3 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
+index 64089da19b..53f4e36123 100644
+--- a/src/journal-remote/journal-remote-parse.c
++++ b/src/journal-remote/journal-remote-parse.c
+@@ -107,7 +107,7 @@ static int get_line(RemoteSource *source, char **line, size_t *size) {
+ source->scanned = source->filled;
+ if (source->scanned >= DATA_SIZE_MAX) {
+ log_error("Entry is bigger than %u bytes.", DATA_SIZE_MAX);
+- return -E2BIG;
++ return -ENOBUFS;
+ }
+
+ if (source->passive_fd)
+diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
+index 99820fa7b8..99920e62c5 100644
+--- a/src/journal-remote/journal-remote-write.c
++++ b/src/journal-remote/journal-remote-write.c
+@@ -22,6 +22,9 @@
+ #include "journal-remote.h"
+
+ int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {
++ if (iovw->count >= ENTRY_FIELD_COUNT_MAX)
++ return -E2BIG;
++
+ if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))
+ return log_oom();
+
+diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
+index a455fb6bd8..e65daf6a0b 100644
+--- a/src/journal-remote/journal-remote.c
++++ b/src/journal-remote/journal-remote.c
+@@ -524,11 +524,18 @@ static int process_http_upload(
+ break;
+ else if (r < 0) {
+ log_warning("Failed to process data for connection %p", connection);
+- if (r == -E2BIG)
++ if (r == -ENOBUFS)
+ return mhd_respondf(connection,
+ MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+ "Entry is too large, maximum is %u bytes.\n",
+ DATA_SIZE_MAX);
++
++ else if (r == -E2BIG)
++ return mhd_respondf(connection,
++ MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
++ "Entry with more fields than the maximum of %u\n",
++ ENTRY_FIELD_COUNT_MAX);
++
+ else
+ return mhd_respondf(connection,
+ MHD_HTTP_UNPROCESSABLE_ENTITY,
+@@ -1043,7 +1050,10 @@ static int handle_raw_source(sd_event_source *event,
+ log_debug("%zu active sources remaining", s->active);
+ return 0;
+ } else if (r == -E2BIG) {
+- log_notice_errno(E2BIG, "Entry too big, skipped");
++ log_notice_errno(E2BIG, "Entry with too many fields, skipped");
++ return 1;
++ } else if (r == -ENOBUFS) {
++ log_notice_errno(ENOBUFS, "Entry too big, skipped");
+ return 1;
+ } else if (r == -EAGAIN) {
+ return 0;
diff --git a/SOURCES/0670-journald-free-cmdline-buffers-owned-by-iovec.patch b/SOURCES/0670-journald-free-cmdline-buffers-owned-by-iovec.patch
new file mode 100644
index 0000000..fdb2a31
--- /dev/null
+++ b/SOURCES/0670-journald-free-cmdline-buffers-owned-by-iovec.patch
@@ -0,0 +1,46 @@
+From 4b0ebd414553f9ccab85dfd708bf808127da505f Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 16 Jan 2019 10:24:56 +0100
+Subject: [PATCH] journald: free cmdline buffers owned by iovec
+
+Resolves: #1666646
+
+[msekleta: this is a followup for the fix of CVE-2018-16864. While
+backporting upstream changes I've accidentally dropped the automatic
+cleanup of the cmdline buffers. Technically speaking similar issue is in
+coredump.c too, but after we dispatch iovec buffer in coredump.c we
+immediately exit so allocated memory is reclaimed by the kernel.]
+---
+ src/journal/journald-server.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index c35858247b..88d8f3e41d 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -738,6 +738,7 @@ static void dispatch_message_real(
+ o_uid[sizeof("OBJECT_UID=") + DECIMAL_STR_MAX(uid_t)],
+ o_gid[sizeof("OBJECT_GID=") + DECIMAL_STR_MAX(gid_t)],
+ o_owner_uid[sizeof("OBJECT_SYSTEMD_OWNER_UID=") + DECIMAL_STR_MAX(uid_t)];
++ _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL;
+ uid_t object_uid;
+ gid_t object_gid;
+ char *x;
+@@ -790,7 +791,7 @@ static void dispatch_message_real(
+ if (r >= 0) {
+ /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack.
+ * Let's use a heap allocation for this one. */
+- set_iovec_field_free(iovec, &n, "_CMDLINE=", t);
++ cmdline1 = set_iovec_field_free(iovec, &n, "_CMDLINE=", t);
+ }
+
+ r = get_process_capeff(ucred->pid, &t);
+@@ -916,7 +917,7 @@ static void dispatch_message_real(
+
+ r = get_process_cmdline(object_pid, 0, false, &t);
+ if (r >= 0)
+- set_iovec_field_free(iovec, &n, "OBJECT_CMDLINE=", t);
++ cmdline2 = set_iovec_field_free(iovec, &n, "OBJECT_CMDLINE=", t);
+
+ #ifdef HAVE_AUDIT
+ r = audit_session_from_pid(object_pid, &audit);
diff --git a/SOURCES/0671-test-01-basic-mask-some-services-that-currently-don-.patch b/SOURCES/0671-test-01-basic-mask-some-services-that-currently-don-.patch
new file mode 100644
index 0000000..ac5ce5a
--- /dev/null
+++ b/SOURCES/0671-test-01-basic-mask-some-services-that-currently-don-.patch
@@ -0,0 +1,29 @@
+From 5daaf2b0fd5086aa281f44c665513a7de8f403e1 Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel@zonque.org>
+Date: Thu, 19 Nov 2015 13:27:39 +0100
+Subject: [PATCH] test: 01-basic: mask some services that currently don't run
+ in qemu
+
+Cherry-picked from: 6f9d3b08cf3e50d3903282d2ce36244bb86c7b7c
+---
+ test/TEST-01-BASIC/test.sh | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
+index d97fbe24d4..ee9c66aba8 100755
+--- a/test/TEST-01-BASIC/test.sh
++++ b/test/TEST-01-BASIC/test.sh
+@@ -61,6 +61,13 @@ EOF
+ )
+ setup_nspawn_root
+
++ # mask some services that we do not want to run in these tests
++ ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
++ ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
++ ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service
++ ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
++ ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service
++
+ ddebug "umount $TESTDIR/root"
+ umount $TESTDIR/root
+ }
diff --git a/SOURCES/0672-tests-drop-the-precondition-check-for-inherited-flag.patch b/SOURCES/0672-tests-drop-the-precondition-check-for-inherited-flag.patch
new file mode 100644
index 0000000..cac06d2
--- /dev/null
+++ b/SOURCES/0672-tests-drop-the-precondition-check-for-inherited-flag.patch
@@ -0,0 +1,42 @@
+From 94a42ae477f9b85051baf77322148173689ffa59 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Thu, 8 Nov 2018 09:40:13 +0100
+Subject: [PATCH] tests: drop the precondition check for inherited flag
+
+Docker's default capability set has the inherited flag already
+set - that breaks tests which expect otherwise. Let's just
+drop the check and run the test anyway.
+
+Fixes #10663
+
+Cherry-picked from: c446b8486d9ed18d1bc780948ae9ee8a53fa4c3f
+---
+ src/test/test-capability.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/test/test-capability.c b/src/test/test-capability.c
+index 67a9ec2d14..c76bdf20a5 100644
+--- a/src/test/test-capability.c
++++ b/src/test/test-capability.c
+@@ -160,8 +160,6 @@ static void test_update_inherited_set(void) {
+
+ caps = cap_get_proc();
+ assert_se(caps);
+- assert_se(!cap_get_flag(caps, CAP_CHOWN, CAP_INHERITABLE, &fv));
+- assert(fv == CAP_CLEAR);
+
+ set = (UINT64_C(1) << CAP_CHOWN);
+
+@@ -177,12 +175,6 @@ static void test_set_ambient_caps(void) {
+ uint64_t set = 0;
+ cap_flag_value_t fv;
+
+- caps = cap_get_proc();
+- assert_se(caps);
+- assert_se(!cap_get_flag(caps, CAP_CHOWN, CAP_INHERITABLE, &fv));
+- assert(fv == CAP_CLEAR);
+- cap_free(caps);
+-
+ assert_se(prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_CHOWN, 0, 0) == 0);
+
+ set = (UINT64_C(1) << CAP_CHOWN);
diff --git a/SOURCES/0673-mount-point-honour-AT_SYMLINK_FOLLOW-correctly.patch b/SOURCES/0673-mount-point-honour-AT_SYMLINK_FOLLOW-correctly.patch
new file mode 100644
index 0000000..0c1b03d
--- /dev/null
+++ b/SOURCES/0673-mount-point-honour-AT_SYMLINK_FOLLOW-correctly.patch
@@ -0,0 +1,23 @@
+From 66d9fcdc342d9d0916099f90a0dcdd7856e944b8 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 14 Jan 2019 10:50:45 +0100
+Subject: [PATCH] mount-point: honour AT_SYMLINK_FOLLOW correctly
+
+Cherry-picked from: be24321f3dae91a166166b239954032727439942
+---
+ src/shared/path-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/path-util.c b/src/shared/path-util.c
+index fcc591686f..42941335f2 100644
+--- a/src/shared/path-util.c
++++ b/src/shared/path-util.c
+@@ -484,7 +484,7 @@ static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id
+ if ((flags & AT_EMPTY_PATH) && isempty(filename))
+ xsprintf(path, "/proc/self/fdinfo/%i", fd);
+ else {
+- subfd = openat(fd, filename, O_CLOEXEC|O_PATH);
++ subfd = openat(fd, filename, O_CLOEXEC|O_PATH|(flags & AT_SYMLINK_FOLLOW ? 0 : O_NOFOLLOW));
+ if (subfd < 0)
+ return -errno;
+
diff --git a/SOURCES/0674-copy-only-check-for-traversing-mount-points-on-direc.patch b/SOURCES/0674-copy-only-check-for-traversing-mount-points-on-direc.patch
new file mode 100644
index 0000000..8e2d150
--- /dev/null
+++ b/SOURCES/0674-copy-only-check-for-traversing-mount-points-on-direc.patch
@@ -0,0 +1,47 @@
+From 025eb38eeb31ca07c98d2e41ce90d05016afc0f4 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 14 Jan 2019 11:20:52 +0100
+Subject: [PATCH] copy: only check for traversing mount points on directories
+
+This fixes the copy routines on overlay filesystem, which typically
+returns the underlying st_dev for files, symlinks, etc.
+
+The value of st_dev is guaranteed to be the same for directories, so
+checking it on directories only fixes this code on overlay filesystem
+and still keeps it from traversing mount points (which was the original
+intent.)
+
+There's a small side effect here, by which regular (non-directory) files
+with bind mounts will be copied by the new logic (while they were
+skipped by the previous logic.)
+
+Tested: ./build/test-copy with an overlay on /tmp.
+
+Cherry-picked from: ef202b848bb6635dec17d3ec0041b04cd2301bed
+---
+ src/shared/copy.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/shared/copy.c b/src/shared/copy.c
+index 2a0cb28080..0a7ee47f99 100644
+--- a/src/shared/copy.c
++++ b/src/shared/copy.c
+@@ -271,13 +271,12 @@ static int fd_copy_directory(
+ continue;
+ }
+
+- if (buf.st_dev != original_device)
+- continue;
+-
+- if (S_ISREG(buf.st_mode))
+- q = fd_copy_regular(dirfd(d), de->d_name, &buf, fdt, de->d_name);
+- else if (S_ISDIR(buf.st_mode))
++ if (S_ISDIR(buf.st_mode)) {
++ if (buf.st_dev != original_device)
++ continue;
+ q = fd_copy_directory(dirfd(d), de->d_name, &buf, fdt, de->d_name, original_device, merge);
++ } else if (S_ISREG(buf.st_mode))
++ q = fd_copy_regular(dirfd(d), de->d_name, &buf, fdt, de->d_name);
+ else if (S_ISLNK(buf.st_mode))
+ q = fd_copy_symlink(dirfd(d), de->d_name, &buf, fdt, de->d_name);
+ else if (S_ISFIFO(buf.st_mode))
diff --git a/SOURCES/0675-travis-enable-Travis-CI-on-CentOS-7.patch b/SOURCES/0675-travis-enable-Travis-CI-on-CentOS-7.patch
new file mode 100644
index 0000000..ad6f3ba
--- /dev/null
+++ b/SOURCES/0675-travis-enable-Travis-CI-on-CentOS-7.patch
@@ -0,0 +1,203 @@
+From 2014cb51b6dfe1f7f0b98e62311398c2bf801c2b Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 7 Jan 2019 15:49:45 +0100
+Subject: [PATCH] travis: enable Travis CI on CentOS 7
+
+---
+ .travis.yml | 43 +++++++++++++++++++---------
+ ci/travis-centos.sh | 69 +++++++++++++++++++++++++++++++++++++++++++++
+ ci/travis_wait.bash | 61 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 159 insertions(+), 14 deletions(-)
+ create mode 100755 ci/travis-centos.sh
+ create mode 100644 ci/travis_wait.bash
+
+diff --git a/.travis.yml b/.travis.yml
+index 4ea2bc2d30..fc63887324 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,14 +1,29 @@
+-language: c
+-compiler:
+- - gcc
+-before_install:
+- - sudo apt-get update -qq
+- - sudo apt-get install autotools-dev automake autoconf libtool libdbus-1-dev libcap-dev libblkid-dev libmount-dev libpam-dev libcryptsetup-dev libaudit-dev libacl1-dev libattr1-dev libselinux-dev liblzma-dev libgcrypt-dev libqrencode-dev libmicrohttpd-dev gtk-doc-tools gperf python2.7-dev
+-script: ./autogen.sh && ./configure --enable-gtk-doc --enable-gtk-doc-pdf && make V=1 && sudo ./systemd-machine-id-setup && make check && make distcheck
+-after_failure: cat test-suite.log
+-notifications:
+- irc:
+- channels:
+- - "irc.freenode.org#systemd"
+- on_success: change
+- on_failure: always
++sudo: required
++services:
++ - docker
++
++env:
++ global:
++ - CI_ROOT="$TRAVIS_BUILD_DIR/ci/"
++
++jobs:
++ include:
++ - stage: Build & test
++ name: CentOS 7
++ language: bash
++ env:
++ - CENTOS_RELEASE="centos7"
++ - CONT_NAME="systemd-centos-$CENTOS_RELEASE"
++ - DOCKER_EXEC="docker exec -ti $CONT_NAME"
++ before_install:
++ - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
++ - docker --version
++ install:
++ - $CI_ROOT/travis-centos.sh SETUP
++ script:
++ - set -e
++ # Build systemd
++ - $CI_ROOT/travis-centos.sh RUN
++ - set +e
++ after_script:
++ - $CI_ROOT/travis-centos.sh CLEANUP
+diff --git a/ci/travis-centos.sh b/ci/travis-centos.sh
+new file mode 100755
+index 0000000000..60bbdf14c2
+--- /dev/null
++++ b/ci/travis-centos.sh
+@@ -0,0 +1,69 @@
++#!/bin/bash
++
++# Run this script from the root of the systemd's git repository
++# or set REPO_ROOT to a correct path.
++#
++# Example execution on Fedora:
++# dnf install docker
++# systemctl start docker
++# export CONT_NAME="my-fancy-container"
++# ci/travis-centos.sh SETUP RUN CLEANUP
++
++PHASES=(${@:-SETUP RUN CLEANUP})
++CENTOS_RELEASE="${CENTOS_RELEASE:-latest}"
++CONT_NAME="${CONT_NAME:-centos-$CENTOS_RELEASE-$RANDOM}"
++DOCKER_EXEC="${DOCKER_EXEC:-docker exec -it $CONT_NAME}"
++DOCKER_RUN="${DOCKER_RUN:-docker run}"
++REPO_ROOT="${REPO_ROOT:-$PWD}"
++ADDITIONAL_DEPS=(yum-utils iputils hostname libasan libubsan clang llvm)
++
++function info() {
++ echo -e "\033[33;1m$1\033[0m"
++}
++
++set -e
++
++source "$(dirname $0)/travis_wait.bash"
++
++for phase in "${PHASES[@]}"; do
++ case $phase in
++ SETUP)
++ info "Setup phase"
++ info "Using Travis $CENTOS_RELEASE"
++ # Pull a Docker image and start a new container
++ docker pull centos:$CENTOS_RELEASE
++ info "Starting container $CONT_NAME"
++ $DOCKER_RUN -v $REPO_ROOT:/build:rw \
++ -w /build --privileged=true --name $CONT_NAME \
++ -dit --net=host centos:$CENTOS_RELEASE /sbin/init
++ # Beautiful workaround for Fedora's version of Docker
++ sleep 1
++ $DOCKER_EXEC yum makecache
++ # Install necessary build/test requirements
++ $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
++ $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
++ $DOCKER_EXEC yum-builddep -y systemd
++ ;;
++ RUN)
++ info "Run phase"
++ # Build systemd
++ $DOCKER_EXEC ./autogen.sh
++ $DOCKER_EXEC ./configure --disable-timesyncd --disable-kdbus --disable-terminal \
++ --enable-gtk-doc --enable-compat-libs --disable-sysusers \
++ --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d
++ $DOCKER_EXEC make
++ if ! $DOCKER_EXEC make check; then
++ $DOCKER_EXEC cat test-suite.log
++ exit 1
++ fi
++ ;;
++ CLEANUP)
++ info "Cleanup phase"
++ docker stop $CONT_NAME
++ docker rm -f $CONT_NAME
++ ;;
++ *)
++ echo >&2 "Unknown phase '$phase'"
++ exit 1
++ esac
++done
+diff --git a/ci/travis_wait.bash b/ci/travis_wait.bash
+new file mode 100644
+index 0000000000..acf6ad15e4
+--- /dev/null
++++ b/ci/travis_wait.bash
+@@ -0,0 +1,61 @@
++# This was borrowed from https://github.com/travis-ci/travis-build/tree/master/lib/travis/build/bash
++# to get around https://github.com/travis-ci/travis-ci/issues/9979. It should probably be removed
++# as soon as Travis CI has started to provide an easy way to export the functions to bash scripts.
++
++travis_jigger() {
++ local cmd_pid="${1}"
++ shift
++ local timeout="${1}"
++ shift
++ local count=0
++
++ echo -e "\\n"
++
++ while [[ "${count}" -lt "${timeout}" ]]; do
++ count="$((count + 1))"
++ echo -ne "Still running (${count} of ${timeout}): ${*}\\r"
++ sleep 60
++ done
++
++ echo -e "\\n${ANSI_RED}Timeout (${timeout} minutes) reached. Terminating \"${*}\"${ANSI_RESET}\\n"
++ kill -9 "${cmd_pid}"
++}
++
++travis_wait() {
++ local timeout="${1}"
++
++ if [[ "${timeout}" =~ ^[0-9]+$ ]]; then
++ shift
++ else
++ timeout=20
++ fi
++
++ local cmd=("${@}")
++ local log_file="travis_wait_${$}.log"
++
++ "${cmd[@]}" &>"${log_file}" &
++ local cmd_pid="${!}"
++
++ travis_jigger "${!}" "${timeout}" "${cmd[@]}" &
++ local jigger_pid="${!}"
++ local result
++
++ {
++ set +e
++ wait "${cmd_pid}" 2>/dev/null
++ result="${?}"
++ ps -p"${jigger_pid}" &>/dev/null && kill "${jigger_pid}"
++ set -e
++ }
++
++ if [[ "${result}" -eq 0 ]]; then
++ echo -e "\\n${ANSI_GREEN}The command ${cmd[*]} exited with ${result}.${ANSI_RESET}"
++ else
++ echo -e "\\n${ANSI_RED}The command ${cmd[*]} exited with ${result}.${ANSI_RESET}"
++ fi
++
++ echo -e "\\n${ANSI_GREEN}Log:${ANSI_RESET}\\n"
++ cat "${log_file}"
++
++ return "${result}"
++}
diff --git a/SOURCES/0676-travis-RHEL8-support.patch b/SOURCES/0676-travis-RHEL8-support.patch
new file mode 100644
index 0000000..dcbda8b
--- /dev/null
+++ b/SOURCES/0676-travis-RHEL8-support.patch
@@ -0,0 +1,174 @@
+From e5c78840b2b124400f56cb5fbaf2357cd8901218 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 14 Jan 2019 14:49:32 +0100
+Subject: [PATCH] travis: RHEL8 support
+
+---
+ .travis.yml | 8 +-
+ ...ravis-centos.sh => travis-centos-rhel7.sh} | 0
+ ci/travis-centos-rhel8.sh | 130 ++++++++++++++++++
+ 3 files changed, 135 insertions(+), 3 deletions(-)
+ rename ci/{travis-centos.sh => travis-centos-rhel7.sh} (100%)
+ create mode 100755 ci/travis-centos-rhel8.sh
+
+diff --git a/.travis.yml b/.travis.yml
+index fc63887324..1c4e6f9728 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -19,11 +19,13 @@ jobs:
+ - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+ - docker --version
+ install:
+- - $CI_ROOT/travis-centos.sh SETUP
++ - RHEL_VERSION="rhel7"
++ - [ -f meson.build ] && RHEL_VERSION="rhel8"
++ - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh SETUP
+ script:
+ - set -e
+ # Build systemd
+- - $CI_ROOT/travis-centos.sh RUN
++ - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh RUN
+ - set +e
+ after_script:
+- - $CI_ROOT/travis-centos.sh CLEANUP
++ - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh CLEANUP
+diff --git a/ci/travis-centos.sh b/ci/travis-centos-rhel7.sh
+similarity index 100%
+rename from ci/travis-centos.sh
+rename to ci/travis-centos-rhel7.sh
+diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh
+new file mode 100755
+index 0000000000..968603f949
+--- /dev/null
++++ b/ci/travis-centos-rhel8.sh
+@@ -0,0 +1,130 @@
++#!/bin/bash
++
++# Run this script from the root of the systemd's git repository
++# or set REPO_ROOT to a correct path.
++#
++# Example execution on Fedora:
++# dnf install docker
++# systemctl start docker
++# export CONT_NAME="my-fancy-container"
++# ci/travis-centos.sh SETUP RUN CLEANUP
++
++PHASES=(${@:-SETUP RUN CLEANUP})
++CENTOS_RELEASE="${CENTOS_RELEASE:-latest}"
++CONT_NAME="${CONT_NAME:-centos-$CENTOS_RELEASE-$RANDOM}"
++DOCKER_EXEC="${DOCKER_EXEC:-docker exec -it $CONT_NAME}"
++DOCKER_RUN="${DOCKER_RUN:-docker run}"
++REPO_ROOT="${REPO_ROOT:-$PWD}"
++ADDITIONAL_DEPS=(systemd-ci-environment libidn2-devel python-lxml python36 ninja-build libasan net-tools strace nc busybox e2fsprogs quota dnsmasq)
++# Repo with additional depencencies to compile newer systemd on CentOS 7
++COPR_REPO="https://copr.fedorainfracloud.org/coprs/mrc0mmand/systemd-centos-ci/repo/epel-7/mrc0mmand-systemd-centos-ci-epel-7.repo"
++COPR_REPO_PATH="/etc/yum.repos.d/${COPR_REPO##*/}"
++
++function info() {
++ echo -e "\033[33;1m$1\033[0m"
++}
++
++set -e
++
++source "$(dirname $0)/travis_wait.bash"
++
++for phase in "${PHASES[@]}"; do
++ case $phase in
++ SETUP)
++ info "Setup phase"
++ info "Using Travis $CENTOS_RELEASE"
++ # Pull a Docker image and start a new container
++ docker pull centos:$CENTOS_RELEASE
++ info "Starting container $CONT_NAME"
++ $DOCKER_RUN -v $REPO_ROOT:/build:rw \
++ -w /build --privileged=true --name $CONT_NAME \
++ -dit --net=host centos:$CENTOS_RELEASE /sbin/init
++ # Beautiful workaround for Fedora's version of Docker
++ sleep 1
++ $DOCKER_EXEC yum makecache
++ $DOCKER_EXEC curl "$COPR_REPO" -o "$COPR_REPO_PATH"
++ $DOCKER_EXEC yum -q -y install epel-release yum-utils
++ $DOCKER_EXEC yum-config-manager -q --enable epel
++ $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
++ # Install necessary build/test requirements
++ $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
++ $DOCKER_EXEC python3.6 -m ensurepip
++ $DOCKER_EXEC python3.6 -m pip install meson
++ # Create necessary symlinks
++ $DOCKER_EXEC ln --force -s /usr/bin/python3.6 /usr/bin/python3
++ $DOCKER_EXEC ln --force -s /usr/bin/ninja-build /usr/bin/ninja
++ ;;
++ RUN)
++ info "Run phase"
++ # Build systemd
++ CONFIGURE_OPTS=(
++ # RHEL8 options
++ -Dsysvinit-path=/etc/rc.d/init.d
++ -Drc-local=/etc/rc.d/rc.local
++ -Ddns-servers=''
++ -Ddev-kvm-mode=0666
++ -Dkmod=true
++ -Dxkbcommon=true
++ -Dblkid=true
++ -Dseccomp=true
++ -Dima=true
++ -Dselinux=true
++ -Dapparmor=false
++ -Dpolkit=true
++ -Dxz=true
++ -Dzlib=true
++ -Dbzip2=true
++ -Dlz4=true
++ -Dpam=true
++ -Dacl=true
++ -Dsmack=true
++ -Dgcrypt=true
++ -Daudit=true
++ -Delfutils=true
++ -Dlibcryptsetup=true
++ -Delfutils=true
++ -Dqrencode=false
++ -Dgnutls=true
++ -Dmicrohttpd=true
++ -Dlibidn2=true
++ -Dlibiptc=true
++ -Dlibcurl=true
++ -Defi=true
++ -Dtpm=true
++ -Dhwdb=true
++ -Dsysusers=true
++ -Ddefault-kill-user-processes=false
++ -Dtests=unsafe
++ -Dinstall-tests=true
++ -Dtty-gid=5
++ -Dusers-gid=100
++ -Dnobody-user=nobody
++ -Dnobody-group=nobody
++ -Dsplit-usr=false
++ -Dsplit-bin=true
++ -Db_lto=false
++ -Dnetworkd=false
++ -Dtimesyncd=false
++ -Ddefault-hierarchy=legacy
++ # Custom options
++ -Dslow-tests=true
++ -Dtests=unsafe
++ -Dinstall-tests=true
++ )
++ docker exec -it -e CFLAGS='-g -O0 -ftrapv' $CONT_NAME meson build "${CONFIGURE_OPTS[@]}"
++ $DOCKER_EXEC ninja -v -C build
++ # "Mask" the udev-test.pl, as it requires newer version of systemd-detect-virt
++ # and it's pointless to run it on a VM in a Docker container...
++ echo -ne "#!/usr/bin/perl\nexit(0);\n" > "test/udev-test.pl"
++ $DOCKER_EXEC ninja -C build test
++ ;;
++ CLEANUP)
++ info "Cleanup phase"
++ docker stop $CONT_NAME
++ docker rm -f $CONT_NAME
++ ;;
++ *)
++ echo >&2 "Unknown phase '$phase'"
++ exit 1
++ esac
++done
diff --git a/SOURCES/0677-travis-drop-the-SELinux-Fedora-workaround.patch b/SOURCES/0677-travis-drop-the-SELinux-Fedora-workaround.patch
new file mode 100644
index 0000000..207f230
--- /dev/null
+++ b/SOURCES/0677-travis-drop-the-SELinux-Fedora-workaround.patch
@@ -0,0 +1,36 @@
+From 90399c456fe8cf726fc04fb7be9e2a01f9ca0eae Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Tue, 15 Jan 2019 11:03:45 +0100
+Subject: [PATCH] travis: drop the SELinux Fedora workaround
+
+---
+ ci/travis-centos-rhel7.sh | 2 +-
+ ci/travis-centos-rhel8.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
+index 60bbdf14c2..b1b3de1cc2 100755
+--- a/ci/travis-centos-rhel7.sh
++++ b/ci/travis-centos-rhel7.sh
+@@ -40,7 +40,7 @@ for phase in "${PHASES[@]}"; do
+ sleep 1
+ $DOCKER_EXEC yum makecache
+ # Install necessary build/test requirements
+- $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
++ $DOCKER_EXEC yum -y upgrade
+ $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
+ $DOCKER_EXEC yum-builddep -y systemd
+ ;;
+diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh
+index 968603f949..8eda5e982f 100755
+--- a/ci/travis-centos-rhel8.sh
++++ b/ci/travis-centos-rhel8.sh
+@@ -45,7 +45,7 @@ for phase in "${PHASES[@]}"; do
+ $DOCKER_EXEC curl "$COPR_REPO" -o "$COPR_REPO_PATH"
+ $DOCKER_EXEC yum -q -y install epel-release yum-utils
+ $DOCKER_EXEC yum-config-manager -q --enable epel
+- $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
++ $DOCKER_EXEC yum -y upgrade
+ # Install necessary build/test requirements
+ $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
+ $DOCKER_EXEC python3.6 -m ensurepip
diff --git a/SOURCES/0678-travis-fix-syntax-error-in-.travis.yml.patch b/SOURCES/0678-travis-fix-syntax-error-in-.travis.yml.patch
new file mode 100644
index 0000000..10ae061
--- /dev/null
+++ b/SOURCES/0678-travis-fix-syntax-error-in-.travis.yml.patch
@@ -0,0 +1,23 @@
+From 7f9d44f527ea214347f7d3b3b067f84df53feed7 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Tue, 15 Jan 2019 14:35:27 +0100
+Subject: [PATCH] travis: fix syntax error in .travis.yml
+
+---
+ .travis.yml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 1c4e6f9728..c5c9c345a9 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -19,8 +19,7 @@ jobs:
+ - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+ - docker --version
+ install:
+- - RHEL_VERSION="rhel7"
+- - [ -f meson.build ] && RHEL_VERSION="rhel8"
++ - if [ -f meson.build ]; then RHEL_VERSION=rhel8; else RHEL_VERSION=rhel7; fi
+ - $CI_ROOT/travis-centos-${RHEL_VERSION}.sh SETUP
+ script:
+ - set -e
diff --git a/SOURCES/0679-travis-temporarily-skip-test_path_changed.patch b/SOURCES/0679-travis-temporarily-skip-test_path_changed.patch
new file mode 100644
index 0000000..f658d09
--- /dev/null
+++ b/SOURCES/0679-travis-temporarily-skip-test_path_changed.patch
@@ -0,0 +1,28 @@
+From 7c1d32eb199490e6b9af4fbe84652d5b2e822427 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Wed, 16 Jan 2019 09:49:14 +0100
+Subject: [PATCH] travis: temporarily skip test_path_changed
+
+---
+ ci/travis-centos-rhel7.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
+index b1b3de1cc2..870f4d8e33 100755
+--- a/ci/travis-centos-rhel7.sh
++++ b/ci/travis-centos-rhel7.sh
+@@ -52,6 +52,14 @@ for phase in "${PHASES[@]}"; do
+ --enable-gtk-doc --enable-compat-libs --disable-sysusers \
+ --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d
+ $DOCKER_EXEC make
++ # Temporarily skip test_path_changed in src/test/test-path.c
++ # This particular test case timeouts on Ubuntu in a Docker image
++ # and needs further debugging (couldn't reproduce it on
++ # Fedora + Docker
++ $DOCKER_EXEC sed -i '/static void test_path_changed/,/^}\s*$/d' src/test/test-path.c
++ $DOCKER_EXEC sed -i '/test_path_changed,/d' src/test/test-path.c
++
++ # Run the internal testsuite
+ if ! $DOCKER_EXEC make check; then
+ $DOCKER_EXEC cat test-suite.log
+ exit 1
diff --git a/SOURCES/0680-travis-reboot-the-container-before-running-tests.patch b/SOURCES/0680-travis-reboot-the-container-before-running-tests.patch
new file mode 100644
index 0000000..7cd4bd3
--- /dev/null
+++ b/SOURCES/0680-travis-reboot-the-container-before-running-tests.patch
@@ -0,0 +1,41 @@
+From 8be66c69d122e077d9638fb59274d8ca369918d7 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Thu, 17 Jan 2019 12:03:10 +0100
+Subject: [PATCH] travis: reboot the container before running tests
+
+(cherry picked from commit f8cbf4a84876a42b86670d88f3c0772839b0f0c1)
+---
+ ci/travis-centos-rhel7.sh | 4 ++++
+ ci/travis-centos-rhel8.sh | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
+index 870f4d8e33..9f128ab8e2 100755
+--- a/ci/travis-centos-rhel7.sh
++++ b/ci/travis-centos-rhel7.sh
+@@ -60,6 +60,10 @@ for phase in "${PHASES[@]}"; do
+ $DOCKER_EXEC sed -i '/test_path_changed,/d' src/test/test-path.c
+
+ # Run the internal testsuite
++ # Let's install the new systemd and "reboot" the container to avoid
++ # unexpected fails due to incompatibilities with older systemd
++ $DOCKER_EXEC make install
++ docker restart $CONT_NAME
+ if ! $DOCKER_EXEC make check; then
+ $DOCKER_EXEC cat test-suite.log
+ exit 1
+diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh
+index 8eda5e982f..1f72d984e0 100755
+--- a/ci/travis-centos-rhel8.sh
++++ b/ci/travis-centos-rhel8.sh
+@@ -113,6 +113,10 @@ for phase in "${PHASES[@]}"; do
+ )
+ docker exec -it -e CFLAGS='-g -O0 -ftrapv' $CONT_NAME meson build "${CONFIGURE_OPTS[@]}"
+ $DOCKER_EXEC ninja -v -C build
++ # Let's install the new systemd and "reboot" the container to avoid
++ # unexpected fails due to incompatibilities with older systemd
++ $DOCKER_EXEC ninja -C build install
++ docker restart $CONT_NAME
+ # "Mask" the udev-test.pl, as it requires newer version of systemd-detect-virt
+ # and it's pointless to run it on a VM in a Docker container...
+ echo -ne "#!/usr/bin/perl\nexit(0);\n" > "test/udev-test.pl"
diff --git a/SOURCES/0681-travis-drop-the-test_path_changed-workaround.patch b/SOURCES/0681-travis-drop-the-test_path_changed-workaround.patch
new file mode 100644
index 0000000..d90a363
--- /dev/null
+++ b/SOURCES/0681-travis-drop-the-test_path_changed-workaround.patch
@@ -0,0 +1,27 @@
+From 3c66bfddf2038b3d999045dffd1b3beefbb1f8f4 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Thu, 17 Jan 2019 13:21:42 +0100
+Subject: [PATCH] travis: drop the test_path_changed workaround
+
+---
+ ci/travis-centos-rhel7.sh | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
+index 9f128ab8e2..7db3a8db41 100755
+--- a/ci/travis-centos-rhel7.sh
++++ b/ci/travis-centos-rhel7.sh
+@@ -52,13 +52,6 @@ for phase in "${PHASES[@]}"; do
+ --enable-gtk-doc --enable-compat-libs --disable-sysusers \
+ --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d
+ $DOCKER_EXEC make
+- # Temporarily skip test_path_changed in src/test/test-path.c
+- # This particular test case timeouts on Ubuntu in a Docker image
+- # and needs further debugging (couldn't reproduce it on
+- # Fedora + Docker
+- $DOCKER_EXEC sed -i '/static void test_path_changed/,/^}\s*$/d' src/test/test-path.c
+- $DOCKER_EXEC sed -i '/test_path_changed,/d' src/test/test-path.c
+-
+ # Run the internal testsuite
+ # Let's install the new systemd and "reboot" the container to avoid
+ # unexpected fails due to incompatibilities with older systemd
diff --git a/SOURCES/0682-detect-virt-do-not-try-to-read-all-of-proc-cpuinfo.patch b/SOURCES/0682-detect-virt-do-not-try-to-read-all-of-proc-cpuinfo.patch
new file mode 100644
index 0000000..037f1a6
--- /dev/null
+++ b/SOURCES/0682-detect-virt-do-not-try-to-read-all-of-proc-cpuinfo.patch
@@ -0,0 +1,80 @@
+From 7bb8b4580b19f1d48e9beb201387d6c321b3ae7b Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 2 Oct 2018 16:07:00 +0200
+Subject: [PATCH] detect-virt: do not try to read all of /proc/cpuinfo
+
+Quoting #10074:
+> detect_vm_uml() reads /proc/cpuinfo with read_full_file()
+> read_full_file() has a file max limit size of READ_FULL_BYTES_MAX=(4U*1024U*1024U)
+> Unfortunately, the size of my /proc/cpuinfo is bigger, approximately:
+> echo $(( 4* $(cat /proc/cpuinfo | wc -c)))
+> 9918072
+> This causes read_full_file() to fail and the Condition test fallout.
+
+Let's just read line by line until we find an intersting line. This also
+helps if not running under UML, because we avoid reading as much data.
+
+(cherry picked from commit 6058516a14ada1748313af6783f5b4e7e3006654)
+Resolves: #1631531
+---
+ src/shared/virt.c | 40 ++++++++++++++++++++++++++++++++--------
+ 1 file changed, 32 insertions(+), 8 deletions(-)
+
+diff --git a/src/shared/virt.c b/src/shared/virt.c
+index 55a6ca90fb..e6362f6645 100644
+--- a/src/shared/virt.c
++++ b/src/shared/virt.c
+@@ -185,7 +185,8 @@ static int detect_vm_dmi(const char **_id) {
+
+ /* Returns a short identifier for the various VM implementations */
+ int detect_vm(const char **id) {
+- _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL;
++ _cleanup_free_ char *domcap = NULL;
++ _cleanup_fclose_ FILE *f = NULL;
+ static thread_local int cached_found = -1;
+ static thread_local const char *cached_id = NULL;
+ const char *_id = NULL;
+@@ -252,13 +253,36 @@ int detect_vm(const char **id) {
+ }
+
+ /* Detect User-Mode Linux by reading /proc/cpuinfo */
+- r = read_full_file("/proc/cpuinfo", &cpuinfo_contents, NULL);
+- if (r < 0)
+- return r;
+- if (strstr(cpuinfo_contents, "\nvendor_id\t: User Mode Linux\n")) {
+- _id = "uml";
+- r = 1;
+- goto finish;
++ f = fopen("/proc/cpuinfo", "re");
++ if (!f) {
++ if (errno == ENOENT) {
++ log_debug("/proc/cpuinfo not found, assuming no UML virtualization.");
++ r = 0;
++ goto finish;
++ }
++ return -errno;
++ }
++ for (;;) {
++ _cleanup_free_ char *line = NULL;
++ const char *t;
++
++ r = read_line(f, LONG_LINE_MAX, &line);
++ if (r < 0)
++ return r;
++ if (r == 0)
++ break;
++
++ t = startswith(line, "vendor_id\t: ");
++ if (t) {
++ if (startswith(t, "User Mode Linux")) {
++ log_debug("UML virtualization found in /proc/cpuinfo");
++ _id = "uml";
++ r = 1;
++ goto finish;
++ }
++
++ break;
++ }
+ }
+
+ #if defined(__s390__)
diff --git a/SOURCES/0683-core-disable-the-effect-of-Restart-if-there-s-a-stop.patch b/SOURCES/0683-core-disable-the-effect-of-Restart-if-there-s-a-stop.patch
new file mode 100644
index 0000000..dbe9acf
--- /dev/null
+++ b/SOURCES/0683-core-disable-the-effect-of-Restart-if-there-s-a-stop.patch
@@ -0,0 +1,35 @@
+From 33de2536b02351fecdae931b19e9980d0cecffbb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Sat, 26 Aug 2017 15:07:23 +0200
+Subject: [PATCH] core: disable the effect of Restart= if there's a stop job
+ pending for a service (#6581)
+
+We shouldn't undo the job already enqueued, under any circumstances.
+
+Fixes: #6504
+(cherry picked from commit 0f52f8e552f869269f02f0359c2d1019cc39f15a)
+
+Resolves: #1626382
+---
+ src/core/service.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 8303a1e7ee..4d542ad947 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1271,8 +1271,14 @@ static int cgroup_good(Service *s) {
+
+ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) {
+ int r;
++
+ assert(s);
+
++ /* If there's a stop job queued before we enter the DEAD state, we shouldn't act on Restart=, in order to not
++ * undo what has already been enqueued. */
++ if (unit_stop_pending(UNIT(s)))
++ allow_restart = false;
++
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
+
diff --git a/SOURCES/0684-networkd-respect-DHCP-UseRoutes-option.patch b/SOURCES/0684-networkd-respect-DHCP-UseRoutes-option.patch
new file mode 100644
index 0000000..4a3859d
--- /dev/null
+++ b/SOURCES/0684-networkd-respect-DHCP-UseRoutes-option.patch
@@ -0,0 +1,29 @@
+From f0beebf7beb86a804a80e53794b6234da97f085b Mon Sep 17 00:00:00 2001
+From: Susant Sahani <ssahani@users.noreply.github.com>
+Date: Thu, 21 Apr 2016 06:06:33 +0530
+Subject: [PATCH] networkd: respect DHCP UseRoutes option
+
+This fixes #2282.
+
+(cherry picked from commit 964b26fe2127d28713bccf03603900a7691216ba)
+
+Resolves: #1663365
+---
+ src/network/networkd-dhcp4.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
+index c3d0e3d39d..354c760ba9 100644
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -58,6 +58,10 @@ static int link_set_dhcp_routes(Link *link) {
+
+ assert(link);
+ assert(link->dhcp_lease);
++ assert(link->network);
++
++ if (!link->network->dhcp_routes)
++ return 0;
+
+ r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
+ if (r < 0 && r != -ENOENT) {
diff --git a/SOURCES/0685-networkd-fix-dhcp4-link-without-routes-not-being-con.patch b/SOURCES/0685-networkd-fix-dhcp4-link-without-routes-not-being-con.patch
new file mode 100644
index 0000000..ddd435c
--- /dev/null
+++ b/SOURCES/0685-networkd-fix-dhcp4-link-without-routes-not-being-con.patch
@@ -0,0 +1,48 @@
+From fd14e0686820eaff61c2583d98aefc391a8164fe Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi.hannula@iki.fi>
+Date: Tue, 17 Apr 2018 18:12:00 +0300
+Subject: [PATCH] networkd: fix dhcp4 link without routes not being considered
+ ready (#8728)
+
+The dhcp4 code sets link->dhcp4_configured when dhcp4_route_handler()
+has processed the last message.
+
+However, in case UseRoutes=no has been set in the [DHCP] section, or
+in case the DHCP server simply sends no routes, link_set_dhcp_routes()
+will not send any netlink messages and dhcp4_route_handler() will
+therefore never be called.
+
+This causes the link to never reach LINK_STATE_CONFIGURED, and e.g.
+systemd-networkd-wait-online will not consider the link as ready.
+
+Fix that by setting link->dhcp4_configured = true and calling
+link_check_ready() in dhcp4_address_handler() in case
+link_set_dhcp_routes() sent no netlink messages (dhcp4_messages is
+zero).
+
+(cherry picked from commit 223932c786ada7f758a7b7878a6ad2dae0d1e5fb)
+
+Related: #1663365
+
+[jsynacek: Note that link_client_handler() was used instead of
+link_check_ready(). The former is an older version of the latter.]
+---
+ src/network/networkd-dhcp4.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
+index 354c760ba9..295e44fdd7 100644
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -305,6 +305,11 @@ static int dhcp4_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
+
+ link_set_dhcp_routes(link);
+
++ if (link->dhcp4_messages == 0) {
++ link->dhcp4_configured = true;
++ link_client_handler(link);
++ }
++
+ return 1;
+ }
+
diff --git a/SOURCES/0686-networkd-dont-crash-when-mtu-changes-6594.patch b/SOURCES/0686-networkd-dont-crash-when-mtu-changes-6594.patch
new file mode 100644
index 0000000..8b50668
--- /dev/null
+++ b/SOURCES/0686-networkd-dont-crash-when-mtu-changes-6594.patch
@@ -0,0 +1,40 @@
+From 583aea0f48640611f0c1d5da9dec8d3759521ce9 Mon Sep 17 00:00:00 2001
+From: Andrew Jeddeloh <andrewjeddeloh@gmail.com>
+Date: Thu, 31 Aug 2017 01:58:39 -0700
+Subject: [PATCH] networkd: dont crash when mtu changes (#6594)
+
+Prevent networkd from crashing when UseMTU is used. Many drivers will
+bring the link down and then back up to configure a new MTU. Networkd
+will also asynchonously send rtnl messages to configure the link and may
+receive responses after the link has gone down and come back up (which
+networkd will handle and set the lease and network to NULL.
+
+This changes the behavior to instead return if this is the case instead
+of crashing via assert.
+
+(cherry picked from commit 0c9b15a38a558d8f84257455ee24174221069e9e)
+
+Related: #1663365
+---
+ src/network/networkd-dhcp4.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
+index 295e44fdd7..a47286af6b 100644
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -57,8 +57,12 @@ static int link_set_dhcp_routes(Link *link) {
+ int r, n, i;
+
+ assert(link);
+- assert(link->dhcp_lease);
+- assert(link->network);
++
++ if (!link->dhcp_lease) /* link went down while we configured the IP addresses? */
++ return 0;
++
++ if (!link->network) /* link went down while we configured the IP addresses? */
++ return 0;
+
+ if (!link->network->dhcp_routes)
+ return 0;
diff --git a/SOURCES/0687-tmpfiles-e-takes-globs.patch b/SOURCES/0687-tmpfiles-e-takes-globs.patch
new file mode 100644
index 0000000..696e235
--- /dev/null
+++ b/SOURCES/0687-tmpfiles-e-takes-globs.patch
@@ -0,0 +1,32 @@
+From 1119f95f55ee9c78d140f4d8808f85a3026380d3 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 11 Dec 2018 10:35:56 +0100
+Subject: [PATCH] tmpfiles: "e" takes globs
+
+Fixes #7369.
+
+(cherry picked from commit 65241c1485dbad934e22544cd9d8724f4d7ff91d)
+
+Resolves: #1641764
+---
+ src/tmpfiles/tmpfiles.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 8a75efb229..f7fa2e40fa 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -1550,12 +1550,12 @@ static int clean_item(Item *i) {
+ switch (i->type) {
+ case CREATE_DIRECTORY:
+ case CREATE_SUBVOLUME:
+- case EMPTY_DIRECTORY:
+ case TRUNCATE_DIRECTORY:
+ case IGNORE_PATH:
+ case COPY_FILES:
+ clean_item_instance(i, i->path);
+ return 0;
++ case EMPTY_DIRECTORY:
+ case IGNORE_DIRECTORY_PATH:
+ return glob_item(i, clean_item_instance, false);
+ default:
diff --git a/SOURCES/0688-tmpfiles-e-is-supposed-to-operate-on-directory-only.patch b/SOURCES/0688-tmpfiles-e-is-supposed-to-operate-on-directory-only.patch
new file mode 100644
index 0000000..4b91948
--- /dev/null
+++ b/SOURCES/0688-tmpfiles-e-is-supposed-to-operate-on-directory-only.patch
@@ -0,0 +1,26 @@
+From edaaf538a500811d5457f9c3a8e1ea4c8283806e Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 11 Dec 2018 10:39:01 +0100
+Subject: [PATCH] tmpfiles: 'e' is supposed to operate on directory only
+
+(cherry picked from commit d460ba18e777128c19343b067574ecac399f3afc)
+
+Related: #1641764
+---
+ src/tmpfiles/tmpfiles.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index f7fa2e40fa..20bc465d23 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -621,6 +621,9 @@ static int path_set_perms(Item *i, const char *path) {
+ if (fstatat(fd, "", &st, AT_EMPTY_PATH) < 0)
+ return log_error_errno(errno, "Failed to fstat() file %s: %m", path);
+
++ if (i->type == EMPTY_DIRECTORY && !S_ISDIR(st.st_mode))
++ return log_error_errno(EEXIST, "'%s' already exists and is not a directory. ", path);
++
+ if (S_ISLNK(st.st_mode))
+ log_debug("Skipping mode an owner fix for symlink %s.", path);
+ else {
diff --git a/SOURCES/0689-tmpfiles-e-is-supposed-to-accept-shell-style-globs.patch b/SOURCES/0689-tmpfiles-e-is-supposed-to-accept-shell-style-globs.patch
new file mode 100644
index 0000000..ed61d06
--- /dev/null
+++ b/SOURCES/0689-tmpfiles-e-is-supposed-to-accept-shell-style-globs.patch
@@ -0,0 +1,25 @@
+From 40ed615d2f05472e2bc807fa1cdf5498625321e7 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 11 Dec 2018 10:40:25 +0100
+Subject: [PATCH] tmpfiles: 'e' is supposed to accept shell-style globs
+
+(cherry picked from commit 939ca2136363f50b5acdb9ca102b9c27389859f1)
+
+Related: #1641764
+---
+ src/tmpfiles/tmpfiles.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 20bc465d23..0b17b5908e 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -1240,7 +1240,7 @@ static int create_item(Item *i) {
+ /* fall through */
+
+ case EMPTY_DIRECTORY:
+- r = path_set_perms(i, i->path);
++ r = glob_item(i, path_set_perms, false);
+ if (r < 0)
+ return r;
+
diff --git a/SOURCES/0690-bus-message-do-not-crash-on-message-with-a-string-of.patch b/SOURCES/0690-bus-message-do-not-crash-on-message-with-a-string-of.patch
new file mode 100644
index 0000000..f4d0ead
--- /dev/null
+++ b/SOURCES/0690-bus-message-do-not-crash-on-message-with-a-string-of.patch
@@ -0,0 +1,45 @@
+From 0045159ffd9fb174b3da5fcccb5d2139245fe089 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Mon, 9 Jul 2018 13:21:44 +0200
+Subject: [PATCH] bus-message: do not crash on message with a string of zero
+ length
+
+We'd calculate the "real" length of the string as 'item_size - 1', which does
+not work out well when item_size == 0.
+
+(cherry-picked from commit 81b6e63029eefcb0ec03a3a7c248490e38106073)
+
+Resolves: #1643396
+---
+ src/libsystemd/sd-bus/bus-message.c | 6 ++++++
+ .../crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e | Bin 0 -> 51 bytes
+ 2 files changed, 6 insertions(+)
+ create mode 100644 test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e
+
+diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
+index c8402a23a9..121e65674d 100644
+--- a/src/libsystemd/sd-bus/bus-message.c
++++ b/src/libsystemd/sd-bus/bus-message.c
+@@ -3402,6 +3402,12 @@ _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) {
+ if (IN_SET(type, SD_BUS_TYPE_STRING, SD_BUS_TYPE_OBJECT_PATH, SD_BUS_TYPE_SIGNATURE)) {
+ bool ok;
+
++ /* D-Bus spec: The marshalling formats for the string-like types all end
++ * with a single zero (NUL) byte, but that byte is not considered to be part
++ * of the text. */
++ if (c->item_size == 0)
++ return -EBADMSG;
++
+ r = message_peek_body(m, &rindex, 1, c->item_size, &q);
+ if (r < 0)
+ return r;
+diff --git a/test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e b/test/fuzz/fuzz-bus-message/crash-29ed3c202e0ffade3cad42c8bbeb6cc68a21eb8e
+new file mode 100644
+index 0000000000000000000000000000000000000000..4488f0a6c685b5d43eddbe41a0c6a3b6be9b02e2
+GIT binary patch
+literal 51
+fcmc~1WMC4sJpJnr13KV`0|t%6q+%$@&=ddw)CUPg
+
+literal 0
+HcmV?d00001
+
diff --git a/SOURCES/0691-Revert-bus-when-dumping-string-property-values-escap.patch b/SOURCES/0691-Revert-bus-when-dumping-string-property-values-escap.patch
new file mode 100644
index 0000000..dc7dc19
--- /dev/null
+++ b/SOURCES/0691-Revert-bus-when-dumping-string-property-values-escap.patch
@@ -0,0 +1,94 @@
+From e8f522de0e698d956f5d5305beec3862ae258f9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sat, 1 Jul 2017 16:17:12 -0400
+Subject: [PATCH] Revert "bus: when dumping string property values escape the
+ chars we use as end-of-line and end-of-item marks"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 27e9c5af817147ea1c678769e45e83f2e4b4ae96.
+
+Property values already use escaping, so escaping them a second time is
+confusing. It also should be mostly unnecessary: we take care to make property
+values only contains strings which (after the initial escaping) are printable
+and parseable without any futher escaping.
+
+Before revert:
+$ systemctl list-dependencies 'dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device'
+dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+● ├─dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.swap
+● └─systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+$ systemctl show -p Wants,Requires 'dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device'
+Requires=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
+Wants=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.swap
+
+Difference between systemctl show before revert and now:
+-Slice=system-systemd\x5cx2dcryptsetup.slice
++Slice=system-systemd\x2dcryptsetup.slice
+
+-Id=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
++Id=systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+
+-Names=systemd-cryptsetup@luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.service
++Names=systemd-cryptsetup@luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.service
+
+-Requires=system-systemd\x5cx2dcryptsetup.slice
++Requires=system-systemd\x2dcryptsetup.slice
+
+-BindsTo=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device dev-disk-by\x5cx2duuid-8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device
++BindsTo=dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device dev-disk-by\x2duuid-8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+
+-RequiredBy=dev-mapper-luks\x5cx2d8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device cryptsetup.target
++RequiredBy=dev-mapper-luks\x2d8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device cryptsetup.target
+
+-WantedBy=dev-disk-by\x5cx2duuid-8db85dcf\x5cx2d6230\x5cx2d4e88\x5cx2d940d\x5cx2dba176d062b31.device
++WantedBy=dev-disk-by\x2duuid-8db85dcf\x2d6230\x2d4e88\x2d940d\x2dba176d062b31.device
+
+(cherry picked from commit 3dfbc968e8343172faf754a3c81e27f0dbd8f157)
+
+Resolves: #1643172
+---
+ src/libsystemd/sd-bus/bus-util.c | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
+index b1bdbad2dd..9b77059a93 100644
+--- a/src/libsystemd/sd-bus/bus-util.c
++++ b/src/libsystemd/sd-bus/bus-util.c
+@@ -643,15 +643,8 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
+ if (r < 0)
+ return r;
+
+- if (all || !isempty(s)) {
+- _cleanup_free_ char *escaped = NULL;
+-
+- escaped = xescape(s, "\n");
+- if (!escaped)
+- return -ENOMEM;
+-
+- printf("%s=%s\n", name, escaped);
+- }
++ if (all || !isempty(s))
++ printf("%s=%s\n", name, s);
+
+ return 1;
+ }
+@@ -742,16 +735,10 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
+ return r;
+
+ while((r = sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) > 0) {
+- _cleanup_free_ char *escaped = NULL;
+-
+ if (first)
+ printf("%s=", name);
+
+- escaped = xescape(str, "\n ");
+- if (!escaped)
+- return -ENOMEM;
+-
+- printf("%s%s", first ? "" : " ", escaped);
++ printf("%s%s", first ? "" : " ", str);
+
+ first = false;
+ }
diff --git a/SOURCES/0692-set-automount-state-to-waiting-when-the-mount-is-sto.patch b/SOURCES/0692-set-automount-state-to-waiting-when-the-mount-is-sto.patch
new file mode 100644
index 0000000..e3c5c12
--- /dev/null
+++ b/SOURCES/0692-set-automount-state-to-waiting-when-the-mount-is-sto.patch
@@ -0,0 +1,23 @@
+From 4b125d957a082250b83ff1bff775edefe90356de Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 19 Nov 2018 15:58:27 +0100
+Subject: [PATCH] set automount state to waiting when the mount is stopped
+
+Resolves: #1651257
+---
+ src/core/automount.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/core/automount.c b/src/core/automount.c
+index f57782b9b8..4678bdc7c9 100644
+--- a/src/core/automount.c
++++ b/src/core/automount.c
+@@ -523,6 +523,8 @@ int automount_update_mount(Automount *a, MountState old_state, MountState state)
+ if (old_state != state)
+ automount_send_ready(a, a->tokens, -ENODEV);
+ (void) sd_event_source_set_enabled(a->expire_event_source, SD_EVENT_OFF);
++ if (a->state == AUTOMOUNT_RUNNING)
++ automount_set_state(a, AUTOMOUNT_WAITING);
+ break;
+ default:
+ break;
diff --git a/SOURCES/0693-core-when-deserializing-state-always-use-read_line-L.patch b/SOURCES/0693-core-when-deserializing-state-always-use-read_line-L.patch
new file mode 100644
index 0000000..3513d61
--- /dev/null
+++ b/SOURCES/0693-core-when-deserializing-state-always-use-read_line-L.patch
@@ -0,0 +1,181 @@
+From 650d5c39753d095f8ae6cff418306cf1a6b8fd25 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Fri, 2 Nov 2018 08:40:40 +0100
+Subject: [PATCH] =?UTF-8?q?core:=20when=20deserializing=20state=20always?=
+ =?UTF-8?q?=20use=20read=5Fline(=E2=80=A6,=20LONG=5FLINE=5FMAX,=20?=
+ =?UTF-8?q?=E2=80=A6)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This should be much better than fgets(), as we can read substantially
+longer lines and overly long lines result in proper errors.
+
+Fixes a vulnerability discovered by Jann Horn at Google.
+
+(cherry picked from commit 8948b3415d762245ebf5e19d80b97d4d8cc208c1)
+
+Resolves: CVE-2018-15686
+
+[jsynacek] There were more commits in the pull request of which the cherry
+picked commit was a part of, see
+https://github.com/systemd/systemd/pull/10519/commits.
+I decided not to backport any of the remaining ones, because they were
+mostly irrelevant to the actual fix.
+---
+ src/core/job.c | 19 +++++++++++--------
+ src/core/manager.c | 38 ++++++++++++++++----------------------
+ src/core/unit.c | 17 ++++++++---------
+ 3 files changed, 35 insertions(+), 39 deletions(-)
+
+diff --git a/src/core/job.c b/src/core/job.c
+index 275503169b..998b231ed9 100644
+--- a/src/core/job.c
++++ b/src/core/job.c
+@@ -38,6 +38,7 @@
+ #include "async.h"
+ #include "virt.h"
+ #include "dbus.h"
++#include "fileio.h"
+
+ Job* job_new_raw(Unit *unit) {
+ Job *j;
+@@ -1035,23 +1036,25 @@ int job_serialize(Job *j, FILE *f, FDSet *fds) {
+ }
+
+ int job_deserialize(Job *j, FILE *f, FDSet *fds) {
++ int r = 0;
++
+ assert(j);
+
+ for (;;) {
+- char line[LINE_MAX], *l, *v;
++ _cleanup_free_ char *line = NULL;
++ char *l, *v;
+ size_t k;
+
+- if (!fgets(line, sizeof(line), f)) {
+- if (feof(f))
+- return 0;
+- return -errno;
+- }
++ r = read_line(f, LONG_LINE_MAX, &line);
++ if (r < 0)
++ return log_error_errno(r, "Failed to read serialization line: %m");
++ if (r == 0)
++ return 0;
+
+- char_array_0(line);
+ l = strstrip(line);
+
+ /* End marker */
+- if (l[0] == 0)
++ if (isempty(l))
+ return 0;
+
+ k = strcspn(l, "=");
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 0466e4bb8a..73d6c81fdb 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -37,6 +37,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <sys/timerfd.h>
++#include <fileio.h>
+
+ #ifdef HAVE_AUDIT
+ #include <libaudit.h>
+@@ -2559,21 +2560,19 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
+ m->n_reloading ++;
+
+ for (;;) {
+- char line[LINE_MAX], *l;
++ _cleanup_free_ char *line = NULL;
++ char *l;
+
+- if (!fgets(line, sizeof(line), f)) {
+- if (feof(f))
+- r = 0;
+- else
+- r = -errno;
+
+- goto finish;
+- }
++ r = read_line(f, LONG_LINE_MAX, &line);
++ if (r < 0)
++ return log_error_errno(r, "Failed to read serialization line: %m");
++ if (r == 0)
++ break;
+
+- char_array_0(line);
+ l = strstrip(line);
+
+- if (l[0] == 0)
++ if (isempty(l)) /* end marker */
+ break;
+
+ if (startswith(l, "current-job-id=")) {
+@@ -2708,22 +2707,17 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
+ }
+
+ for (;;) {
++ _cleanup_free_ char *line = NULL;
+ Unit *u;
+- char name[UNIT_NAME_MAX+2];
+
+ /* Start marker */
+- if (!fgets(name, sizeof(name), f)) {
+- if (feof(f))
+- r = 0;
+- else
+- r = -errno;
+-
+- goto finish;
+- }
+-
+- char_array_0(name);
++ r = read_line(f, LONG_LINE_MAX, &line);
++ if (r < 0)
++ return log_error_errno(r, "Failed to read serialization line: %m");
++ if (r == 0)
++ break;
+
+- r = manager_load_unit(m, strstrip(name), NULL, NULL, &u);
++ r = manager_load_unit(m, strstrip(line), NULL, NULL, &u);
+ if (r < 0)
+ goto finish;
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index e8532a057d..37fac8db3a 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -2644,20 +2644,19 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
+ rt = (ExecRuntime**) ((uint8_t*) u + offset);
+
+ for (;;) {
+- char line[LINE_MAX], *l, *v;
++ _cleanup_free_ char *line = NULL;
++ char *l, *v;
+ size_t k;
+
+- if (!fgets(line, sizeof(line), f)) {
+- if (feof(f))
+- return 0;
+- return -errno;
+- }
++ r = read_line(f, LONG_LINE_MAX, &line);
++ if (r < 0)
++ return log_error_errno(r, "Failed to read serialization line: %m");
++ if (r == 0) /* eof */
++ return 0;
+
+- char_array_0(line);
+ l = strstrip(line);
+-
+ /* End marker */
+- if (l[0] == 0)
++ if (isempty(l))
+ return 0;
+
+ k = strcspn(l, "=");
diff --git a/SOURCES/0694-core-enforce-a-limit-on-STATUS-texts-recvd-from-serv.patch b/SOURCES/0694-core-enforce-a-limit-on-STATUS-texts-recvd-from-serv.patch
new file mode 100644
index 0000000..aae3308
--- /dev/null
+++ b/SOURCES/0694-core-enforce-a-limit-on-STATUS-texts-recvd-from-serv.patch
@@ -0,0 +1,47 @@
+From b71d112385937fdffac8bb78df279b23bc9441c4 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 4 Dec 2018 10:01:35 +0100
+Subject: [PATCH] core: enforce a limit on STATUS= texts recvd from services
+
+Let's better be safe than sorry, and put a limit on what we receive.
+
+(cherry picked from commit 3eac1bcae9284fb8b18f4b82156c0e85ddb004e5)
+
+Related: CVE-2018-15686
+---
+ src/core/service.c | 8 ++++++--
+ src/core/service.h | 2 ++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 4d542ad947..fe6e2ff17c 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -3045,8 +3045,12 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds)
+ _cleanup_free_ char *t = NULL;
+
+ if (!isempty(e)) {
+- if (!utf8_is_valid(e))
+- log_unit_warning(u->id, "Status message in notification is not UTF-8 clean.");
++ /* Note that this size limit check is mostly paranoia: since the datagram size we are willing
++ * to process is already limited to NOTIFY_BUFFER_MAX, this limit here should never be hit. */
++ if (strlen(e) > STATUS_TEXT_MAX)
++ log_unit_warning(u->id, "Status message overly long (%zu > %u), ignoring.", strlen(e), STATUS_TEXT_MAX);
++ else if (!utf8_is_valid(e))
++ log_unit_warning(u->id, "Status message in notification message is not UTF-8 clean, ignoring.");
+ else {
+ log_unit_debug(u->id, "%s: got STATUS=%s", u->id, e);
+
+diff --git a/src/core/service.h b/src/core/service.h
+index 1f937dfe57..e0547a464e 100644
+--- a/src/core/service.h
++++ b/src/core/service.h
+@@ -31,6 +31,8 @@ typedef struct ServiceFDStore ServiceFDStore;
+ #include "exit-status.h"
+ #include "emergency-action.h"
+
++#define STATUS_TEXT_MAX (16U*1024U)
++
+ typedef enum ServiceState {
+ SERVICE_DEAD,
+ SERVICE_START_PRE,
diff --git a/SOURCES/0695-shorten-hostname-before-checking-for-trailing-dot.patch b/SOURCES/0695-shorten-hostname-before-checking-for-trailing-dot.patch
new file mode 100644
index 0000000..6c9e06e
--- /dev/null
+++ b/SOURCES/0695-shorten-hostname-before-checking-for-trailing-dot.patch
@@ -0,0 +1,36 @@
+From 0e99eafa4f0854626974db4def3e8451133578e3 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 2 Oct 2018 12:36:14 +0200
+Subject: [PATCH] shorten hostname before checking for trailing dot
+
+Shortening can lead to a hostname that has a trailing dot.
+Therefore it should be done before checking from trailing dots.
+
+(cherry picked from commit 46e1a2278116e2f5067c35127ccbd8589335f734)
+Resolves: #1631625
+---
+ src/shared/util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index c71e021cd7..4ba4693668 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -4641,6 +4641,8 @@ char* hostname_cleanup(char *s, bool lowercase) {
+ char *p, *d;
+ bool dot;
+
++ strshorten(s, HOST_NAME_MAX);
++
+ for (p = s, d = s, dot = true; *p; p++) {
+ if (*p == '.') {
+ if (dot)
+@@ -4660,8 +4662,6 @@ char* hostname_cleanup(char *s, bool lowercase) {
+ else
+ *d = 0;
+
+- strshorten(s, HOST_NAME_MAX);
+-
+ return s;
+ }
+
diff --git a/SOURCES/0696-journald-fixed-assertion-failure-when-system-journal.patch b/SOURCES/0696-journald-fixed-assertion-failure-when-system-journal.patch
new file mode 100644
index 0000000..ddbe91d
--- /dev/null
+++ b/SOURCES/0696-journald-fixed-assertion-failure-when-system-journal.patch
@@ -0,0 +1,27 @@
+From 7b82ce4a8457639d225449f3d345138c9f4f5ad9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?=
+ <1163635+rmetrich@users.noreply.github.com>
+Date: Mon, 3 Sep 2018 05:42:39 +0200
+Subject: [PATCH] journald: fixed assertion failure when system journal
+ rotation fails (#9893)
+
+(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9)
+Resolves: #1619543
+---
+ src/journal/journald-server.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 88d8f3e41d..88cf0b2d53 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -1180,7 +1180,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
+ }
+
+ finish:
+- journal_file_post_change(s->system_journal);
++ if (s->system_journal)
++ journal_file_post_change(s->system_journal);
+
+ journal_file_close(s->runtime_journal);
+ s->runtime_journal = NULL;
diff --git a/SOURCES/0697-local-addresses-handle-gracefully-if-routes-lack-an-.patch b/SOURCES/0697-local-addresses-handle-gracefully-if-routes-lack-an-.patch
new file mode 100644
index 0000000..07e20f6
--- /dev/null
+++ b/SOURCES/0697-local-addresses-handle-gracefully-if-routes-lack-an-.patch
@@ -0,0 +1,31 @@
+From c4037813ad63527be927a88fd6a28521cdff0762 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 23 Jan 2018 15:48:28 +0100
+Subject: [PATCH] local-addresses: handle gracefully if routes lack an RTA_OIF
+ attribute
+
+Some routes (such as those using "nexthop") don't have an RTA_OIF
+attribute. We need to handle that gracefully, by simply ignoring the
+route.
+
+Fixes: #7854
+(cherry picked from commit 568fc5c3f7223770b8f3471da314745742125bb9)
+
+Resolves: #1627750
+---
+ src/libsystemd/sd-rtnl/local-addresses.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libsystemd/sd-rtnl/local-addresses.c b/src/libsystemd/sd-rtnl/local-addresses.c
+index 31bfa06066..82bad373b7 100644
+--- a/src/libsystemd/sd-rtnl/local-addresses.c
++++ b/src/libsystemd/sd-rtnl/local-addresses.c
+@@ -225,6 +225,8 @@ int local_gateways(sd_rtnl *context, int ifindex, int af, struct local_address *
+ continue;
+
+ r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
++ if (r == -ENODATA) /* Not all routes have an RTA_OIF attribute (for example nexthop ones) */
++ continue;
+ if (r < 0)
+ return r;
+ if (ifindex > 0 && (int) ifi != ifindex)
diff --git a/SOURCES/0698-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch b/SOURCES/0698-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch
new file mode 100644
index 0000000..432b742
--- /dev/null
+++ b/SOURCES/0698-rules-fix-memory-hotplug-rule-so-systemd-detect-virt.patch
@@ -0,0 +1,27 @@
+From 82fb8420a53abded9d25502be8ab92d544b860a7 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 30 Jan 2019 10:20:57 +0100
+Subject: [PATCH] rules: fix memory hotplug rule so systemd-detect-virt does
+ not run too often
+
+Fixes a bug introduced in commit c50b7bcbebcfebfce3a7e7fb77f88f4b590fb2b5.
+
+Resolves: #1666612
+---
+ rules/40-redhat.rules | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
+index 1b10e173d6..2c690e522e 100644
+--- a/rules/40-redhat.rules
++++ b/rules/40-redhat.rules
+@@ -4,7 +4,8 @@
+ SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1"
+
+ # Memory hotadd request
+-SUBSYSTEM!="memory", ACTION!="add", GOTO="memory_hotplug_end"
++SUBSYSTEM!="memory", GOTO="memory_hotplug_end"
++ACTION!="add", GOTO="memory_hotplug_end"
+ PROGRAM="/bin/uname -p", RESULT=="s390*", GOTO="memory_hotplug_end"
+
+ ENV{.state}="online"
diff --git a/SOURCES/0699-6647-use-path_startswith-dev-in-cryptsetup-6732.patch b/SOURCES/0699-6647-use-path_startswith-dev-in-cryptsetup-6732.patch
new file mode 100644
index 0000000..7d56e1b
--- /dev/null
+++ b/SOURCES/0699-6647-use-path_startswith-dev-in-cryptsetup-6732.patch
@@ -0,0 +1,36 @@
+From e290169c17a7ca56aa0fce25879656b8e598e1de Mon Sep 17 00:00:00 2001
+From: ettavolt <ettavolt@gmail.com>
+Date: Mon, 4 Sep 2017 16:36:52 +0300
+Subject: [PATCH] 6647 - use path_startswith("/dev") in cryptsetup (#6732)
+
+For both key and partition paths.
+
+(cherry picked from commit 048dd629c4590eefb2ebd6a316c7350ed3a6ff19)
+
+Resolves: #1664695
+---
+ src/cryptsetup/cryptsetup-generator.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 7b90d26156..b2edbfe298 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -215,7 +215,7 @@ static int create_disk(
+
+ if (!path_equal(uu, "/dev/null")) {
+
+- if (is_device_path(uu)) {
++ if (path_startswith(uu, "/dev/")) {
+ _cleanup_free_ char *dd;
+
+ dd = unit_name_from_path(uu, ".device");
+@@ -229,7 +229,7 @@ static int create_disk(
+ }
+ }
+
+- if (is_device_path(u))
++ if (path_startswith(u, "/dev/"))
+ fprintf(f,
+ "BindsTo=%s\n"
+ "After=%s\n"
diff --git a/SOURCES/0700-core-mount-setup-handle-non-existing-mountpoints-gra.patch b/SOURCES/0700-core-mount-setup-handle-non-existing-mountpoints-gra.patch
new file mode 100644
index 0000000..d5b610e
--- /dev/null
+++ b/SOURCES/0700-core-mount-setup-handle-non-existing-mountpoints-gra.patch
@@ -0,0 +1,35 @@
+From 110af4eeadeec6e901d1189ed914d04fb8b60e13 Mon Sep 17 00:00:00 2001
+From: Daniel Mack <daniel@zonque.org>
+Date: Tue, 7 Apr 2015 00:44:15 +0200
+Subject: [PATCH] core: mount-setup: handle non-existing mountpoints gracefully
+
+Commit e792e890f ("path-util: don't eat up ENOENT in
+path_is_mount_point()") changed path_is_mount_point() so it doesn't hide
+-ENOENT from its caller. This causes all boots to fail early in case
+any of the mount points does not exist (for instance, when kdbus isn't
+loaded, /sys/fs/kdbus is missing).
+
+Fix this by returning 0 from mount_one() if path_is_mount_point()
+returned -ENOENT.
+
+(cherry picked from commit b604cb9bf6a14d12589e85b82f3f59db93ea0029)
+
+Resolves: #1585411
+---
+ src/core/mount-setup.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
+index ed493cbe36..71f07b6e2c 100644
+--- a/src/core/mount-setup.c
++++ b/src/core/mount-setup.c
+@@ -163,6 +163,9 @@ static int mount_one(const MountPoint *p, bool relabel) {
+ label_fix(p->where, true, true);
+
+ r = path_is_mount_point(p->where, true);
++ if (r == -ENOENT)
++ return 0;
++
+ if (r < 0)
+ return r;
+
diff --git a/SOURCES/0701-units-rescue.service.in-fix-announcement-message.patch b/SOURCES/0701-units-rescue.service.in-fix-announcement-message.patch
new file mode 100644
index 0000000..1da922d
--- /dev/null
+++ b/SOURCES/0701-units-rescue.service.in-fix-announcement-message.patch
@@ -0,0 +1,23 @@
+From 2ecf5164d4749c580d3eab74a68a0db96c0d861b Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 18 Dec 2018 11:59:04 +0100
+Subject: [PATCH] units/rescue.service.in: fix announcement message
+
+Resolves: #1660422
+---
+ units/rescue.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/rescue.service.in b/units/rescue.service.in
+index de73fee654..c82aaa6ceb 100644
+--- a/units/rescue.service.in
++++ b/units/rescue.service.in
+@@ -17,7 +17,7 @@ Before=shutdown.target
+ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStartPre=-/bin/plymouth quit
+-ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
++ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
+ ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default"
+ Type=idle
+ StandardInput=tty-force
diff --git a/SOURCES/0702-systemctl-Allow-edit-and-cat-on-unloaded-units.patch b/SOURCES/0702-systemctl-Allow-edit-and-cat-on-unloaded-units.patch
new file mode 100644
index 0000000..0c029df
--- /dev/null
+++ b/SOURCES/0702-systemctl-Allow-edit-and-cat-on-unloaded-units.patch
@@ -0,0 +1,66 @@
+From 50a411f4b70ea27e2fd33c19394030e57a4a1280 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 11 Dec 2018 13:11:25 +0100
+Subject: [PATCH] systemctl: Allow 'edit' and 'cat' on unloaded units
+
+Don't fail if the unit has a LoadError; otherwise `systemctl edit` cannot be
+used to correct the error (e.g. multiple "ExecStart=" lines).
+
+Remove file changed warning so cat output isn't interspersed with log messages.
+
+Fixes #829
+
+(cherry picked from commit 1e524ec6e2031629fec27906423619e3403b2f3e)
+
+Resolves: #1649518
+---
+ src/systemctl/systemctl.c | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index b1862b5676..f31137787a 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -2311,42 +2311,12 @@ static int unit_find_paths(sd_bus *bus,
+
+ if (!avoid_bus_cache && !unit_name_is_template(unit_name)) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+- _cleanup_bus_message_unref_ sd_bus_message *unit_load_error = NULL;
+ _cleanup_free_ char *unit = NULL;
+- char *unit_load_error_name, *unit_load_error_message;
+
+ unit = unit_dbus_path_from_name(unit_name);
+ if (!unit)
+ return log_oom();
+
+- if (need_daemon_reload(bus, unit_name) > 0)
+- warn_unit_file_changed(unit_name);
+-
+- r = sd_bus_get_property(
+- bus,
+- "org.freedesktop.systemd1",
+- unit,
+- "org.freedesktop.systemd1.Unit",
+- "LoadError",
+- &error,
+- &unit_load_error,
+- "(ss)");
+- if (r < 0)
+- return log_error_errno(r, "Failed to get LoadError: %s", bus_error_message(&error, r));
+-
+- r = sd_bus_message_read(
+- unit_load_error,
+- "(ss)",
+- &unit_load_error_name,
+- &unit_load_error_message);
+- if (r < 0)
+- return bus_log_parse_error(r);
+-
+- if (!isempty(unit_load_error_name)) {
+- log_error("Unit %s is not loaded: %s", unit_name, unit_load_error_message);
+- return 0;
+- }
+-
+ r = sd_bus_get_property_string(
+ bus,
+ "org.freedesktop.systemd1",
diff --git a/SOURCES/0703-main-improve-RLIMIT_NOFILE-handling-5795.patch b/SOURCES/0703-main-improve-RLIMIT_NOFILE-handling-5795.patch
new file mode 100644
index 0000000..d443103
--- /dev/null
+++ b/SOURCES/0703-main-improve-RLIMIT_NOFILE-handling-5795.patch
@@ -0,0 +1,54 @@
+From 4fab90faea400463fd77e4dc0be1438da59718fd Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Wed, 26 Apr 2017 06:18:10 +0200
+Subject: [PATCH] main: improve RLIMIT_NOFILE handling (#5795)
+
+This has systemd look at /proc/sys/fs/nr_open to find the current maximum of
+open files compiled into the kernel and tries to set the RLIMIT_NOFILE max to
+it. This has the advantage the value chosen as limit is less arbitrary and also
+improves the behavior of systemd in containers that have an rlimit set: When
+systemd currently starts in a container that has RLIMIT_NOFILE set to e.g.
+100000 systemd will lower it to 65536. With this patch systemd will try to set
+the nofile limit to the allowed kernel maximum. If this fails, it will compute
+the minimum of the current set value (the limit that is set on the container)
+and the maximum value as soft limit and the currently set maximum value as the
+maximum value. This way it retains the limit set on the container.
+
+(cherry picked from commit 6385cb31ef443be3e0d6da5ea62a267a49174688)
+
+Resolves: #1585913
+---
+ src/core/main.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index 5554ef468d..2d70ed07ed 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1017,6 +1017,8 @@ fail:
+ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
+ struct rlimit nl;
+ int r;
++ int min_max;
++ _cleanup_free_ char *nr_open = NULL;
+
+ assert(saved_rlimit);
+
+@@ -1037,8 +1039,16 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
+ arg_default_rlimit[RLIMIT_NOFILE] = rl;
+ }
+
++ /* Get current RLIMIT_NOFILE maximum compiled into the kernel. */
++ r = read_one_line_file("/proc/sys/fs/nr_open", &nr_open);
++ if (r == 0)
++ r = safe_atoi(nr_open, &min_max);
++ /* If we fail, fallback to the hard-coded kernel limit of 1024 * 1024. */
++ if (r < 0)
++ min_max = 1024 * 1024;
++
+ /* Bump up the resource limit for ourselves substantially */
+- nl.rlim_cur = nl.rlim_max = 64*1024;
++ nl.rlim_cur = nl.rlim_max = min_max;
+ r = setrlimit_closest(RLIMIT_NOFILE, &nl);
+ if (r < 0)
+ return log_error_errno(r, "Setting RLIMIT_NOFILE failed: %m");
diff --git a/SOURCES/0704-shared-sleep-config-exclude-zram-devices-from-hibern.patch b/SOURCES/0704-shared-sleep-config-exclude-zram-devices-from-hibern.patch
new file mode 100644
index 0000000..319b381
--- /dev/null
+++ b/SOURCES/0704-shared-sleep-config-exclude-zram-devices-from-hibern.patch
@@ -0,0 +1,52 @@
+From 8fc26bd114d2aa997da261ac7c488d4c25116af3 Mon Sep 17 00:00:00 2001
+From: Andrew Jorgensen <ajorgens@amazon.com>
+Date: Wed, 25 Jul 2018 08:06:57 -0700
+Subject: [PATCH] shared/sleep-config: exclude zram devices from hibernation
+ candidates
+
+On a host with sufficiently large zram but with no actual swap, logind will
+respond to CanHibernate() with yes. With this patch, it will correctly respond
+no, unless there are other swap devices to consider.
+
+(cherry picked from commit 411ae92b407bd7b4549b205ad754bcd0e3dfd81f)
+
+Resolves: #1609816
+---
+ src/shared/sleep-config.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index 1064fd5cbd..c4334652fc 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -25,6 +25,7 @@
+ #include "sleep-config.h"
+ #include "fileio.h"
+ #include "log.h"
++#include "path-util.h"
+ #include "strv.h"
+ #include "util.h"
+
+@@ -202,9 +203,19 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
+ continue;
+ }
+
+- if (streq(type, "partition") && endswith(dev, "\\040(deleted)")) {
+- log_warning("Ignoring deleted swapfile '%s'.", dev);
+- continue;
++ if (streq(type, "partition")) {
++ const char *fn;
++
++ if (endswith(dev, "\\040(deleted)")) {
++ log_warning("Ignoring deleted swapfile '%s'.", dev);
++ continue;
++ }
++
++ fn = path_startswith(dev, "/dev/");
++ if (fn && startswith(fn, "zram")) {
++ log_debug("Ignoring compressed ram swap device '%s'.", dev);
++ continue;
++ }
+ }
+
+ *size = size_field;
diff --git a/SOURCES/0705-journalctl-allow-file-directory-with-boot-or-list-bo.patch b/SOURCES/0705-journalctl-allow-file-directory-with-boot-or-list-bo.patch
new file mode 100644
index 0000000..edf69f5
--- /dev/null
+++ b/SOURCES/0705-journalctl-allow-file-directory-with-boot-or-list-bo.patch
@@ -0,0 +1,34 @@
+From 916af326c9d2eabcdda2e048102f0bf83f76caca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 28 Jun 2016 15:27:07 -0400
+Subject: [PATCH] journalctl: allow --file/--directory with --boot or
+ --list-boots
+
+It works mostly fine, and can be quite useful to examine data from another
+system.
+
+OTOH, a single boot id doesn't make sense with --merge, so mixing with --merge
+is still not allowed.
+
+(cherry picked from commit f3bd7561c54dea82b128d06f6b269a4951ae2855)
+
+Resolves: #1463678
+---
+ src/journal/journalctl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
+index 1e6d0761c7..b9549602d9 100644
+--- a/src/journal/journalctl.c
++++ b/src/journal/journalctl.c
+@@ -814,8 +814,8 @@ static int parse_argv(int argc, char *argv[]) {
+ return -EINVAL;
+ }
+
+- if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && (arg_file || arg_directory || arg_merge)) {
+- log_error("Using --boot or --list-boots with --file, --directory or --merge is not supported.");
++ if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && arg_merge) {
++ log_error("Using --boot or --list-boots with --merge is not supported.");
+ return -EINVAL;
+ }
+
diff --git a/SOURCES/0706-journalct-allow-boot-0-to-DTRT-with-file-directory.patch b/SOURCES/0706-journalct-allow-boot-0-to-DTRT-with-file-directory.patch
new file mode 100644
index 0000000..1feb925
--- /dev/null
+++ b/SOURCES/0706-journalct-allow-boot-0-to-DTRT-with-file-directory.patch
@@ -0,0 +1,45 @@
+From 5ccf02d71c36bed22929893f3ad5374a333daf77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 28 Jun 2016 16:12:47 -0400
+Subject: [PATCH] journalct: allow --boot=0 to DTRT with --file/--directory
+
+--boot=0 magically meant "this boot", but when used with --file/--directory it
+should simply refer to the last boot found in the specified journal. This way,
+--boot and --list-boots are consistent.
+
+Fixes #3603.
+
+(cherry picked from commit 592855c3189549fed93b1060b72299910c6ab1d0)
+
+Related: #1463678
+---
+ src/journal/journalctl.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
+index b9549602d9..077dc37f76 100644
+--- a/src/journal/journalctl.c
++++ b/src/journal/journalctl.c
+@@ -1050,7 +1050,7 @@ static int get_boots(
+ /* Adjust for the asymmetry that offset 0 is
+ * the last (and current) boot, while 1 is considered the
+ * (chronological) first boot in the journal. */
+- skip_once = query_ref_boot && sd_id128_is_null(query_ref_boot->id) && ref_boot_offset < 0;
++ skip_once = query_ref_boot && sd_id128_is_null(query_ref_boot->id) && ref_boot_offset <= 0;
+
+ /* Advance to the earliest/latest occurrence of our reference
+ * boot ID (taking our lookup direction into account), so that
+@@ -1188,7 +1188,12 @@ static int add_boot(sd_journal *j) {
+ if (!arg_boot)
+ return 0;
+
+- if (arg_boot_offset == 0 && sd_id128_equal(arg_boot_id, SD_ID128_NULL))
++ /* Take a shortcut and use the current boot_id, which we can do very quickly.
++ * We can do this only when we logs are coming from the current machine,
++ * so take the slow path if log location is specified. */
++ if (arg_boot_offset == 0 && sd_id128_equal(arg_boot_id, SD_ID128_NULL) &&
++ !arg_directory && !arg_file)
++
+ return add_match_this_boot(j, arg_machine);
+
+ ref_boot_id.id = arg_boot_id;
diff --git a/SOURCES/0707-journal-remote-show-error-message-if-output-file-nam.patch b/SOURCES/0707-journal-remote-show-error-message-if-output-file-nam.patch
new file mode 100644
index 0000000..1a96fb9
--- /dev/null
+++ b/SOURCES/0707-journal-remote-show-error-message-if-output-file-nam.patch
@@ -0,0 +1,48 @@
+From 9f2aa24a4cad32e10cba693be95f3ff9c46ee73e Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 27 Aug 2017 16:34:53 +0900
+Subject: [PATCH] journal-remote: show error message if output file name does
+ not end with .journal
+
+`journalctl -o export | systemd-journal-remote -o /tmp/dir -`
+gives the following error messages.
+```
+Failed to open output journal /tmp/dir: Invalid argument
+Failed to get writer for source stdin: Invalid argument
+Failed to create source for fd:0 (stdin): Invalid argument
+```
+And these are hard to understand what is the problem.
+This commit makes journal-remote check whether the output file name
+ends with .journal suffix or not, and if not, output error message.
+
+(cherry picked from commit 6b1b9f75c85d26ddbda62e7b7afa6944044f4f95)
+
+Resolves: bz#1267552
+---
+ src/journal-remote/journal-remote.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
+index e65daf6a0b..431e28329b 100644
+--- a/src/journal-remote/journal-remote.c
++++ b/src/journal-remote/journal-remote.c
+@@ -1479,10 +1479,15 @@ static int parse_argv(int argc, char *argv[]) {
+ arg_split_mode = JOURNAL_WRITE_SPLIT_NONE;
+ }
+
+- if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE
+- && arg_output && is_dir(arg_output, true) > 0) {
+- log_error("For SplitMode=none, output must be a file.");
+- return -EINVAL;
++ if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE && arg_output) {
++ if (is_dir(arg_output, true) > 0) {
++ log_error("For SplitMode=none, output must be a file.");
++ return -EINVAL;
++ }
++ if (!endswith(arg_output, ".journal")) {
++ log_error("For SplitMode=none, output file name must end with .journal.");
++ return -EINVAL;
++ }
+ }
+
+ if (arg_split_mode == JOURNAL_WRITE_SPLIT_HOST
diff --git a/SOURCES/0708-artificially-serialize-building-of-.policy-files.patch b/SOURCES/0708-artificially-serialize-building-of-.policy-files.patch
new file mode 100644
index 0000000..e5a278c
--- /dev/null
+++ b/SOURCES/0708-artificially-serialize-building-of-.policy-files.patch
@@ -0,0 +1,34 @@
+From ce45cf8651fabe48a75d8773dbdbf68f3dc77137 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 15 Jan 2019 19:05:41 +0100
+Subject: [PATCH] artificially serialize building of .policy files
+
+This avoids concurrent write access to translation cache by
+intltool-merge.
+
+Resolves: #1272485
+---
+ Makefile.am | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 40ebbe98ee..995c421b8b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -653,6 +653,16 @@ dist_doc_DATA = \
+
+ @INTLTOOL_POLICY_RULE@
+
++# Force serial build of policy files
++# Note that this ignores the fact that almost all of these files are only built optionally,
++# but a change in configure options is extremely unlikely at this point.
++src/core/org.freedesktop.systemd1.policy : src/hostname/org.freedesktop.hostname1.policy
++src/hostname/org.freedesktop.hostname1.policy : src/import/org.freedesktop.import1.policy
++src/import/org.freedesktop.import1.policy : src/locale/org.freedesktop.locale1.policy
++src/locale/org.freedesktop.locale1.policy : src/login/org.freedesktop.login1.policy
++src/login/org.freedesktop.login1.policy : src/machine/org.freedesktop.machine1.policy
++src/machine/org.freedesktop.machine1.policy : src/timedate/org.freedesktop.timedate1.policy
++
+ # ------------------------------------------------------------------------------
+
+ MANPAGES =
diff --git a/SOURCES/0709-tests-run-udevadm-settle-after-fdisk.patch b/SOURCES/0709-tests-run-udevadm-settle-after-fdisk.patch
new file mode 100644
index 0000000..bcacebe
--- /dev/null
+++ b/SOURCES/0709-tests-run-udevadm-settle-after-fdisk.patch
@@ -0,0 +1,52 @@
+From b1759ccd2f83bf75871333524cffb4c5b312ea93 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Fri, 15 Feb 2019 18:13:22 +0100
+Subject: [PATCH] tests: run `udevadm settle` after `fdisk`
+
+This makes the script wait for the newly created partition to
+show up before trying to put a filesystem on it, which should
+prevent the tests from failing with the following error:
+```
+Command (m for help): Building a new DOS disklabel with disk identifier 0x614565d4.
+
+Command (m for help): Partition type:
+ p primary (0 primary, 0 extended, 4 free)
+ e extended
+Select (default p): Partition number (1-4, default 1): First sector (2048-819199, default 2048): Using default value 2048
+Last sector, +sectors or +size{K,M,G} (2048-819199, default 819199): Partition 1 of type Linux and of size 290 MiB is set
+
+Command (m for help): Partition type:
+ p primary (1 primary, 0 extended, 3 free)
+ e extended
+Select (default p): Partition number (2-4, default 2): First sector (595968-819199, default 595968): Using default value 595968
+Last sector, +sectors or +size{K,M,G} (595968-819199, default 819199): Partition 2 of type Linux and of size 50 MiB is set
+
+Command (m for help): The partition table has been altered!
+
+Calling ioctl() to re-read partition table.
+Syncing disks.
+/dev/loop1p1: No such file or directory
+Usage: mkfs.xfs
+<snip>
+mount: /dev/loop1p1 is write-protected, mounting read-only
+mount: unknown filesystem type '(null)'
+```
+
+Based on 053edc5b04d8130a344eb1746f4b14a9823ac3ad
+---
+ test/test-functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-functions b/test/test-functions
+index def16d3277..78e725d5b9 100644
+--- a/test/test-functions
++++ b/test/test-functions
+@@ -160,7 +160,7 @@ p
+ w
+ q
+ EOF
+- partprobe "$LOOPDEV"
++ udevadm settle
+ mkfs.xfs -L systemd "${LOOPDEV}p1"
+ }
+
diff --git a/SOURCES/0710-cryptsetup-add-support-for-sector-size-option-9936.patch b/SOURCES/0710-cryptsetup-add-support-for-sector-size-option-9936.patch
new file mode 100644
index 0000000..a759802
--- /dev/null
+++ b/SOURCES/0710-cryptsetup-add-support-for-sector-size-option-9936.patch
@@ -0,0 +1,119 @@
+From 063a7a0071a0e6b01426088c8003e24e160937d1 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <xnox@ubuntu.com>
+Date: Wed, 29 Aug 2018 15:38:09 +0100
+Subject: [PATCH] cryptsetup: add support for sector-size= option (#9936)
+
+Bug-Ubuntu: https://launchpad.net/bugs/1776626
+
+Closes #8881.
+
+(cherry picked from commit a9fc640671ef60ac949f1ace6fa687ff242fc233)
+
+Resolves: #1571801
+---
+ configure.ac | 6 ++++++
+ man/crypttab.xml | 9 +++++++++
+ src/cryptsetup/cryptsetup.c | 35 ++++++++++++++++++++++++++++++++++-
+ 3 files changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee147e28eb..19d42602c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -832,6 +832,12 @@ if test "x$enable_libcryptsetup" != "xno"; then
+ if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
+ AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
+ fi
++ AC_CHECK_MEMBER(
++ [struct crypt_params_plain.sector_size],
++ [AC_DEFINE([HAVE_LIBCRYPTSETUP_SECTOR_SIZE], [1], [Define if libcryptsetup supports sector_size param])],
++ [],
++ [#include <libcryptsetup.h>]
++ )
+ fi
+ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
+
+diff --git a/man/crypttab.xml b/man/crypttab.xml
+index e4ecab3dcb..df75007072 100644
+--- a/man/crypttab.xml
++++ b/man/crypttab.xml
+@@ -248,6 +248,15 @@
+ option.</para></listitem>
+ </varlistentry>
+
++ <varlistentry>
++ <term><option>sector-size=</option></term>
++
++ <listitem><para>Specifies the sector size in bytes. See
++ <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
++ for possible values and the default value of this
++ option.</para></listitem>
++ </varlistentry>
++
+ <varlistentry>
+ <term><option>swap</option></term>
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index 528c36c48b..fd8b9ba9ec 100644
+--- a/src/cryptsetup/cryptsetup.c
++++ b/src/cryptsetup/cryptsetup.c
+@@ -43,10 +43,14 @@
+
+ /* internal helper */
+ #define ANY_LUKS "LUKS"
++/* as in src/cryptsetup.h */
++#define CRYPT_SECTOR_SIZE 512
++#define CRYPT_MAX_SECTOR_SIZE 4096
+
+ static const char *arg_type = NULL; /* ANY_LUKS, CRYPT_LUKS1, CRYPT_LUKS2, CRYPT_TCRYPT or CRYPT_PLAIN */
+ static char *arg_cipher = NULL;
+ static unsigned arg_key_size = 0;
++static unsigned arg_sector_size = CRYPT_SECTOR_SIZE;
+ static int arg_key_slot = CRYPT_ANY_SLOT;
+ static unsigned arg_keyfile_size = 0;
+ static unsigned arg_keyfile_offset = 0;
+@@ -104,6 +108,31 @@ static int parse_one_option(const char *option) {
+
+ arg_key_size /= 8;
+
++ } else if (startswith(option, "sector-size=")) {
++
++#if HAVE_LIBCRYPTSETUP_SECTOR_SIZE
++ int r;
++
++ r = safe_atou(option+12, &arg_sector_size);
++ if (r < 0) {
++ log_error_errno(r, "Failed to parse %s, ignoring: %m", option);
++ return 0;
++ }
++
++ if (arg_sector_size % 2) {
++ log_error("sector-size= not a multiple of 2, ignoring.");
++ return 0;
++ }
++
++ if (arg_sector_size < CRYPT_SECTOR_SIZE || arg_sector_size > CRYPT_MAX_SECTOR_SIZE) {
++ log_error("sector-size= is outside of %u and %u, ignoring.", CRYPT_SECTOR_SIZE, CRYPT_MAX_SECTOR_SIZE);
++ return 0;
++ }
++#else
++ log_error("sector-size= is not supported, compiled with old libcryptsetup.");
++ return 0;
++#endif
++
+ } else if (startswith(option, "key-slot=")) {
+
+ arg_type = ANY_LUKS;
+@@ -450,7 +479,11 @@ static int attach_luks_or_plain(struct crypt_device *cd,
+ }
+
+ if ((!arg_type && r < 0) || streq_ptr(arg_type, CRYPT_PLAIN)) {
+- struct crypt_params_plain params = {};
++ struct crypt_params_plain params = {
++#if HAVE_LIBCRYPTSETUP_SECTOR_SIZE
++ .sector_size = arg_sector_size,
++#endif
++ };
+ const char *cipher, *cipher_mode;
+ _cleanup_free_ char *truncated_cipher = NULL;
+
diff --git a/SOURCES/0711-cryptsetup-do-not-define-arg_sector_size-if-libgcryp.patch b/SOURCES/0711-cryptsetup-do-not-define-arg_sector_size-if-libgcryp.patch
new file mode 100644
index 0000000..a7e0e1a
--- /dev/null
+++ b/SOURCES/0711-cryptsetup-do-not-define-arg_sector_size-if-libgcryp.patch
@@ -0,0 +1,29 @@
+From 12151731716c21b8e58f96faff7395454ae609b0 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 1 Sep 2018 23:47:46 +0900
+Subject: [PATCH] cryptsetup: do not define arg_sector_size if libgcrypt is
+ v1.x (#9990)
+
+Follow-up for #9936.
+
+(cherry picked from commit 645461f0cf6ec91e5b0b571559fb4cc4898192bc)
+
+Related: #1571801
+---
+ src/cryptsetup/cryptsetup.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index fd8b9ba9ec..8c69e428a3 100644
+--- a/src/cryptsetup/cryptsetup.c
++++ b/src/cryptsetup/cryptsetup.c
+@@ -50,7 +50,9 @@
+ static const char *arg_type = NULL; /* ANY_LUKS, CRYPT_LUKS1, CRYPT_LUKS2, CRYPT_TCRYPT or CRYPT_PLAIN */
+ static char *arg_cipher = NULL;
+ static unsigned arg_key_size = 0;
++#if HAVE_LIBCRYPTSETUP_SECTOR_SIZE
+ static unsigned arg_sector_size = CRYPT_SECTOR_SIZE;
++#endif
+ static int arg_key_slot = CRYPT_ANY_SLOT;
+ static unsigned arg_keyfile_size = 0;
+ static unsigned arg_keyfile_offset = 0;
diff --git a/SOURCES/0712-journal-fix-syslog_parse_identifier.patch b/SOURCES/0712-journal-fix-syslog_parse_identifier.patch
new file mode 100644
index 0000000..09fa954
--- /dev/null
+++ b/SOURCES/0712-journal-fix-syslog_parse_identifier.patch
@@ -0,0 +1,68 @@
+From abb072100e72c07c5cf98b02f5b1a15a48f4b496 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Fri, 4 Jan 2019 15:33:43 +0100
+Subject: [PATCH] journal: fix syslog_parse_identifier()
+
+Fixes #9829.
+
+(cherry-picked from commit a6aadf4ae0bae185dc4c414d492a4a781c80ffe5)
+
+Resolves: #1657794
+
+[msekleta: Fix for CVE-2018-16866]
+---
+ src/journal/journald-syslog.c | 6 +++---
+ src/journal/test-journal-syslog.c | 8 +++++++-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
+index 01d2bf69f4..3ea5d79c3a 100644
+--- a/src/journal/journald-syslog.c
++++ b/src/journal/journald-syslog.c
+@@ -209,7 +209,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
+ e = l;
+ l--;
+
+- if (p[l-1] == ']') {
++ if (l > 0 && p[l-1] == ']') {
+ size_t k = l-1;
+
+ for (;;) {
+@@ -234,8 +234,8 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
+ if (t)
+ *identifier = t;
+
+- if (strchr(WHITESPACE, p[e]))
+- e++;
++ e += strspn(p + e, WHITESPACE);
++
+ *buf = p + e;
+ return e;
+ }
+diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
+index c99ca0654b..f56a813774 100644
+--- a/src/journal/test-journal-syslog.c
++++ b/src/journal/test-journal-syslog.c
+@@ -22,7 +22,7 @@
+ #include "journald-syslog.h"
+ #include "macro.h"
+
+-static void test_syslog_parse_identifier(const char* str,
++static void test_syslog_parse_identifier(const char *str,
+ const char *ident, const char*pid, int ret) {
+ const char *buf = str;
+ _cleanup_free_ char *ident2 = NULL, *pid2 = NULL;
+@@ -38,7 +38,13 @@ static void test_syslog_parse_identifier(const char* str,
+ int main(void) {
+ test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", 11);
+ test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 6);
++ test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 7);
+ test_syslog_parse_identifier("pidu xxx", NULL, NULL, 0);
++ test_syslog_parse_identifier(":", "", NULL, 1);
++ test_syslog_parse_identifier(": ", "", NULL, 3);
++ test_syslog_parse_identifier("pidu:", "pidu", NULL, 5);
++ test_syslog_parse_identifier("pidu: ", "pidu", NULL, 6);
++ test_syslog_parse_identifier("pidu : ", NULL, NULL, 0);
+
+ return 0;
+ }
diff --git a/SOURCES/0713-journal-do-not-remove-multiple-spaces-after-identifi.patch b/SOURCES/0713-journal-do-not-remove-multiple-spaces-after-identifi.patch
new file mode 100644
index 0000000..d55522e
--- /dev/null
+++ b/SOURCES/0713-journal-do-not-remove-multiple-spaces-after-identifi.patch
@@ -0,0 +1,78 @@
+From 0adbe0fe7f1cb8703904c85fa095db8070503c04 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Fri, 10 Aug 2018 11:07:54 +0900
+Subject: [PATCH] journal: do not remove multiple spaces after identifier in
+ syslog message
+
+Single space is used as separator.
+C.f. discussions in #156.
+
+Fixes #9839 introduced by a6aadf4ae0bae185dc4c414d492a4a781c80ffe5.
+
+(cherry-picked from commit 8595102d3ddde6d25c282f965573a6de34ab4421)
+Related: #1657794
+---
+ src/journal/journald-syslog.c | 4 +++-
+ src/journal/test-journal-syslog.c | 24 ++++++++++++++----------
+ 2 files changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
+index 3ea5d79c3a..1a9db59a0f 100644
+--- a/src/journal/journald-syslog.c
++++ b/src/journal/journald-syslog.c
+@@ -234,7 +234,9 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
+ if (t)
+ *identifier = t;
+
+- e += strspn(p + e, WHITESPACE);
++ /* Single space is used as separator */
++ if (p[e] != '\0' && strchr(WHITESPACE, p[e]))
++ e++;
+
+ *buf = p + e;
+ return e;
+diff --git a/src/journal/test-journal-syslog.c b/src/journal/test-journal-syslog.c
+index f56a813774..d4bd8607d3 100644
+--- a/src/journal/test-journal-syslog.c
++++ b/src/journal/test-journal-syslog.c
+@@ -23,7 +23,7 @@
+ #include "macro.h"
+
+ static void test_syslog_parse_identifier(const char *str,
+- const char *ident, const char*pid, int ret) {
++ const char *ident, const char *pid, const char *rest, int ret) {
+ const char *buf = str;
+ _cleanup_free_ char *ident2 = NULL, *pid2 = NULL;
+ int ret2;
+@@ -33,18 +33,22 @@ static void test_syslog_parse_identifier(const char *str,
+ assert_se(ret == ret2);
+ assert_se(ident == ident2 || streq_ptr(ident, ident2));
+ assert_se(pid == pid2 || streq_ptr(pid, pid2));
++ assert_se(streq(buf, rest));
+ }
+
+ int main(void) {
+- test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", 11);
+- test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 6);
+- test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, 7);
+- test_syslog_parse_identifier("pidu xxx", NULL, NULL, 0);
+- test_syslog_parse_identifier(":", "", NULL, 1);
+- test_syslog_parse_identifier(": ", "", NULL, 3);
+- test_syslog_parse_identifier("pidu:", "pidu", NULL, 5);
+- test_syslog_parse_identifier("pidu: ", "pidu", NULL, 6);
+- test_syslog_parse_identifier("pidu : ", NULL, NULL, 0);
++ test_syslog_parse_identifier("pidu[111]: xxx", "pidu", "111", "xxx", 11);
++ test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, "xxx", 6);
++ test_syslog_parse_identifier("pidu: xxx", "pidu", NULL, " xxx", 6);
++ test_syslog_parse_identifier("pidu xxx", NULL, NULL, "pidu xxx", 0);
++ test_syslog_parse_identifier(" pidu xxx", NULL, NULL, " pidu xxx", 0);
++ test_syslog_parse_identifier("", NULL, NULL, "", 0);
++ test_syslog_parse_identifier(" ", NULL, NULL, " ", 0);
++ test_syslog_parse_identifier(":", "", NULL, "", 1);
++ test_syslog_parse_identifier(": ", "", NULL, " ", 2);
++ test_syslog_parse_identifier("pidu:", "pidu", NULL, "", 5);
++ test_syslog_parse_identifier("pidu: ", "pidu", NULL, "", 6);
++ test_syslog_parse_identifier("pidu : ", NULL, NULL, "pidu : ", 0);
+
+ return 0;
+ }
diff --git a/SOURCES/0714-build-sys-add-check-for-gperf-lookup-function-signat.patch b/SOURCES/0714-build-sys-add-check-for-gperf-lookup-function-signat.patch
new file mode 100644
index 0000000..b53899d
--- /dev/null
+++ b/SOURCES/0714-build-sys-add-check-for-gperf-lookup-function-signat.patch
@@ -0,0 +1,258 @@
+From 4365589534812dc2dc4d015f3459c82a440ec44f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Tue, 10 Jan 2017 02:39:05 -0500
+Subject: [PATCH] build-sys: add check for gperf lookup function signature
+ (#5055)
+
+gperf-3.1 generates lookup functions that take a size_t length
+parameter instead of unsigned int. Test for this at configure time.
+
+Fixes: https://github.com/systemd/systemd/issues/5039
+(cherry picked from commit c9f7b4d356a453a01aa77a6bb74ca7ef49732c08)
+---
+ configure.ac | 22 ++++++++++++++++++++++
+ src/core/load-fragment.h | 2 +-
+ src/journal/journald-server.h | 2 +-
+ src/login/logind.h | 2 +-
+ src/network/networkd-netdev.h | 2 +-
+ src/network/networkd.h | 2 +-
+ src/resolve/dns-type.c | 2 +-
+ src/resolve/resolved-conf.h | 2 +-
+ src/shared/af-list.c | 2 +-
+ src/shared/arphrd-list.c | 2 +-
+ src/shared/cap-list.c | 2 +-
+ src/shared/conf-parser.h | 2 +-
+ src/shared/errno-list.c | 2 +-
+ src/timesync/timesyncd-conf.h | 2 +-
+ src/udev/net/link-config.h | 2 +-
+ src/udev/udev-builtin-keyboard.c | 2 +-
+ 16 files changed, 37 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19d42602c9..f885853f49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -237,6 +237,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
+ #include <sys/resource.h>
+ ])
+
++GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
++
++AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([
++ #include <string.h>
++ const char * in_word_set(const char *, size_t);
++ $GPERF_TEST]
++ )],
++ [GPERF_LEN_TYPE=size_t],
++ [AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([
++ #include <string.h>
++ const char * in_word_set(const char *, unsigned);
++ $GPERF_TEST]
++ )],
++ [GPERF_LEN_TYPE=unsigned],
++ [AC_MSG_ERROR([** unable to determine gperf len type])]
++ )]
++)
++
++AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
++
+ # ------------------------------------------------------------------------------
+ # we use python to build the man page index, and for systemd-python
+ have_python=no
+diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
+index 8d334f2c86..4bd286c11b 100644
+--- a/src/core/load-fragment.h
++++ b/src/core/load-fragment.h
+@@ -112,7 +112,7 @@ int config_parse_protect_system(const char* unit, const char *filename, unsigned
+ int config_parse_bus_name(const char* unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+ /* gperf prototypes */
+-const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+ extern const char load_fragment_gperf_nulstr[];
+
+ typedef enum Disabled {
+diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
+index f046fde834..e74c65dbec 100644
+--- a/src/journal/journald-server.h
++++ b/src/journal/journald-server.h
+@@ -164,7 +164,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne
+ void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,4);
+
+ /* gperf lookup function */
+-const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_line_max(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/login/logind.h b/src/login/logind.h
+index 8503eb24dd..29fb1b3082 100644
+--- a/src/login/logind.h
++++ b/src/login/logind.h
+@@ -187,7 +187,7 @@ int manager_unit_is_active(Manager *manager, const char *unit);
+ int manager_job_is_active(Manager *manager, const char *path);
+
+ /* gperf lookup function */
+-const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ int manager_watch_busname(Manager *manager, const char *name);
+ void manager_drop_busname(Manager *manager, const char *name);
+diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
+index 3756b1e5a7..fb44f38e64 100644
+--- a/src/network/networkd-netdev.h
++++ b/src/network/networkd-netdev.h
+@@ -199,7 +199,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_;
+ int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+ /* gperf */
+-const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ /* Macros which append INTERFACE= to the message */
+
+diff --git a/src/network/networkd.h b/src/network/networkd.h
+index bdb2f20e2f..8902bbce6b 100644
+--- a/src/network/networkd.h
++++ b/src/network/networkd.h
+@@ -328,7 +328,7 @@ int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char
+ int network_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
+
+ /* gperf */
+-const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ /* Route */
+ int route_new_static(Network *network, unsigned section, Route **ret);
+diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
+index a3e740896f..e409df974a 100644
+--- a/src/resolve/dns-type.c
++++ b/src/resolve/dns-type.c
+@@ -27,7 +27,7 @@ typedef const struct {
+ } dns_type;
+
+ static const struct dns_type_name *
+-lookup_dns_type (register const char *str, register unsigned int len);
++lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len);
+
+ #include "dns_type-from-name.h"
+ #include "dns_type-to-name.h"
+diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
+index b3dbea7b6b..17b0960594 100644
+--- a/src/resolve/resolved-conf.h
++++ b/src/resolve/resolved-conf.h
+@@ -26,7 +26,7 @@
+ int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string);
+ int manager_parse_config_file(Manager *m);
+
+-const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ int config_parse_dnsv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_support(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/shared/af-list.c b/src/shared/af-list.c
+index f396115a34..cbdec82240 100644
+--- a/src/shared/af-list.c
++++ b/src/shared/af-list.c
+@@ -25,7 +25,7 @@
+ #include "util.h"
+ #include "af-list.h"
+
+-static const struct af_name* lookup_af(register const char *str, register unsigned int len);
++static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
+
+ #include "af-to-name.h"
+ #include "af-from-name.h"
+diff --git a/src/shared/arphrd-list.c b/src/shared/arphrd-list.c
+index 6e113eff7a..588956c56f 100644
+--- a/src/shared/arphrd-list.c
++++ b/src/shared/arphrd-list.c
+@@ -26,7 +26,7 @@
+ #include "util.h"
+ #include "arphrd-list.h"
+
+-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
++static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
+
+ #include "arphrd-to-name.h"
+ #include "arphrd-from-name.h"
+diff --git a/src/shared/cap-list.c b/src/shared/cap-list.c
+index 8033e8c7b2..aa23f5e13c 100644
+--- a/src/shared/cap-list.c
++++ b/src/shared/cap-list.c
+@@ -26,7 +26,7 @@
+ #include "cap-list.h"
+ #include "missing.h"
+
+-static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
++static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
+
+ #include "cap-to-name.h"
+ #include "cap-from-name.h"
+diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
+index 7a2f855f9f..895f6f6a38 100644
+--- a/src/shared/conf-parser.h
++++ b/src/shared/conf-parser.h
+@@ -61,7 +61,7 @@ typedef struct ConfigPerfItem {
+ } ConfigPerfItem;
+
+ /* Prototype for a low-level gperf lookup function */
+-typedef const ConfigPerfItem* (*ConfigPerfItemLookup)(const char *section_and_lvalue, unsigned length);
++typedef const ConfigPerfItem* (*ConfigPerfItemLookup)(const char *section_and_lvalue, GPERF_LEN_TYPE length);
+
+ /* Prototype for a generic high-level lookup function */
+ typedef int (*ConfigItemLookup)(
+diff --git a/src/shared/errno-list.c b/src/shared/errno-list.c
+index c63296f292..99b0c689bf 100644
+--- a/src/shared/errno-list.c
++++ b/src/shared/errno-list.c
+@@ -26,7 +26,7 @@
+ #include "errno-list.h"
+
+ static const struct errno_name* lookup_errno(register const char *str,
+- register unsigned int len);
++ register GPERF_LEN_TYPE len);
+
+ #include "errno-to-name.h"
+ #include "errno-from-name.h"
+diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
+index 56466fe462..a776475ea9 100644
+--- a/src/timesync/timesyncd-conf.h
++++ b/src/timesync/timesyncd-conf.h
+@@ -25,7 +25,7 @@
+
+ #include "timesyncd-manager.h"
+
+-const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ int manager_parse_server_string(Manager *m, ServerType type, const char *string);
+
+diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
+index f2e9174887..af01989919 100644
+--- a/src/udev/net/link-config.h
++++ b/src/udev/net/link-config.h
+@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_;
+ MACPolicy mac_policy_from_string(const char *p) _pure_;
+
+ /* gperf lookup function */
+-const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
++const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
+
+ int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
+index eaa21abf60..7d30482b13 100644
+--- a/src/udev/udev-builtin-keyboard.c
++++ b/src/udev/udev-builtin-keyboard.c
+@@ -28,7 +28,7 @@
+
+ #include "udev.h"
+
+-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
++static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
+ #include "keyboard-keys-from-name.h"
+ #include "keyboard-keys-to-name.h"
+
diff --git a/SOURCES/0715-lgtm-add-explicit-configuration-for-C-extraction.patch b/SOURCES/0715-lgtm-add-explicit-configuration-for-C-extraction.patch
new file mode 100644
index 0000000..cf16bdc
--- /dev/null
+++ b/SOURCES/0715-lgtm-add-explicit-configuration-for-C-extraction.patch
@@ -0,0 +1,25 @@
+From 1cc8d043c32d2616faea1de55bb5bf3555bc3ca0 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Fri, 22 Feb 2019 17:24:57 +0100
+Subject: [PATCH] lgtm: add explicit configuration for C extraction
+
+---
+ .lgtm.yml | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 .lgtm.yml
+
+diff --git a/.lgtm.yml b/.lgtm.yml
+new file mode 100644
+index 0000000000..0c8304d689
+--- /dev/null
++++ b/.lgtm.yml
+@@ -0,0 +1,9 @@
++extraction:
++ cpp:
++ configure:
++ command:
++ - ./autogen.sh
++ - ./configure --disable-timesyncd --disable-kdbus --disable-terminal
++ --disable-gtk-doc --disable-manpages --disable-gtk-doc-html
++ --enable-compat-libs --disable-sysusers --disable-ldconfig
++ --enable-lz4 --disable-microhttpd
diff --git a/SOURCES/0716-tmpfiles-change-ownership-of-symlinks-too.patch b/SOURCES/0716-tmpfiles-change-ownership-of-symlinks-too.patch
new file mode 100644
index 0000000..cde013d
--- /dev/null
+++ b/SOURCES/0716-tmpfiles-change-ownership-of-symlinks-too.patch
@@ -0,0 +1,108 @@
+From bac7488e06e379628653fb2f3ece0a30414ff84e Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 22 Jan 2018 21:03:53 +0100
+Subject: [PATCH] tmpfiles: change ownership of symlinks too
+
+Ownership is supported for symlinks, too, only file modes are not.
+Support that too.
+
+Fixes: #7509
+(cherry picked from commit 51207ca134716a0dee5fd763a6c39204be849eb1)
+
+Resolves: #1620110
+---
+ src/shared/macro.h | 7 +++++++
+ src/tmpfiles/tmpfiles.c | 41 +++++++++++++++++++++--------------------
+ 2 files changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/shared/macro.h b/src/shared/macro.h
+index 7a57f4e5b1..26df270d51 100644
+--- a/src/shared/macro.h
++++ b/src/shared/macro.h
+@@ -125,6 +125,13 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
+
+ #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
+
++/*
++ * STRLEN - return the length of a string literal, minus the trailing NUL byte.
++ * Contrary to strlen(), this is a constant expression.
++ * @x: a string literal.
++ */
++#define STRLEN(x) (sizeof(""x"") - 1)
++
+ /*
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr: the pointer to the member.
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 0b17b5908e..663f6c8b2d 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -591,6 +591,7 @@ finish:
+ }
+
+ static int path_set_perms(Item *i, const char *path) {
++ char fn[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
+ _cleanup_close_ int fd = -1;
+ struct stat st;
+
+@@ -624,14 +625,12 @@ static int path_set_perms(Item *i, const char *path) {
+ if (i->type == EMPTY_DIRECTORY && !S_ISDIR(st.st_mode))
+ return log_error_errno(EEXIST, "'%s' already exists and is not a directory. ", path);
+
+- if (S_ISLNK(st.st_mode))
+- log_debug("Skipping mode an owner fix for symlink %s.", path);
+- else {
+- char fn[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
+- xsprintf(fn, "/proc/self/fd/%i", fd);
++ xsprintf(fn, "/proc/self/fd/%i", fd);
+
+- /* not using i->path directly because it may be a glob */
+- if (i->mode_set) {
++ if (i->mode_set) {
++ if (S_ISLNK(st.st_mode))
++ log_debug("Skipping mode fix for symlink %s.", path);
++ else {
+ mode_t m = i->mode;
+
+ if (i->mask_perms) {
+@@ -646,25 +645,27 @@ static int path_set_perms(Item *i, const char *path) {
+ }
+
+ if (m == (st.st_mode & 07777))
+- log_debug("\"%s\" has right mode %o", path, st.st_mode);
++ log_debug("\"%s\" has correct mode %o already.", path, st.st_mode);
+ else {
+- log_debug("chmod \"%s\" to mode %o", path, m);
++ log_debug("Changing \"%s\" to mode %o.", path, m);
++
+ if (chmod(fn, m) < 0)
+ return log_error_errno(errno, "chmod(%s) failed: %m", path);
+ }
+ }
++ }
+
+- if ((i->uid != st.st_uid || i->gid != st.st_gid) &&
+- (i->uid_set || i->gid_set)) {
+- log_debug("chown \"%s\" to "UID_FMT"."GID_FMT,
+- path,
+- i->uid_set ? i->uid : UID_INVALID,
+- i->gid_set ? i->gid : GID_INVALID);
+- if (chown(fn,
+- i->uid_set ? i->uid : UID_INVALID,
+- i->gid_set ? i->gid : GID_INVALID) < 0)
+- return log_error_errno(errno, "chown(%s) failed: %m", path);
+- }
++ if ((i->uid != st.st_uid || i->gid != st.st_gid) &&
++ (i->uid_set || i->gid_set)) {
++ log_debug("Changing \"%s\" to owner "UID_FMT":"GID_FMT,
++ path,
++ i->uid_set ? i->uid : UID_INVALID,
++ i->gid_set ? i->gid : GID_INVALID);
++
++ if (chown(fn,
++ i->uid_set ? i->uid : UID_INVALID,
++ i->gid_set ? i->gid : GID_INVALID) < 0)
++ return log_error_errno(errno, "chown() of %s via %s failed: %m", path, fn);
+ }
+
+ fd = safe_close(fd);
diff --git a/SOURCES/0717-tmpfiles-fix-check-for-figuring-out-whether-to-call-.patch b/SOURCES/0717-tmpfiles-fix-check-for-figuring-out-whether-to-call-.patch
new file mode 100644
index 0000000..8e0f74f
--- /dev/null
+++ b/SOURCES/0717-tmpfiles-fix-check-for-figuring-out-whether-to-call-.patch
@@ -0,0 +1,29 @@
+From a781c22627a108d2fdcfaf428f6fefca122636a9 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 22 Jan 2018 21:11:04 +0100
+Subject: [PATCH] tmpfiles: fix check for figuring out whether to call chmod()
+
+No need to call chown() if everything matches already.
+
+(cherry picked from commit dc2335669afddc767eea2757f8d7dfc7a8f927fa)
+
+Related: #1620110
+---
+ src/tmpfiles/tmpfiles.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index 663f6c8b2d..1adcb74e68 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -655,8 +655,8 @@ static int path_set_perms(Item *i, const char *path) {
+ }
+ }
+
+- if ((i->uid != st.st_uid || i->gid != st.st_gid) &&
+- (i->uid_set || i->gid_set)) {
++ if ((i->uid_set && i->uid != st.st_uid) ||
++ (i->gid_set && i->gid != st.st_gid)) {
+ log_debug("Changing \"%s\" to owner "UID_FMT":"GID_FMT,
+ path,
+ i->uid_set ? i->uid : UID_INVALID,
diff --git a/SOURCES/0718-travis-drop-the-RHEL-8-manager-from-the-RHEL-7-branc.patch b/SOURCES/0718-travis-drop-the-RHEL-8-manager-from-the-RHEL-7-branc.patch
new file mode 100644
index 0000000..f0e6f56
--- /dev/null
+++ b/SOURCES/0718-travis-drop-the-RHEL-8-manager-from-the-RHEL-7-branc.patch
@@ -0,0 +1,153 @@
+From b73e89404a6caed7c14d51ec907c814c673ddf46 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 4 Mar 2019 10:26:03 +0100
+Subject: [PATCH] travis: drop the RHEL 8 manager from the RHEL 7 branch
+
+The original plan was to keep the managers synced between
+RHEL 7 and RHEL 8 branches, but in the end it doesn't make
+much sense.
+---
+ ci/travis-centos-rhel8.sh | 134 --------------------------------------
+ 1 file changed, 134 deletions(-)
+ delete mode 100755 ci/travis-centos-rhel8.sh
+
+diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh
+deleted file mode 100755
+index 1f72d984e0..0000000000
+--- a/ci/travis-centos-rhel8.sh
++++ /dev/null
+@@ -1,134 +0,0 @@
+-#!/bin/bash
+-
+-# Run this script from the root of the systemd's git repository
+-# or set REPO_ROOT to a correct path.
+-#
+-# Example execution on Fedora:
+-# dnf install docker
+-# systemctl start docker
+-# export CONT_NAME="my-fancy-container"
+-# ci/travis-centos.sh SETUP RUN CLEANUP
+-
+-PHASES=(${@:-SETUP RUN CLEANUP})
+-CENTOS_RELEASE="${CENTOS_RELEASE:-latest}"
+-CONT_NAME="${CONT_NAME:-centos-$CENTOS_RELEASE-$RANDOM}"
+-DOCKER_EXEC="${DOCKER_EXEC:-docker exec -it $CONT_NAME}"
+-DOCKER_RUN="${DOCKER_RUN:-docker run}"
+-REPO_ROOT="${REPO_ROOT:-$PWD}"
+-ADDITIONAL_DEPS=(systemd-ci-environment libidn2-devel python-lxml python36 ninja-build libasan net-tools strace nc busybox e2fsprogs quota dnsmasq)
+-# Repo with additional depencencies to compile newer systemd on CentOS 7
+-COPR_REPO="https://copr.fedorainfracloud.org/coprs/mrc0mmand/systemd-centos-ci/repo/epel-7/mrc0mmand-systemd-centos-ci-epel-7.repo"
+-COPR_REPO_PATH="/etc/yum.repos.d/${COPR_REPO##*/}"
+-
+-function info() {
+- echo -e "\033[33;1m$1\033[0m"
+-}
+-
+-set -e
+-
+-source "$(dirname $0)/travis_wait.bash"
+-
+-for phase in "${PHASES[@]}"; do
+- case $phase in
+- SETUP)
+- info "Setup phase"
+- info "Using Travis $CENTOS_RELEASE"
+- # Pull a Docker image and start a new container
+- docker pull centos:$CENTOS_RELEASE
+- info "Starting container $CONT_NAME"
+- $DOCKER_RUN -v $REPO_ROOT:/build:rw \
+- -w /build --privileged=true --name $CONT_NAME \
+- -dit --net=host centos:$CENTOS_RELEASE /sbin/init
+- # Beautiful workaround for Fedora's version of Docker
+- sleep 1
+- $DOCKER_EXEC yum makecache
+- $DOCKER_EXEC curl "$COPR_REPO" -o "$COPR_REPO_PATH"
+- $DOCKER_EXEC yum -q -y install epel-release yum-utils
+- $DOCKER_EXEC yum-config-manager -q --enable epel
+- $DOCKER_EXEC yum -y upgrade
+- # Install necessary build/test requirements
+- $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
+- $DOCKER_EXEC python3.6 -m ensurepip
+- $DOCKER_EXEC python3.6 -m pip install meson
+- # Create necessary symlinks
+- $DOCKER_EXEC ln --force -s /usr/bin/python3.6 /usr/bin/python3
+- $DOCKER_EXEC ln --force -s /usr/bin/ninja-build /usr/bin/ninja
+- ;;
+- RUN)
+- info "Run phase"
+- # Build systemd
+- CONFIGURE_OPTS=(
+- # RHEL8 options
+- -Dsysvinit-path=/etc/rc.d/init.d
+- -Drc-local=/etc/rc.d/rc.local
+- -Ddns-servers=''
+- -Ddev-kvm-mode=0666
+- -Dkmod=true
+- -Dxkbcommon=true
+- -Dblkid=true
+- -Dseccomp=true
+- -Dima=true
+- -Dselinux=true
+- -Dapparmor=false
+- -Dpolkit=true
+- -Dxz=true
+- -Dzlib=true
+- -Dbzip2=true
+- -Dlz4=true
+- -Dpam=true
+- -Dacl=true
+- -Dsmack=true
+- -Dgcrypt=true
+- -Daudit=true
+- -Delfutils=true
+- -Dlibcryptsetup=true
+- -Delfutils=true
+- -Dqrencode=false
+- -Dgnutls=true
+- -Dmicrohttpd=true
+- -Dlibidn2=true
+- -Dlibiptc=true
+- -Dlibcurl=true
+- -Defi=true
+- -Dtpm=true
+- -Dhwdb=true
+- -Dsysusers=true
+- -Ddefault-kill-user-processes=false
+- -Dtests=unsafe
+- -Dinstall-tests=true
+- -Dtty-gid=5
+- -Dusers-gid=100
+- -Dnobody-user=nobody
+- -Dnobody-group=nobody
+- -Dsplit-usr=false
+- -Dsplit-bin=true
+- -Db_lto=false
+- -Dnetworkd=false
+- -Dtimesyncd=false
+- -Ddefault-hierarchy=legacy
+- # Custom options
+- -Dslow-tests=true
+- -Dtests=unsafe
+- -Dinstall-tests=true
+- )
+- docker exec -it -e CFLAGS='-g -O0 -ftrapv' $CONT_NAME meson build "${CONFIGURE_OPTS[@]}"
+- $DOCKER_EXEC ninja -v -C build
+- # Let's install the new systemd and "reboot" the container to avoid
+- # unexpected fails due to incompatibilities with older systemd
+- $DOCKER_EXEC ninja -C build install
+- docker restart $CONT_NAME
+- # "Mask" the udev-test.pl, as it requires newer version of systemd-detect-virt
+- # and it's pointless to run it on a VM in a Docker container...
+- echo -ne "#!/usr/bin/perl\nexit(0);\n" > "test/udev-test.pl"
+- $DOCKER_EXEC ninja -C build test
+- ;;
+- CLEANUP)
+- info "Cleanup phase"
+- docker stop $CONT_NAME
+- docker rm -f $CONT_NAME
+- ;;
+- *)
+- echo >&2 "Unknown phase '$phase'"
+- exit 1
+- esac
+-done
diff --git a/SOURCES/0719-travis-support-SMP-if-available.patch b/SOURCES/0719-travis-support-SMP-if-available.patch
new file mode 100644
index 0000000..429d0ff
--- /dev/null
+++ b/SOURCES/0719-travis-support-SMP-if-available.patch
@@ -0,0 +1,22 @@
+From 1d94abd086b04dabf20f547470d19ad12b969a9a Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Mon, 4 Mar 2019 10:26:46 +0100
+Subject: [PATCH] travis: support SMP if available
+
+---
+ ci/travis-centos-rhel7.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
+index 7db3a8db41..bb60012eea 100755
+--- a/ci/travis-centos-rhel7.sh
++++ b/ci/travis-centos-rhel7.sh
+@@ -51,7 +51,7 @@ for phase in "${PHASES[@]}"; do
+ $DOCKER_EXEC ./configure --disable-timesyncd --disable-kdbus --disable-terminal \
+ --enable-gtk-doc --enable-compat-libs --disable-sysusers \
+ --disable-ldconfig --enable-lz4 --with-sysvinit-path=/etc/rc.d/init.d
+- $DOCKER_EXEC make
++ $DOCKER_EXEC make -j $(nproc)
+ # Run the internal testsuite
+ # Let's install the new systemd and "reboot" the container to avoid
+ # unexpected fails due to incompatibilities with older systemd
diff --git a/SOURCES/0720-shared-install-allow-enable-on-linked-unit-files.patch b/SOURCES/0720-shared-install-allow-enable-on-linked-unit-files.patch
new file mode 100644
index 0000000..cc0a8a6
--- /dev/null
+++ b/SOURCES/0720-shared-install-allow-enable-on-linked-unit-files.patch
@@ -0,0 +1,49 @@
+From 81e311e36abca2f433fa6ac3d86100fcc9d50403 Mon Sep 17 00:00:00 2001
+From: Kyle Walker <kwalker@redhat.com>
+Date: Thu, 15 Nov 2018 11:50:39 -0500
+Subject: [PATCH] shared/install: allow "enable" on linked unit files
+
+User expectations are broken when "systemctl enable /some/path/service.service"
+behaves differently to "systemctl link ..." followed by "systemctl enable".
+From user's POV, "enable" with the full path just combines the two steps into
+one.
+
+(cherry picked from commit f777b4345e8c57e739bda746f78757d0fb136ac7)
+
+Resolves: #1628575
+---
+ src/shared/install.c | 2 +-
+ src/test/test-install-root.c | 7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/install.c b/src/shared/install.c
+index e73f0c95bd..ea01e4dcc2 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -1878,7 +1878,7 @@ int unit_file_enable(
+ return r;
+
+ STRV_FOREACH(f, files) {
+- r = install_info_discover(scope, &c, root_dir, &paths, *f, SEARCH_LOAD, &i);
++ r = install_info_discover(scope, &c, root_dir, &paths, *f, SEARCH_LOAD|SEARCH_FOLLOW_CONFIG_SYMLINKS, &i);
+ if (r < 0)
+ return r;
+ if (i->type == UNIT_FILE_TYPE_MASKED)
+diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
+index cb417d4c19..9f6fa625ac 100644
+--- a/src/test/test-install-root.c
++++ b/src/test/test-install-root.c
+@@ -299,7 +299,12 @@ static void test_linked_units(const char *root) {
+ unit_file_changes_free(changes, n_changes);
+ changes = NULL; n_changes = 0;
+
+- assert_se(unit_file_enable(UNIT_FILE_SYSTEM, 0, root, STRV_MAKE("linked3.service"), &changes, &n_changes) == -ELOOP);
++ assert_se(unit_file_enable(UNIT_FILE_SYSTEM, 0, root, STRV_MAKE("linked3.service"), &changes, &n_changes) >= 0);
++ assert_se(n_changes == 1);
++ assert_se(changes[0].type == UNIT_FILE_SYMLINK);
++ assert_se(startswith(changes[0].path, root));
++ assert_se(endswith(changes[0].path, "linked3.service"));
++ assert_se(streq(changes[0].source, "/opt/linked3.service"));
+ unit_file_changes_free(changes, n_changes);
+ changes = NULL; n_changes = 0;
+ }
diff --git a/SOURCES/0721-backport-fd_is_fs_type.patch b/SOURCES/0721-backport-fd_is_fs_type.patch
new file mode 100644
index 0000000..bc0a86c
--- /dev/null
+++ b/SOURCES/0721-backport-fd_is_fs_type.patch
@@ -0,0 +1,58 @@
+From 5d73882b52d92e38b39ec84255e4b44ccbc4b3f8 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 3 Jan 2019 13:04:10 +0100
+Subject: [PATCH] backport fd_is_fs_type
+
+Related: #1663143
+---
+ src/shared/util.c | 16 ++++++++++++++++
+ src/shared/util.h | 8 ++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 4ba4693668..2838d50f6f 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -9186,3 +9186,19 @@ int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout) {
+
+ return -EPROTO;
+ }
++
++bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) {
++ assert(s);
++ assert_cc(sizeof(statfs_f_type_t) >= sizeof(s->f_type));
++
++ return F_TYPE_EQUAL(s->f_type, magic_value);
++}
++
++int fd_is_fs_type(int fd, statfs_f_type_t magic_value) {
++ struct statfs s;
++
++ if (fstatfs(fd, &s) < 0)
++ return -errno;
++
++ return is_fs_type(&s, magic_value);
++}
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 8fc237495a..f768936ab1 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -36,6 +36,7 @@
+ #include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/statfs.h>
+ #include <dirent.h>
+ #include <sys/resource.h>
+ #include <stddef.h>
+@@ -1147,3 +1148,10 @@ static inline void block_signals_reset(sigset_t *ss) {
+
+ char* set_iovec_string_field(struct iovec *iovec, unsigned int *n_iovec, const char *field, const char *value);
+ char* set_iovec_field_free(struct iovec *iovec, unsigned int *n_iovec, const char *field, char *value);
++
++/* The .f_type field of struct statfs is really weird defined on
++ * different archs. Let's give its type a name. */
++typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
++
++bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
++int fd_is_fs_type(int fd, statfs_f_type_t magic_value);
diff --git a/SOURCES/0722-backport-chase_symlinks.patch b/SOURCES/0722-backport-chase_symlinks.patch
new file mode 100644
index 0000000..e0c37f2
--- /dev/null
+++ b/SOURCES/0722-backport-chase_symlinks.patch
@@ -0,0 +1,502 @@
+From a221a65ad0563d1bfe8770e928b221efc6ba8c88 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 3 Jan 2019 13:09:43 +0100
+Subject: [PATCH] backport chase_symlinks
+
+Related: #1663143
+---
+ src/shared/util.c | 233 +++++++++++++++++++++++++++++++++++++++++++
+ src/shared/util.h | 8 ++
+ src/test/test-util.c | 208 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 449 insertions(+)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 2838d50f6f..385551f2b3 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -9202,3 +9202,236 @@ int fd_is_fs_type(int fd, statfs_f_type_t magic_value) {
+
+ return is_fs_type(&s, magic_value);
+ }
++
++int chase_symlinks(const char *path, const char *original_root, unsigned flags, char **ret) {
++ _cleanup_free_ char *buffer = NULL, *done = NULL, *root = NULL;
++ _cleanup_close_ int fd = -1;
++ unsigned max_follow = 32; /* how many symlinks to follow before giving up and returning ELOOP */
++ bool exists = true;
++ char *todo;
++ int r;
++
++ assert(path);
++
++ /* This is a lot like canonicalize_file_name(), but takes an additional "root" parameter, that allows following
++ * symlinks relative to a root directory, instead of the root of the host.
++ *
++ * Note that "root" primarily matters if we encounter an absolute symlink. It is also used when following
++ * relative symlinks to ensure they cannot be used to "escape" the root directory. The path parameter passed is
++ * assumed to be already prefixed by it, except if the CHASE_PREFIX_ROOT flag is set, in which case it is first
++ * prefixed accordingly.
++ *
++ * Algorithmically this operates on two path buffers: "done" are the components of the path we already
++ * processed and resolved symlinks, "." and ".." of. "todo" are the components of the path we still need to
++ * process. On each iteration, we move one component from "todo" to "done", processing it's special meaning
++ * each time. The "todo" path always starts with at least one slash, the "done" path always ends in no
++ * slash. We always keep an O_PATH fd to the component we are currently processing, thus keeping lookup races
++ * at a minimum.
++ *
++ * Suggested usage: whenever you want to canonicalize a path, use this function. Pass the absolute path you got
++ * as-is: fully qualified and relative to your host's root. Optionally, specify the root parameter to tell this
++ * function what to do when encountering a symlink with an absolute path as directory: prefix it by the
++ * specified path. */
++
++ if (original_root) {
++ root = path_make_absolute_cwd(original_root);
++ if (root == NULL)
++ return -ENOENT;
++
++ if (flags & CHASE_PREFIX_ROOT)
++ path = prefix_roota(root, path);
++ }
++
++ buffer = path_make_absolute_cwd(path);
++ if (buffer == NULL)
++ return -ENOENT;
++
++ fd = open("/", O_CLOEXEC|O_NOFOLLOW|O_PATH);
++ if (fd < 0)
++ return -errno;
++
++ todo = buffer;
++ for (;;) {
++ _cleanup_free_ char *first = NULL;
++ _cleanup_close_ int child = -1;
++ struct stat st;
++ size_t n, m;
++
++ /* Determine length of first component in the path */
++ n = strspn(todo, "/"); /* The slashes */
++ m = n + strcspn(todo + n, "/"); /* The entire length of the component */
++
++ /* Extract the first component. */
++ first = strndup(todo, m);
++ if (!first)
++ return -ENOMEM;
++
++ todo += m;
++
++ /* Empty? Then we reached the end. */
++ if (isempty(first))
++ break;
++
++ /* Just a single slash? Then we reached the end. */
++ if (path_equal(first, "/")) {
++ /* Preserve the trailing slash */
++ if (!strextend(&done, "/", NULL))
++ return -ENOMEM;
++
++ break;
++ }
++
++ /* Just a dot? Then let's eat this up. */
++ if (path_equal(first, "/."))
++ continue;
++
++ /* Two dots? Then chop off the last bit of what we already found out. */
++ if (path_equal(first, "/..")) {
++ _cleanup_free_ char *parent = NULL;
++ int fd_parent = -1;
++
++ /* If we already are at the top, then going up will not change anything. This is in-line with
++ * how the kernel handles this. */
++ if (isempty(done) || path_equal(done, "/"))
++ continue;
++
++ parent = dirname_malloc(done);
++ if (!parent)
++ return -ENOMEM;
++
++ /* Don't allow this to leave the root dir. */
++ if (root &&
++ path_startswith(done, root) &&
++ !path_startswith(parent, root))
++ continue;
++
++ free(done);
++ done = parent;
++ parent = NULL;
++
++ fd_parent = openat(fd, "..", O_CLOEXEC|O_NOFOLLOW|O_PATH);
++ if (fd_parent < 0)
++ return -errno;
++
++ safe_close(fd);
++ fd = fd_parent;
++
++ continue;
++ }
++
++ /* Otherwise let's see what this is. */
++ child = openat(fd, first + n, O_CLOEXEC|O_NOFOLLOW|O_PATH);
++ if (child < 0) {
++
++ if (errno == ENOENT &&
++ (flags & CHASE_NONEXISTENT) &&
++ (isempty(todo) || path_is_safe(todo))) {
++
++ /* If CHASE_NONEXISTENT is set, and the path does not exist, then that's OK, return
++ * what we got so far. But don't allow this if the remaining path contains "../ or "./"
++ * or something else weird. */
++
++ /* If done is "/", as first also contains slash at the head, then remove this redundant slash. */
++ if (streq_ptr(done, "/"))
++ *done = '\0';
++
++ if (!strextend(&done, first, todo, NULL))
++ return -ENOMEM;
++
++ exists = false;
++ break;
++ }
++
++ return -errno;
++ }
++
++ if (fstat(child, &st) < 0)
++ return -errno;
++ if ((flags & CHASE_NO_AUTOFS) &&
++ fd_is_fs_type(child, AUTOFS_SUPER_MAGIC) > 0)
++ return -EREMOTE;
++
++ if (S_ISLNK(st.st_mode)) {
++ char *joined;
++
++ _cleanup_free_ char *destination = NULL;
++
++ /* This is a symlink, in this case read the destination. But let's make sure we don't follow
++ * symlinks without bounds. */
++ if (--max_follow <= 0)
++ return -ELOOP;
++
++ r = readlinkat_malloc(fd, first + n, &destination);
++ if (r < 0)
++ return r;
++ if (isempty(destination))
++ return -EINVAL;
++
++ if (path_is_absolute(destination)) {
++
++ /* An absolute destination. Start the loop from the beginning, but use the root
++ * directory as base. */
++
++ safe_close(fd);
++ fd = open(root ?: "/", O_CLOEXEC|O_NOFOLLOW|O_PATH);
++ if (fd < 0)
++ return -errno;
++
++ free(done);
++
++ /* Note that we do not revalidate the root, we take it as is. */
++ if (isempty(root))
++ done = NULL;
++ else {
++ done = strdup(root);
++ if (!done)
++ return -ENOMEM;
++ }
++
++ /* Prefix what's left to do with what we just read, and start the loop again, but
++ * remain in the current directory. */
++ joined = strjoin(destination, todo, NULL);
++ } else
++ joined = strjoin("/", destination, todo, NULL);
++ if (!joined)
++ return -ENOMEM;
++
++ free(buffer);
++ todo = buffer = joined;
++
++ continue;
++ }
++
++ /* If this is not a symlink, then let's just add the name we read to what we already verified. */
++ if (!done) {
++ done = first;
++ first = NULL;
++ } else {
++ /* If done is "/", as first also contains slash at the head, then remove this redundant slash. */
++ if (streq(done, "/"))
++ *done = '\0';
++
++ if (!strextend(&done, first, NULL))
++ return -ENOMEM;
++ }
++
++ /* And iterate again, but go one directory further down. */
++ safe_close(fd);
++ fd = child;
++ child = -1;
++ }
++
++ if (!done) {
++ /* Special case, turn the empty string into "/", to indicate the root directory. */
++ done = strdup("/");
++ if (!done)
++ return -ENOMEM;
++ }
++
++ if (ret) {
++ *ret = done;
++ done = NULL;
++ }
++
++ return exists;
++}
+diff --git a/src/shared/util.h b/src/shared/util.h
+index f768936ab1..915c7439e8 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -1155,3 +1155,11 @@ typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
+
+ bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
+ int fd_is_fs_type(int fd, statfs_f_type_t magic_value);
++
++enum {
++ CHASE_PREFIX_ROOT = 1, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */
++ CHASE_NONEXISTENT = 2, /* If set, it's OK if the path doesn't actually exist. */
++ CHASE_NO_AUTOFS = 4, /* If set, return -EREMOTE if autofs mount point found */
++};
++
++int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);
+diff --git a/src/test/test-util.c b/src/test/test-util.c
+index efb02ff530..397c45a9f4 100644
+--- a/src/test/test-util.c
++++ b/src/test/test-util.c
+@@ -36,6 +36,7 @@
+ #include "fileio.h"
+ #include "conf-parser.h"
+ #include "virt.h"
++#include "path-util.h"
+
+ static void test_streq_ptr(void) {
+ assert_se(streq_ptr(NULL, NULL));
+@@ -1909,6 +1910,212 @@ static void test_acquire_data_fd(void) {
+ test_acquire_data_fd_one(ACQUIRE_NO_DEV_NULL|ACQUIRE_NO_MEMFD|ACQUIRE_NO_PIPE|ACQUIRE_NO_TMPFILE);
+ }
+
++static void test_chase_symlinks(void) {
++ _cleanup_free_ char *result = NULL;
++ char temp[] = "/tmp/test-chase.XXXXXX";
++ const char *top, *p, *pslash, *q, *qslash;
++ int r;
++
++ assert_se(mkdtemp(temp));
++
++ top = strjoina(temp, "/top");
++ assert_se(mkdir(top, 0700) >= 0);
++
++ p = strjoina(top, "/dot");
++ assert_se(symlink(".", p) >= 0);
++
++ p = strjoina(top, "/dotdot");
++ assert_se(symlink("..", p) >= 0);
++
++ p = strjoina(top, "/dotdota");
++ assert_se(symlink("../a", p) >= 0);
++
++ p = strjoina(temp, "/a");
++ assert_se(symlink("b", p) >= 0);
++
++ p = strjoina(temp, "/b");
++ assert_se(symlink("/usr", p) >= 0);
++
++ p = strjoina(temp, "/start");
++ assert_se(symlink("top/dot/dotdota", p) >= 0);
++
++ /* Paths that use symlinks underneath the "root" */
++
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, "/usr"));
++ result = mfree(result);
++
++ pslash = strjoina(p, "/");
++ r = chase_symlinks(pslash, NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, "/usr/"));
++ result = mfree(result);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r == -ENOENT);
++
++ r = chase_symlinks(pslash, temp, 0, &result);
++ assert_se(r == -ENOENT);
++
++ q = strjoina(temp, "/usr");
++
++ r = chase_symlinks(p, temp, CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(path_equal(result, q));
++ result = mfree(result);
++
++ qslash = strjoina(q, "/");
++
++ r = chase_symlinks(pslash, temp, CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(path_equal(result, qslash));
++ result = mfree(result);
++
++ assert_se(mkdir(q, 0700) >= 0);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, q));
++ result = mfree(result);
++
++ r = chase_symlinks(pslash, temp, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, qslash));
++ result = mfree(result);
++
++ p = strjoina(temp, "/slash");
++ assert_se(symlink("/", p) >= 0);
++
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, "/"));
++ result = mfree(result);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, temp));
++ result = mfree(result);
++
++ /* Paths that would "escape" outside of the "root" */
++
++ p = strjoina(temp, "/6dots");
++ assert_se(symlink("../../..", p) >= 0);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0 && path_equal(result, temp));
++ result = mfree(result);
++
++ p = strjoina(temp, "/6dotsusr");
++ assert_se(symlink("../../../usr", p) >= 0);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0 && path_equal(result, q));
++ result = mfree(result);
++
++ p = strjoina(temp, "/top/8dotsusr");
++ assert_se(symlink("../../../../usr", p) >= 0);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0 && path_equal(result, q));
++ result = mfree(result);
++
++ /* Paths that contain repeated slashes */
++
++ p = strjoina(temp, "/slashslash");
++ assert_se(symlink("///usr///", p) >= 0);
++
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, "/usr"));
++ result = mfree(result);
++
++ r = chase_symlinks(p, temp, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, q));
++ result = mfree(result);
++
++ /* Paths using . */
++
++ r = chase_symlinks("/etc/./.././", NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(path_equal(result, "/"));
++ result = mfree(result);
++
++ r = chase_symlinks("/etc/./.././", "/etc", 0, &result);
++ assert_se(r > 0 && path_equal(result, "/etc"));
++ result = mfree(result);
++
++ r = chase_symlinks("/../.././//../../etc", NULL, 0, &result);
++ assert_se(r > 0);
++ assert_se(streq(result, "/etc"));
++ result = mfree(result);
++
++ r = chase_symlinks("/../.././//../../test-chase.fsldajfl", NULL, CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(streq(result, "/test-chase.fsldajfl"));
++ result = mfree(result);
++
++ r = chase_symlinks("/../.././//../../etc", "/", CHASE_PREFIX_ROOT, &result);
++ assert_se(r > 0);
++ assert_se(streq(result, "/etc"));
++ result = mfree(result);
++
++ r = chase_symlinks("/../.././//../../test-chase.fsldajfl", "/", CHASE_PREFIX_ROOT|CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(streq(result, "/test-chase.fsldajfl"));
++ result = mfree(result);
++
++ r = chase_symlinks("/etc/machine-id/foo", NULL, 0, &result);
++ assert_se(r == -ENOTDIR);
++ result = mfree(result);
++
++ /* Path that loops back to self */
++
++ p = strjoina(temp, "/recursive-symlink");
++ assert_se(symlink("recursive-symlink", p) >= 0);
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r == -ELOOP);
++
++ /* Path which doesn't exist */
++
++ p = strjoina(temp, "/idontexist");
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r == -ENOENT);
++
++ r = chase_symlinks(p, NULL, CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(path_equal(result, p));
++ result = mfree(result);
++
++ p = strjoina(temp, "/idontexist/meneither");
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r == -ENOENT);
++
++ r = chase_symlinks(p, NULL, CHASE_NONEXISTENT, &result);
++ assert_se(r == 0);
++ assert_se(path_equal(result, p));
++ result = mfree(result);
++
++ /* Path which doesn't exist, but contains weird stuff */
++
++ p = strjoina(temp, "/idontexist/..");
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r == -ENOENT);
++
++ r = chase_symlinks(p, NULL, CHASE_NONEXISTENT, &result);
++ assert_se(r == -ENOENT);
++
++ p = strjoina(temp, "/target");
++ q = strjoina(temp, "/top");
++ assert_se(symlink(q, p) >= 0);
++ p = strjoina(temp, "/target/idontexist");
++ r = chase_symlinks(p, NULL, 0, &result);
++ assert_se(r == -ENOENT);
++
++ assert_se(rm_rf_dangerous(temp, false, true, false) >= 0);
++}
++
+ int main(int argc, char *argv[]) {
+ log_parse_environment();
+ log_open();
+@@ -1992,6 +2199,7 @@ int main(int argc, char *argv[]) {
+ test_system_tasks_max();
+ test_system_tasks_max_scale();
+ test_acquire_data_fd();
++ test_chase_symlinks();
+
+ return 0;
+ }
diff --git a/SOURCES/0723-fs-util-add-new-CHASE_SAFE-flag-to-chase_symlinks.patch b/SOURCES/0723-fs-util-add-new-CHASE_SAFE-flag-to-chase_symlinks.patch
new file mode 100644
index 0000000..56b5b3f
--- /dev/null
+++ b/SOURCES/0723-fs-util-add-new-CHASE_SAFE-flag-to-chase_symlinks.patch
@@ -0,0 +1,162 @@
+From 0e64363bb21a07fa318017ea8c90597db63a9545 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 3 Jan 2019 14:37:34 +0100
+Subject: [PATCH] fs-util: add new CHASE_SAFE flag to chase_symlinks()
+
+When the flag is specified we won't transition to a privilege-owned
+file or directory from an unprivileged-owned one. This is useful when
+privileged code wants to load data from a file unprivileged users have
+write access to, and validates the ownership, but want's to make sure
+that no symlink games are played to read a root-owned system file
+belonging to a different context.
+
+(cherry picked from commit f14f1806e329fe92d01f15c22a384702f0cb4ae0)
+
+Related: #1663143
+---
+ src/shared/util.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ src/shared/util.h | 7 ++++---
+ src/test/test-util.c | 26 ++++++++++++++++++++++++++
+ 3 files changed, 73 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 385551f2b3..fc4887920f 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -9203,10 +9203,22 @@ int fd_is_fs_type(int fd, statfs_f_type_t magic_value) {
+ return is_fs_type(&s, magic_value);
+ }
+
++static bool safe_transition(const struct stat *a, const struct stat *b) {
++ /* Returns true if the transition from a to b is safe, i.e. that we never transition from unprivileged to
++ * privileged files or directories. Why bother? So that unprivileged code can't symlink to privileged files
++ * making us believe we read something safe even though it isn't safe in the specific context we open it in. */
++
++ if (a->st_uid == 0) /* Transitioning from privileged to unprivileged is always fine */
++ return true;
++
++ return a->st_uid == b->st_uid; /* Otherwise we need to stay within the same UID */
++}
++
+ int chase_symlinks(const char *path, const char *original_root, unsigned flags, char **ret) {
+ _cleanup_free_ char *buffer = NULL, *done = NULL, *root = NULL;
+ _cleanup_close_ int fd = -1;
+ unsigned max_follow = 32; /* how many symlinks to follow before giving up and returning ELOOP */
++ struct stat previous_stat;
+ bool exists = true;
+ char *todo;
+ int r;
+@@ -9250,6 +9262,11 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+ if (fd < 0)
+ return -errno;
+
++ if (flags & CHASE_SAFE) {
++ if (fstat(fd, &previous_stat) < 0)
++ return -errno;
++ }
++
+ todo = buffer;
+ for (;;) {
+ _cleanup_free_ char *first = NULL;
+@@ -9313,6 +9330,16 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+ if (fd_parent < 0)
+ return -errno;
+
++ if (flags & CHASE_SAFE) {
++ if (fstat(fd_parent, &st) < 0)
++ return -errno;
++
++ if (!safe_transition(&previous_stat, &st))
++ return -EPERM;
++
++ previous_stat = st;
++ }
++
+ safe_close(fd);
+ fd = fd_parent;
+
+@@ -9347,6 +9374,12 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+
+ if (fstat(child, &st) < 0)
+ return -errno;
++ if ((flags & CHASE_SAFE) &&
++ !safe_transition(&previous_stat, &st))
++ return -EPERM;
++
++ previous_stat = st;
++
+ if ((flags & CHASE_NO_AUTOFS) &&
+ fd_is_fs_type(child, AUTOFS_SUPER_MAGIC) > 0)
+ return -EREMOTE;
+@@ -9379,6 +9412,16 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+
+ free(done);
+
++ if (flags & CHASE_SAFE) {
++ if (fstat(fd, &st) < 0)
++ return -errno;
++
++ if (!safe_transition(&previous_stat, &st))
++ return -EPERM;
++
++ previous_stat = st;
++ }
++
+ /* Note that we do not revalidate the root, we take it as is. */
+ if (isempty(root))
+ done = NULL;
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 915c7439e8..fa3e2e3009 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -1157,9 +1157,10 @@ bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
+ int fd_is_fs_type(int fd, statfs_f_type_t magic_value);
+
+ enum {
+- CHASE_PREFIX_ROOT = 1, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */
+- CHASE_NONEXISTENT = 2, /* If set, it's OK if the path doesn't actually exist. */
+- CHASE_NO_AUTOFS = 4, /* If set, return -EREMOTE if autofs mount point found */
++ CHASE_PREFIX_ROOT = 1U << 0, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */
++ CHASE_NONEXISTENT = 1U << 1, /* If set, it's OK if the path doesn't actually exist. */
++ CHASE_NO_AUTOFS = 1U << 2, /* If set, return -EREMOTE if autofs mount point found */
++ CHASE_SAFE = 1U << 3, /* If set, return EPERM if we ever traverse from unprivileged to privileged files or directories */
+ };
+
+ int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);
+diff --git a/src/test/test-util.c b/src/test/test-util.c
+index 397c45a9f4..e5a646ec20 100644
+--- a/src/test/test-util.c
++++ b/src/test/test-util.c
+@@ -2113,6 +2113,32 @@ static void test_chase_symlinks(void) {
+ r = chase_symlinks(p, NULL, 0, &result);
+ assert_se(r == -ENOENT);
+
++ if (geteuid() == 0) {
++ p = strjoina(temp, "/priv1");
++ assert_se(mkdir(p, 0755) >= 0);
++
++ q = strjoina(p, "/priv2");
++ assert_se(mkdir(q, 0755) >= 0);
++
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) >= 0);
++
++ assert_se(chown(q, 65534, 65534) >= 0);
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) >= 0);
++
++ assert_se(chown(p, 65534, 65534) >= 0);
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) >= 0);
++
++ assert_se(chown(q, 0, 0) >= 0);
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) == -EPERM);
++
++ assert_se(rmdir(q) >= 0);
++ assert_se(symlink("/etc/passwd", q) >= 0);
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) == -EPERM);
++
++ assert_se(chown(p, 0, 0) >= 0);
++ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) >= 0);
++ }
++
+ assert_se(rm_rf_dangerous(temp, false, true, false) >= 0);
+ }
+
diff --git a/SOURCES/0724-fs-util-add-new-chase_symlinks-flag-CHASE_OPEN.patch b/SOURCES/0724-fs-util-add-new-chase_symlinks-flag-CHASE_OPEN.patch
new file mode 100644
index 0000000..e6ef023
--- /dev/null
+++ b/SOURCES/0724-fs-util-add-new-chase_symlinks-flag-CHASE_OPEN.patch
@@ -0,0 +1,163 @@
+From c211b650ee5cb9934067dbba40718a4a33063e06 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 3 Jan 2019 14:44:36 +0100
+Subject: [PATCH] fs-util: add new chase_symlinks() flag CHASE_OPEN
+
+The new flag returns the O_PATH fd of the final component, which may be
+converted into a proper fd by open()ing it again through the
+/proc/self/fd/xyz path.
+
+Together with O_SAFE this provides us with a somewhat safe way to open()
+files in directories potentially owned by unprivileged code, where we
+want to refuse operation if any symlink tricks are played pointing to
+privileged files.
+
+(cherry picked from commit 1ed34d75d4f21d2335c5625261954c848d176ae6)
+
+Related: #1663143
+---
+ Makefile.am | 1 +
+ src/shared/util.c | 17 +++++++++++++
+ src/shared/util.h | 1 +
+ src/test/test-util.c | 59 +++++++++++++++++++++++++++++++++++++++++++-
+ 4 files changed, 77 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 995c421b8b..648f54b957 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1675,6 +1675,7 @@ test_util_SOURCES = \
+ src/test/test-util.c
+
+ test_util_LDADD = \
++ libsystemd-internal.la \
+ libsystemd-shared.la
+
+ test_path_lookup_SOURCES = \
+diff --git a/src/shared/util.c b/src/shared/util.c
+index fc4887920f..354d15ff18 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -9225,6 +9225,10 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+
+ assert(path);
+
++ /* Either the file may be missing, or we return an fd to the final object, but both make no sense */
++ if ((flags & (CHASE_NONEXISTENT|CHASE_OPEN)) == (CHASE_NONEXISTENT|CHASE_OPEN))
++ return -EINVAL;
++
+ /* This is a lot like canonicalize_file_name(), but takes an additional "root" parameter, that allows following
+ * symlinks relative to a root directory, instead of the root of the host.
+ *
+@@ -9476,5 +9480,18 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+ done = NULL;
+ }
+
++ if (flags & CHASE_OPEN) {
++ int q;
++
++ /* Return the O_PATH fd we currently are looking to the caller. It can translate it to a proper fd by
++ * opening /proc/self/fd/xyz. */
++
++ assert(fd >= 0);
++ q = fd;
++ fd = -1;
++
++ return q;
++ }
++
+ return exists;
+ }
+diff --git a/src/shared/util.h b/src/shared/util.h
+index fa3e2e3009..d89f0d34a1 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -1161,6 +1161,7 @@ enum {
+ CHASE_NONEXISTENT = 1U << 1, /* If set, it's OK if the path doesn't actually exist. */
+ CHASE_NO_AUTOFS = 1U << 2, /* If set, return -EREMOTE if autofs mount point found */
+ CHASE_SAFE = 1U << 3, /* If set, return EPERM if we ever traverse from unprivileged to privileged files or directories */
++ CHASE_OPEN = 1U << 4, /* If set, return an O_PATH object to the final component */
+ };
+
+ int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret);
+diff --git a/src/test/test-util.c b/src/test/test-util.c
+index e5a646ec20..8ef3850e10 100644
+--- a/src/test/test-util.c
++++ b/src/test/test-util.c
+@@ -1910,11 +1910,45 @@ static void test_acquire_data_fd(void) {
+ test_acquire_data_fd_one(ACQUIRE_NO_DEV_NULL|ACQUIRE_NO_MEMFD|ACQUIRE_NO_PIPE|ACQUIRE_NO_TMPFILE);
+ }
+
++static int id128_read_fd(int fd, sd_id128_t *ret) {
++ char buf[33];
++ ssize_t k;
++ unsigned j;
++ sd_id128_t t;
++
++ assert_return(fd >= 0, -EINVAL);
++
++ k = loop_read(fd, buf, 33, false);
++ if (k < 0)
++ return (int) k;
++
++ if (k != 33)
++ return -EIO;
++
++ if (buf[32] !='\n')
++ return -EIO;
++
++ for (j = 0; j < 16; j++) {
++ int a, b;
++
++ a = unhexchar(buf[j*2]);
++ b = unhexchar(buf[j*2+1]);
++
++ if (a < 0 || b < 0)
++ return -EIO;
++
++ t.bytes[j] = a << 4 | b;
++ }
++
++ *ret = t;
++ return 0;
++}
++
+ static void test_chase_symlinks(void) {
+ _cleanup_free_ char *result = NULL;
+ char temp[] = "/tmp/test-chase.XXXXXX";
+ const char *top, *p, *pslash, *q, *qslash;
+- int r;
++ int r, pfd;
+
+ assert_se(mkdtemp(temp));
+
+@@ -2139,6 +2173,29 @@ static void test_chase_symlinks(void) {
+ assert_se(chase_symlinks(q, NULL, CHASE_SAFE, NULL) >= 0);
+ }
+
++ p = strjoina(temp, "/machine-id-test");
++ assert_se(symlink("/usr/../etc/./machine-id", p) >= 0);
++
++ pfd = chase_symlinks(p, NULL, CHASE_OPEN, NULL);
++ if (pfd != -ENOENT) {
++ char procfs[sizeof("/proc/self/fd/") - 1 + DECIMAL_STR_MAX(pfd) + 1];
++ _cleanup_close_ int fd = -1;
++ sd_id128_t a, b;
++
++ assert_se(pfd >= 0);
++
++ xsprintf(procfs, "/proc/self/fd/%i", pfd);
++
++ fd = open(procfs, O_RDONLY|O_CLOEXEC);
++ assert_se(fd >= 0);
++
++ safe_close(pfd);
++
++ assert_se(id128_read_fd(fd, &a) >= 0);
++ assert_se(sd_id128_get_machine(&b) >= 0);
++ assert_se(sd_id128_equal(a, b));
++ }
++
+ assert_se(rm_rf_dangerous(temp, false, true, false) >= 0);
+ }
+
diff --git a/SOURCES/0725-sd-dameon-also-sent-ucred-when-our-UID-differs-from-.patch b/SOURCES/0725-sd-dameon-also-sent-ucred-when-our-UID-differs-from-.patch
new file mode 100644
index 0000000..43121a1
--- /dev/null
+++ b/SOURCES/0725-sd-dameon-also-sent-ucred-when-our-UID-differs-from-.patch
@@ -0,0 +1,119 @@
+From d06dfdde758e178d1ae20756890302a5c265ac08 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 5 Jan 2018 13:24:58 +0100
+Subject: [PATCH] sd-dameon: also sent ucred when our UID differs from EUID
+
+Let's be explicit, and always send the messages from our UID and never
+our EUID. Previously this behaviour was conditionalized only on whether
+the PID was specified, which made this non-obvious.
+
+(cherry picked from commit 9e1d021ee3f147486c5cfac69b3cbf6f4b36eb79)
+
+Related: #1663143
+---
+ src/libsystemd/sd-daemon/sd-daemon.c | 39 +++++++++++++++++++---------
+ 1 file changed, 27 insertions(+), 12 deletions(-)
+
+diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
+index 2c4dd9d225..82483a38e6 100644
+--- a/src/libsystemd/sd-daemon/sd-daemon.c
++++ b/src/libsystemd/sd-daemon/sd-daemon.c
+@@ -40,6 +40,8 @@
+ #include "socket-util.h"
+ #include "sd-daemon.h"
+
++#define SNDBUF_SIZE (8*1024*1024)
++
+ _public_ int sd_listen_fds(int unset_environment) {
+ const char *e;
+ unsigned n;
+@@ -340,7 +342,13 @@ _public_ int sd_is_mq(int fd, const char *path) {
+ return 1;
+ }
+
+-_public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state, const int *fds, unsigned n_fds) {
++_public_ int sd_pid_notify_with_fds(
++ pid_t pid,
++ int unset_environment,
++ const char *state,
++ const int *fds,
++ unsigned n_fds) {
++
+ union sockaddr_union sockaddr = {
+ .sa.sa_family = AF_UNIX,
+ };
+@@ -355,7 +363,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ _cleanup_close_ int fd = -1;
+ struct cmsghdr *cmsg = NULL;
+ const char *e;
+- bool have_pid;
++ bool send_ucred;
+ int r;
+
+ if (!state) {
+@@ -384,6 +392,8 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ goto finish;
+ }
+
++ (void) fd_inc_sndbuf(fd, SNDBUF_SIZE);
++
+ iovec.iov_len = strlen(state);
+
+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
+@@ -394,13 +404,18 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
+
+- have_pid = pid != 0 && pid != getpid();
++ send_ucred =
++ (pid != 0 && pid != getpid()) ||
++ getuid() != geteuid() ||
++ getgid() != getegid();
++
++ if (n_fds > 0 || send_ucred) {
++ /* CMSG_SPACE(0) may return value different than zero, which results in miscalculated controllen. */
++ msghdr.msg_controllen =
++ (n_fds > 0 ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
++ (send_ucred ? CMSG_SPACE(sizeof(struct ucred)) : 0);
+
+- if (n_fds > 0 || have_pid) {
+- /* CMSG_SPACE(0) may return value different then zero, which results in miscalculated controllen. */
+- msghdr.msg_controllen = (n_fds ? CMSG_SPACE(sizeof(int) * n_fds) : 0) +
+- CMSG_SPACE(sizeof(struct ucred)) * have_pid;
+- msghdr.msg_control = alloca(msghdr.msg_controllen);
++ msghdr.msg_control = alloca0(msghdr.msg_controllen);
+
+ cmsg = CMSG_FIRSTHDR(&msghdr);
+ if (n_fds > 0) {
+@@ -410,11 +425,11 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+
+ memcpy(CMSG_DATA(cmsg), fds, sizeof(int) * n_fds);
+
+- if (have_pid)
++ if (send_ucred)
+ assert_se(cmsg = CMSG_NXTHDR(&msghdr, cmsg));
+ }
+
+- if (have_pid) {
++ if (send_ucred) {
+ struct ucred *ucred;
+
+ cmsg->cmsg_level = SOL_SOCKET;
+@@ -422,7 +437,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
+
+ ucred = (struct ucred*) CMSG_DATA(cmsg);
+- ucred->pid = pid;
++ ucred->pid = pid != 0 ? pid : getpid();
+ ucred->uid = getuid();
+ ucred->gid = getgid();
+ }
+@@ -435,7 +450,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
+ }
+
+ /* If that failed, try with our own ucred instead */
+- if (have_pid) {
++ if (send_ucred) {
+ msghdr.msg_controllen -= CMSG_SPACE(sizeof(struct ucred));
+ if (msghdr.msg_controllen == 0)
+ msghdr.msg_control = NULL;
diff --git a/SOURCES/0726-notify-add-new-uid-command.patch b/SOURCES/0726-notify-add-new-uid-command.patch
new file mode 100644
index 0000000..5e5ff67
--- /dev/null
+++ b/SOURCES/0726-notify-add-new-uid-command.patch
@@ -0,0 +1,127 @@
+From 18f3bad3ba1ffc5a363d188da8b0653f9b527a18 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 5 Jan 2018 13:26:38 +0100
+Subject: [PATCH] notify: add new --uid= command
+
+The new --uid= switch allows selecting the UID from which the
+notificaiton messages shall originate.
+
+This is primarily useful for testing purposes, but might have other
+uses.
+
+(cherry picked from commit 65c6b99094580afa186199d8091cd7536900526c)
+
+Related: #1663143
+---
+ man/systemd-notify.xml | 9 +++++++++
+ src/notify/notify.c | 39 ++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 45 insertions(+), 3 deletions(-)
+
+diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
+index 46ede1ab8f..4048783611 100644
+--- a/man/systemd-notify.xml
++++ b/man/systemd-notify.xml
+@@ -106,6 +106,15 @@
+ <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
+ </varlistentry>
+
++ <varlistentry>
++ <term><option>--uid=</option><replaceable>USER</replaceable></term>
++
++ <listitem><para>Set the user ID to send the notification from. Takes a UNIX user name or numeric UID. When
++ specified the notification message will be sent with the specified UID as sender, in place of the user the
++ command was invoked as. This option requires sufficient privileges in order to be able manipulate the user
++ identity of the process.</para></listitem>
++ </varlistentry>
++
+ <varlistentry>
+ <term><option>--status=</option></term>
+
+diff --git a/src/notify/notify.c b/src/notify/notify.c
+index 0d382992a5..659ba7c54b 100644
+--- a/src/notify/notify.c
++++ b/src/notify/notify.c
+@@ -40,6 +40,8 @@ static pid_t arg_pid = 0;
+ static const char *arg_status = NULL;
+ static bool arg_booted = false;
+ static const char *arg_readahead = NULL;
++static uid_t arg_uid = UID_INVALID;
++static gid_t arg_gid = GID_INVALID;
+
+ static void help(void) {
+ printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
+@@ -47,7 +49,8 @@ static void help(void) {
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " --ready Inform the init system about service start-up completion\n"
+- " --pid[=PID] Set main pid of daemon\n"
++ " --pid[=PID] Set main PID of daemon\n"
++ " --uid=USER Set user to send from\n"
+ " --status=TEXT Set status text\n"
+ " --booted Check if the system was booted up with systemd\n"
+ " --readahead=ACTION Controls read-ahead operations\n",
+@@ -62,7 +65,8 @@ static int parse_argv(int argc, char *argv[]) {
+ ARG_PID,
+ ARG_STATUS,
+ ARG_BOOTED,
+- ARG_READAHEAD
++ ARG_READAHEAD,
++ ARG_UID,
+ };
+
+ static const struct option options[] = {
+@@ -73,10 +77,11 @@ static int parse_argv(int argc, char *argv[]) {
+ { "status", required_argument, NULL, ARG_STATUS },
+ { "booted", no_argument, NULL, ARG_BOOTED },
+ { "readahead", required_argument, NULL, ARG_READAHEAD },
++ { "uid", required_argument, NULL, ARG_UID },
+ {}
+ };
+
+- int c;
++ int c, r;
+
+ assert(argc >= 0);
+ assert(argv);
+@@ -122,6 +127,18 @@ static int parse_argv(int argc, char *argv[]) {
+ arg_readahead = optarg;
+ break;
+
++ case ARG_UID: {
++ const char *u = optarg;
++
++ r = get_user_creds(&u, &arg_uid, &arg_gid, NULL, NULL);
++ if (r == -ESRCH) /* If the user doesn't exist, then accept it anyway as numeric */
++ r = parse_uid(u, &arg_uid);
++ if (r < 0)
++ return log_error_errno(r, "Can't resolve user %s: %m", optarg);
++
++ break;
++ }
++
+ case '?':
+ return -EINVAL;
+
+@@ -209,6 +226,22 @@ int main(int argc, char* argv[]) {
+ goto finish;
+ }
+
++ /* If this is requested change to the requested UID/GID. Note thta we only change the real UID here, and leave
++ the effective UID in effect (which is 0 for this to work). That's because we want the privileges to fake the
++ ucred data, and sd_pid_notify() uses the real UID for filling in ucred. */
++
++ if (arg_gid != GID_INVALID)
++ if (setregid(arg_gid, (gid_t) -1) < 0) {
++ r = log_error_errno(errno, "Failed to change GID: %m");
++ goto finish;
++ }
++
++ if (arg_uid != UID_INVALID)
++ if (setreuid(arg_uid, (uid_t) -1) < 0) {
++ r = log_error_errno(errno, "Failed to change UID: %m");
++ goto finish;
++ }
++
+ r = sd_pid_notify(arg_pid ? arg_pid : getppid(), false, n);
+ if (r < 0) {
+ log_error_errno(r, "Failed to notify init system: %m");
diff --git a/SOURCES/0727-core-be-stricter-when-handling-PID-files-and-MAINPID.patch b/SOURCES/0727-core-be-stricter-when-handling-PID-files-and-MAINPID.patch
new file mode 100644
index 0000000..5769dee
--- /dev/null
+++ b/SOURCES/0727-core-be-stricter-when-handling-PID-files-and-MAINPID.patch
@@ -0,0 +1,670 @@
+From c0f32feb77768aa76d8c813471b3484c93bc2651 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 5 Jan 2018 12:20:22 +0100
+Subject: [PATCH] core: be stricter when handling PID files and MAINPID
+ sd_notify() messages
+
+Let's be more restrictive when validating PID files and MAINPID=
+messages: don't accept PIDs that make no sense, and if the configuration
+source is not trusted, don't accept out-of-cgroup PIDs. A configuratin
+source is considered trusted when the PID file is owned by root, or the
+message was received from root.
+
+This should lock things down a bit, in case service authors write out
+PID files from unprivileged code or use NotifyAccess=all with
+unprivileged code. Note that doing so was always problematic, just now
+it's a bit less problematic.
+
+When we open the PID file we'll now use the CHASE_SAFE chase_symlinks()
+logic, to ensure that we won't follow an unpriviled-owned symlink to a
+privileged-owned file thinking this was a valid privileged PID file,
+even though it really isn't.
+
+Fixes: #6632
+(cherry picked from commit db256aab13d8a89d583ecd2bacf0aca87c66effc)
+
+Resolves: #1663143
+---
+ man/systemd.service.xml | 18 ++-
+ src/core/manager.c | 17 ++-
+ src/core/service.c | 166 ++++++++++++++++------
+ src/core/unit.h | 2 +-
+ test/TEST-20-MAINPIDGAMES/Makefile | 1 +
+ test/TEST-20-MAINPIDGAMES/test.sh | 81 +++++++++++
+ test/TEST-20-MAINPIDGAMES/testsuite.sh | 189 +++++++++++++++++++++++++
+ test/test-functions | 2 +-
+ 8 files changed, 418 insertions(+), 58 deletions(-)
+ create mode 120000 test/TEST-20-MAINPIDGAMES/Makefile
+ create mode 100755 test/TEST-20-MAINPIDGAMES/test.sh
+ create mode 100755 test/TEST-20-MAINPIDGAMES/testsuite.sh
+
+diff --git a/man/systemd.service.xml b/man/systemd.service.xml
+index d147e449a6..565a783f72 100644
+--- a/man/systemd.service.xml
++++ b/man/systemd.service.xml
+@@ -221,16 +221,14 @@
+ <varlistentry>
+ <term><varname>PIDFile=</varname></term>
+
+- <listitem><para>Takes an absolute file name pointing to the
+- PID file of this daemon. Use of this option is recommended for
+- services where <varname>Type=</varname> is set to
+- <option>forking</option>. systemd will read the PID of the
+- main process of the daemon after start-up of the service.
+- systemd will not write to the file configured here, although
+- it will remove the file after the service has shut down if it
+- still exists.
+- </para>
+- </listitem>
++ <listitem><para>Takes an absolute path referring to the PID file of the service. Usage of this option is
++ recommended for services where <varname>Type=</varname> is set to <option>forking</option>. The service manager
++ will read the PID of the main process of the service from this file after start-up of the service. The service
++ manager will not write to the file configured here, although it will remove the file after the service has shut
++ down if it still exists. The PID file does not need to be owned by a privileged user, but if it is owned by an
++ unprivileged user additional safety restrictions are enforced: the file may not be a symlink to a file owned by
++ a different user (neither directly nor indirectly), and the PID file must refer to a process already belonging
++ to the service.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 73d6c81fdb..3bca61d0b1 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -1658,11 +1658,18 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
+ return 0;
+ }
+
+-static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, FDSet *fds) {
++static void manager_invoke_notify_message(
++ Manager *m,
++ Unit *u,
++ const struct ucred *ucred,
++ const char *buf,
++ FDSet *fds) {
++
+ _cleanup_strv_free_ char **tags = NULL;
+
+ assert(m);
+ assert(u);
++ assert(ucred);
+ assert(buf);
+
+ tags = strv_split(buf, "\n\r");
+@@ -1674,7 +1681,7 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const
+ log_unit_debug(u->id, "Got notification message for unit %s", u->id);
+
+ if (UNIT_VTABLE(u)->notify_message)
+- UNIT_VTABLE(u)->notify_message(u, pid, tags, fds);
++ UNIT_VTABLE(u)->notify_message(u, ucred, tags, fds);
+ else if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+ _cleanup_free_ char *x = NULL, *y = NULL;
+
+@@ -1777,19 +1784,19 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
+ * to avoid notifying the same one multiple times. */
+ u1 = manager_get_unit_by_pid(m, ucred->pid);
+ if (u1) {
+- manager_invoke_notify_message(m, u1, ucred->pid, buf, fds);
++ manager_invoke_notify_message(m, u1, ucred, buf, fds);
+ found = true;
+ }
+
+ u2 = hashmap_get(m->watch_pids1, LONG_TO_PTR(ucred->pid));
+ if (u2 && u2 != u1) {
+- manager_invoke_notify_message(m, u2, ucred->pid, buf, fds);
++ manager_invoke_notify_message(m, u2, ucred, buf, fds);
+ found = true;
+ }
+
+ u3 = hashmap_get(m->watch_pids2, LONG_TO_PTR(ucred->pid));
+ if (u3 && u3 != u2 && u3 != u1) {
+- manager_invoke_notify_message(m, u3, ucred->pid, buf, fds);
++ manager_invoke_notify_message(m, u3, ucred, buf, fds);
+ found = true;
+ }
+
+diff --git a/src/core/service.c b/src/core/service.c
+index fe6e2ff17c..06b39e3a5a 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -700,9 +700,45 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
+ }
+ }
+
++static int service_is_suitable_main_pid(Service *s, pid_t pid, int prio) {
++ Unit *owner;
++
++ assert(s);
++ assert(pid > 0);
++
++ /* Checks whether the specified PID is suitable as main PID for this service. returns negative if not, 0 if the
++ * PID is questionnable but should be accepted if the source of configuration is trusted. > 0 if the PID is
++ * good */
++
++ if (pid == getpid() || pid == 1) {
++ log_unit_full(UNIT(s)->id, prio, "New main PID "PID_FMT" is the manager, refusing.", pid);
++ return -EPERM;
++ }
++
++ if (pid == s->control_pid) {
++ log_unit_full(UNIT(s)->id, prio, "New main PID "PID_FMT" is the control process, refusing.", pid);
++ return -EPERM;
++ }
++
++ if (!pid_is_alive(pid)) {
++ log_unit_full(UNIT(s)->id, prio, "New main PID "PID_FMT" does not exist or is a zombie.", pid);
++ return -ESRCH;
++ }
++
++ owner = manager_get_unit_by_pid(UNIT(s)->manager, pid);
++ if (owner == UNIT(s)) {
++ log_unit_debug(UNIT(s)->id, "New main PID "PID_FMT" belongs to service, we are happy.", pid);
++ return 1; /* Yay, it's definitely a good PID */
++ }
++
++ return 0; /* Hmm it's a suspicious PID, let's accept it if configuration source is trusted */
++}
++
+ static int service_load_pid_file(Service *s, bool may_warn) {
++ char procfs[sizeof("/proc/self/fd/") - 1 + DECIMAL_STR_MAX(int)];
+ _cleanup_free_ char *k = NULL;
+- int r;
++ _cleanup_close_ int fd = -1;
++ int r, prio;
+ pid_t pid;
+
+ assert(s);
+@@ -710,30 +746,47 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+ if (!s->pid_file)
+ return -ENOENT;
+
+- r = read_one_line_file(s->pid_file, &k);
+- if (r < 0) {
+- if (may_warn)
+- log_unit_info(UNIT(s)->id, "PID file %s not readable (yet?) after %s.", s->pid_file, service_state_to_string(s->state));
+- return r;
+- }
++ prio = may_warn ? LOG_INFO : LOG_DEBUG;
++
++ fd = chase_symlinks(s->pid_file, NULL, CHASE_OPEN|CHASE_SAFE, NULL);
++ if (fd == -EPERM)
++ return log_unit_full(UNIT(s)->id, prio, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
++ if (fd < 0)
++ return log_unit_full(UNIT(s)->id, prio, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
++
++ /* Let's read the PID file now that we chased it down. But we need to convert the O_PATH fd chase_symlinks() returned us into a proper fd first. */
++ xsprintf(procfs, "/proc/self/fd/%i", fd);
++ r = read_one_line_file(procfs, &k);
++ if (r < 0)
++ return log_unit_error_errno(UNIT(s)->id, r, "Can't convert PID files %s O_PATH file descriptor to proper file descriptor: %m", s->pid_file);
+
+ r = parse_pid(k, &pid);
+- if (r < 0) {
+- if (may_warn)
+- log_unit_info_errno(UNIT(s)->id, r, "Failed to read PID from file %s: %m", s->pid_file);
++ if (r < 0)
++ return log_unit_full(UNIT(s)->id, prio, "Failed to parse PID from file %s: %m", s->pid_file);
++
++ if (s->main_pid_known && pid == s->main_pid)
++ return 0;
++
++ r = service_is_suitable_main_pid(s, pid, prio);
++ if (r < 0)
+ return r;
+- }
++ if (r == 0) {
++ struct stat st;
+
+- if (!pid_is_alive(pid)) {
+- if (may_warn)
+- log_unit_info(UNIT(s)->id, "PID "PID_FMT" read from file %s does not exist or is a zombie.", pid, s->pid_file);
+- return -ESRCH;
++ /* Hmm, it's not clear if the new main PID is safe. Let's allow this if the PID file is owned by root */
++
++ if (fstat(fd, &st) < 0)
++ return log_unit_error_errno(UNIT(s)->id, errno, "Failed to fstat() PID file O_PATH fd: %m");
++
++ if (st.st_uid != 0) {
++ log_unit_error(UNIT(s)->id, "New main PID "PID_FMT" does not belong to service, and PID file is not owned by root. Refusing.", pid);
++ return -EPERM;
++ }
++
++ log_unit_debug(UNIT(s)->id, "New main PID "PID_FMT" does not belong to service, but we'll accept it since PID file is owned by root.", pid);
+ }
+
+ if (s->main_pid_known) {
+- if (pid == s->main_pid)
+- return 0;
+-
+ log_unit_debug(UNIT(s)->id, "Main PID changing: "PID_FMT" -> "PID_FMT, s->main_pid, pid);
+
+ service_unwatch_main_pid(s);
+@@ -752,7 +805,7 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+ return r;
+ }
+
+- return 0;
++ return 1;
+ }
+
+ static int service_search_main_pid(Service *s) {
+@@ -2584,7 +2637,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+ /* Forking services may occasionally move to a new PID.
+ * As long as they update the PID file before exiting the old
+ * PID, they're fine. */
+- if (service_load_pid_file(s, false) == 0)
++ if (service_load_pid_file(s, false) > 0)
+ return;
+
+ s->main_pid = 0;
+@@ -2957,42 +3010,73 @@ static int service_dispatch_watchdog(sd_event_source *source, usec_t usec, void
+ return 0;
+ }
+
+-static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds) {
++static bool service_notify_message_authorized(Service *s, pid_t pid, char **tags, FDSet *fds) {
++ assert(s);
++
++ if (s->notify_access == NOTIFY_NONE) {
++ log_unit_warning(UNIT(s)->id, "Got notification message from PID "PID_FMT", but reception is disabled.", pid);
++ return false;
++ }
++
++ if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) {
++ if (s->main_pid != 0)
++ log_unit_warning(UNIT(s)->id, "Got notification message from PID "PID_FMT", but reception only permitted for main PID "PID_FMT, pid, s->main_pid);
++ else
++ log_unit_warning(UNIT(s)->id, "Got notification message from PID "PID_FMT", but reception only permitted for main PID which is currently not known", pid);
++
++ return false;
++ }
++
++ return true;
++}
++
++static void service_notify_message(
++ Unit *u,
++ const struct ucred *ucred,
++ char **tags,
++ FDSet *fds) {
+ Service *s = SERVICE(u);
+- _cleanup_free_ char *cc = NULL;
+ bool notify_dbus = false;
+ const char *e;
++ int r;
+
+ assert(u);
++ assert(ucred);
+
+- cc = strv_join(tags, ", ");
+- log_unit_debug(u->id, "%s: Got notification message from PID "PID_FMT" (%s)",
+- u->id, pid, isempty(cc) ? "n/a" : cc);
++ if (!service_notify_message_authorized(SERVICE(u), ucred->pid, tags, fds))
++ return;
+
+ if (s->notify_access == NOTIFY_NONE) {
+- log_unit_warning(u->id, "%s: Got notification message from PID "PID_FMT", but reception is disabled.", u->id, pid);
+- return;
+- }
++ _cleanup_free_ char *cc = NULL;
+
+- if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) {
+- if (s->main_pid != 0)
+- log_unit_warning(u->id, "%s: Got notification message from PID "PID_FMT", but reception only permitted for main PID "PID_FMT, u->id, pid, s->main_pid);
+- else
+- log_unit_debug(u->id, "%s: Got notification message from PID "PID_FMT", but reception only permitted for main PID which is currently not known", u->id, pid);
+- return;
++ cc = strv_join(tags, ", ");
++ log_unit_debug(u->id, "Got notification message from PID "PID_FMT" (%s)", ucred->pid, isempty(cc) ? "n/a" : cc);
+ }
+
+ /* Interpret MAINPID= */
+ e = strv_find_startswith(tags, "MAINPID=");
+ if (e && IN_SET(s->state, SERVICE_START, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD)) {
+- if (parse_pid(e, &pid) < 0)
+- log_unit_warning(u->id, "Failed to parse MAINPID= field in notification message: %s", e);
+- else {
+- log_unit_debug(u->id, "%s: got MAINPID=%s", u->id, e);
++ pid_t new_main_pid;
+
+- service_set_main_pid(s, pid);
+- unit_watch_pid(UNIT(s), pid);
+- notify_dbus = true;
++ if (parse_pid(e, &new_main_pid) < 0)
++ log_unit_warning(u->id, "Failed to parse MAINPID= field in notification message, ignoring: %s", e);
++ else if (!s->main_pid_known || new_main_pid != s->main_pid) {
++
++ r = service_is_suitable_main_pid(s, new_main_pid, LOG_WARNING);
++ if (r == 0) {
++ /* The new main PID is a bit suspicous, which is OK if the sender is privileged. */
++
++ if (ucred->uid == 0) {
++ log_unit_debug(u->id, "New main PID "PID_FMT" does not belong to service, but we'll accept it as the request to change it came from a privileged process.", new_main_pid);
++ r = 1;
++ } else
++ log_unit_debug(u->id, "New main PID "PID_FMT" does not belong to service, refusing.", new_main_pid);
++ }
++ if (r > 0) {
++ service_set_main_pid(s, new_main_pid);
++ unit_watch_pid(UNIT(s), new_main_pid);
++ notify_dbus = true;
++ }
+ }
+ }
+
+diff --git a/src/core/unit.h b/src/core/unit.h
+index dfec9cea01..091ef7596e 100644
+--- a/src/core/unit.h
++++ b/src/core/unit.h
+@@ -376,7 +376,7 @@ struct UnitVTable {
+ void (*notify_cgroup_empty)(Unit *u);
+
+ /* Called whenever a process of this unit sends us a message */
+- void (*notify_message)(Unit *u, pid_t pid, char **tags, FDSet *fds);
++ void (*notify_message)(Unit *u, const struct ucred *ucred, char **tags, FDSet *fds);
+
+ /* Called whenever a name this Unit registered for comes or
+ * goes away. */
+diff --git a/test/TEST-20-MAINPIDGAMES/Makefile b/test/TEST-20-MAINPIDGAMES/Makefile
+new file mode 120000
+index 0000000000..e9f93b1104
+--- /dev/null
++++ b/test/TEST-20-MAINPIDGAMES/Makefile
+@@ -0,0 +1 @@
++../TEST-01-BASIC/Makefile
+\ No newline at end of file
+diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh
+new file mode 100755
+index 0000000000..733532b718
+--- /dev/null
++++ b/test/TEST-20-MAINPIDGAMES/test.sh
+@@ -0,0 +1,81 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++TEST_DESCRIPTION="test changing main PID"
++
++. $TEST_BASE_DIR/test-functions
++
++check_result_qemu() {
++ ret=1
++ mkdir -p $TESTDIR/root
++ mount ${LOOPDEV}p1 $TESTDIR/root
++ [[ -e $TESTDIR/root/testok ]] && ret=0
++ [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
++ [[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR
++ umount $TESTDIR/root
++ [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
++ ls -l $TESTDIR/journal/*/*.journal
++ test -s $TESTDIR/failed && ret=$(($ret+1))
++ return $ret
++}
++
++test_run() {
++ if run_qemu; then
++ check_result_qemu || return 1
++ else
++ dwarn "can't run QEMU, skipping"
++ fi
++ if check_nspawn; then
++ run_nspawn
++ check_result_nspawn || return 1
++ else
++ dwarn "can't run systemd-nspawn, skipping"
++ fi
++ return 0
++}
++
++test_setup() {
++ create_empty_image
++ mkdir -p $TESTDIR/root
++ mount ${LOOPDEV}p1 $TESTDIR/root
++
++ (
++ LOG_LEVEL=5
++ eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
++
++ setup_basic_environment
++ inst_binary cut
++ inst_binary useradd
++ inst /etc/login.defs
++
++ # setup the testsuite service
++ cat >$initdir/etc/systemd/system/testsuite.service <<EOF
++[Unit]
++Description=Testsuite service
++
++[Service]
++ExecStart=/bin/bash -x /testsuite.sh
++Type=oneshot
++StandardOutput=tty
++StandardError=tty
++NotifyAccess=all
++EOF
++ cp testsuite.sh $initdir/
++
++ useradd -R $initdir -U -u 1234 test
++
++ setup_testsuite
++ )
++ setup_nspawn_root
++
++ ddebug "umount $TESTDIR/root"
++ umount $TESTDIR/root
++}
++
++test_cleanup() {
++ umount $TESTDIR/root 2>/dev/null
++ [[ $LOOPDEV ]] && losetup -d $LOOPDEV
++ return 0
++}
++
++do_test "$@"
+diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh
+new file mode 100755
+index 0000000000..d4ad63865c
+--- /dev/null
++++ b/test/TEST-20-MAINPIDGAMES/testsuite.sh
+@@ -0,0 +1,189 @@
++#!/bin/bash
++# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++# ex: ts=8 sw=4 sts=4 et filetype=sh
++set -ex
++set -o pipefail
++
++systemctl_show_value() {
++ systemctl show "$@" | cut -d = -f 2-
++}
++
++systemd-analyze set-log-level debug
++
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Start a test process inside of our own cgroup
++sleep infinity &
++INTERNALPID=$!
++disown
++
++# Start a test process outside of our own cgroup
++systemd-run -p User=test --unit=sleep.service /bin/sleep infinity
++EXTERNALPID=`systemctl_show_value -p MainPID sleep.service`
++
++# Update our own main PID to the external test PID, this should work
++systemd-notify MAINPID=$EXTERNALPID
++test `systemctl_show_value -p MainPID testsuite.service` -eq $EXTERNALPID
++
++# Update our own main PID to the internal test PID, this should work, too
++systemd-notify MAINPID=$INTERNALPID
++test `systemctl_show_value -p MainPID testsuite.service` -eq $INTERNALPID
++
++# Update it back to our own PID, this should also work
++systemd-notify MAINPID=$$
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Try to set it to PID 1, which it should ignore, because that's the manager
++systemd-notify MAINPID=1
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Try to set it to PID 0, which is invalid and should be ignored
++systemd-notify MAINPID=0
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Try to set it to a valid but non-existing PID, which should be ignored. (Note
++# that we set the PID to a value well above any known /proc/sys/kernel/pid_max,
++# which means we can be pretty sure it doesn't exist by coincidence)
++systemd-notify MAINPID=1073741824
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Change it again to the external PID, without priviliges this time. This should be ignored, because the PID is from outside of our cgroup and we lack privileges.
++systemd-notify --uid=1000 MAINPID=$EXTERNALPID
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++# Change it again to the internal PID, without priviliges this time. This should work, as the process is on our cgroup, and that's enough even if we lack privileges.
++systemd-notify --uid=1000 MAINPID=$INTERNALPID
++test `systemctl_show_value -p MainPID testsuite.service` -eq $INTERNALPID
++
++# Update it back to our own PID, this should also work
++systemd-notify --uid=1000 MAINPID=$$
++test `systemctl_show_value -p MainPID testsuite.service` -eq $$
++
++cat >/tmp/mainpid.sh <<EOF
++#!/bin/bash
++
++set -eux
++set -o pipefail
++
++# Create a number of children, and make one the main one
++sleep infinity &
++disown
++
++sleep infinity &
++MAINPID=\$!
++disown
++
++sleep infinity &
++disown
++
++echo \$MAINPID > /run/mainpidsh/pid
++EOF
++chmod +x /tmp/mainpid.sh
++
++cat > /etc/systemd/system/mainpidsh.service <<EOF
++[Unit]
++Description=MainPID test 1 service
++
++[Service]
++StandardOutput=tty
++StandardError=tty
++Type=forking
++RuntimeDirectory=mainpidsh
++PIDFile=/run/mainpidsh/pid
++ExecStart=/tmp/mainpid.sh
++EOF
++
++systemctl daemon-reload
++systemctl start mainpidsh.service
++test `systemctl_show_value -p MainPID mainpidsh.service` -eq `cat /run/mainpidsh/pid`
++
++cat >/tmp/mainpid2.sh <<EOF
++#!/bin/bash
++
++set -eux
++set -o pipefail
++
++# Create a number of children, and make one the main one
++sleep infinity &
++disown
++
++sleep infinity &
++MAINPID=\$!
++disown
++
++sleep infinity &
++disown
++
++echo \$MAINPID > /run/mainpidsh2/pid
++chown 1001:1001 /run/mainpidsh2/pid
++EOF
++chmod +x /tmp/mainpid2.sh
++
++cat > /etc/systemd/system/mainpidsh2.service <<EOF
++[Unit]
++Description=MainPID test 2 service
++
++[Service]
++StandardOutput=tty
++StandardError=tty
++Type=forking
++RuntimeDirectory=mainpidsh2
++PIDFile=/run/mainpidsh2/pid
++ExecStart=/tmp/mainpid2.sh
++EOF
++
++systemctl daemon-reload
++systemctl start mainpidsh2.service
++test `systemctl_show_value -p MainPID mainpidsh2.service` -eq `cat /run/mainpidsh2/pid`
++
++cat >/dev/shm/mainpid3.sh <<EOF
++#!/bin/bash
++
++set -eux
++set -o pipefail
++
++sleep infinity &
++disown
++
++sleep infinity &
++disown
++
++sleep infinity &
++disown
++
++# Let's try to play games, and link up a privileged PID file
++ln -s ../mainpidsh/pid /run/mainpidsh3/pid
++
++# Quick assertion that the link isn't dead
++test -f /run/mainpidsh3/pid
++EOF
++chmod 755 /dev/shm/mainpid3.sh
++
++cat > /etc/systemd/system/mainpidsh3.service <<EOF
++[Unit]
++Description=MainPID test 3 service
++
++[Service]
++StandardOutput=tty
++StandardError=tty
++Type=forking
++RuntimeDirectory=mainpidsh3
++PIDFile=/run/mainpidsh3/pid
++User=test
++TimeoutStartSec=2s
++ExecStart=/dev/shm/mainpid3.sh
++EOF
++
++systemctl daemon-reload
++systemctl start mainpidsh3.service
++
++# Test that this failed due to timeout, and not some other error
++# test `systemctl_show_value -p Result mainpidsh3.service` = timeout
++# Just check that there is no MainPID => the pid file was ignored
++test `systemctl_show_value -p MainPID mainpidsh3.service` -eq 0
++
++systemd-analyze set-log-level info
++
++echo OK > /testok
++
++exit 0
+diff --git a/test/test-functions b/test/test-functions
+index 78e725d5b9..e50ce556fd 100644
+--- a/test/test-functions
++++ b/test/test-functions
+@@ -12,7 +12,7 @@ if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
+ ROOTLIBDIR=/usr/lib/systemd
+ fi
+
+-BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
++BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe chmod chown ln"
+ DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname"
+
+ function find_qemu_bin() {
diff --git a/SOURCES/0728-journald-respect-KeepFree-as-well-as-MaxUse-values.patch b/SOURCES/0728-journald-respect-KeepFree-as-well-as-MaxUse-values.patch
new file mode 100644
index 0000000..531d639
--- /dev/null
+++ b/SOURCES/0728-journald-respect-KeepFree-as-well-as-MaxUse-values.patch
@@ -0,0 +1,43 @@
+From 467f1b0cec3d48ddbf61aaa000757af82394609e Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Mon, 22 Oct 2018 12:15:07 +0200
+Subject: [PATCH] journald: respect KeepFree= as well as MaxUse= values
+
+Resolves: #1361893
+---
+ src/journal/journald-server.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 88cf0b2d53..2e1e07eb0e 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -557,6 +557,8 @@ static void do_vacuum(
+ const char* path,
+ JournalMetrics *metrics) {
+
++ uint64_t total, limit = metrics->max_use;
++ struct statvfs st;
+ const char *p;
+ int r;
+
+@@ -564,7 +566,18 @@ static void do_vacuum(
+ return;
+
+ p = strjoina(path, id);
+- r = journal_directory_vacuum(p, metrics->max_use, s->max_retention_usec, &s->oldest_file_usec, false);
++
++ r = statvfs(p, &st);
++ if (r < 0) {
++ log_error_errno(r, "Failed to statvfs: %s", p);
++ return;
++ }
++
++ total = st.f_bsize * st.f_blocks;
++ if (total - metrics->keep_free < limit)
++ limit = total - metrics->keep_free;
++
++ r = journal_directory_vacuum(p, limit, s->max_retention_usec, &s->oldest_file_usec, false);
+ if (r < 0 && r != -ENOENT)
+ log_error_errno(r, "Failed to vacuum %s: %m", p);
+ }
diff --git a/SOURCES/0729-shutdown-in_container-was-used-before-its-definition.patch b/SOURCES/0729-shutdown-in_container-was-used-before-its-definition.patch
new file mode 100644
index 0000000..b3e35a2
--- /dev/null
+++ b/SOURCES/0729-shutdown-in_container-was-used-before-its-definition.patch
@@ -0,0 +1,33 @@
+From 25112918d6b54fc1136dde2eef24d6c2d33e55b3 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 28 Mar 2019 15:24:58 +0100
+Subject: [PATCH] shutdown: in_container was used before its definition
+
+RHEL-only
+Resolves: #1693716
+---
+ src/core/shutdown.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/shutdown.c b/src/core/shutdown.c
+index 0b0a54a7de..eff1cf2d59 100644
+--- a/src/core/shutdown.c
++++ b/src/core/shutdown.c
+@@ -296,6 +296,8 @@ int main(int argc, char *argv[]) {
+
+ cg_get_root_path(&cgroup);
+
++ in_container = detect_container(NULL) > 0;
++
+ use_watchdog = !!getenv("WATCHDOG_USEC");
+
+ /* lock us into memory */
+@@ -314,8 +316,6 @@ int main(int argc, char *argv[]) {
+ log_info("Sending SIGKILL to remaining processes...");
+ broadcast_signal(SIGKILL, true, false);
+
+- in_container = detect_container(NULL) > 0;
+-
+ need_umount = !in_container;
+ need_swapoff = !in_container;
+ need_loop_detach = !in_container;
diff --git a/SOURCES/0730-core-Fix-edge-case-when-processing-proc-self-mountin.patch b/SOURCES/0730-core-Fix-edge-case-when-processing-proc-self-mountin.patch
new file mode 100644
index 0000000..81a2a5f
--- /dev/null
+++ b/SOURCES/0730-core-Fix-edge-case-when-processing-proc-self-mountin.patch
@@ -0,0 +1,34 @@
+From 1c9add7cc78fc65b043f9e87ab63bb2158d2ddf0 Mon Sep 17 00:00:00 2001
+From: Kyle Walker <kwalker@redhat.com>
+Date: Thu, 21 Mar 2019 15:09:06 -0400
+Subject: [PATCH] core: Fix edge case when processing /proc/self/mountinfo
+
+Currently, if there are two /proc/self/mountinfo entries with the same
+mount point path, the mount setup flags computed for the second of
+these two entries will overwrite the mount setup flags computed for
+the first of these two entries. This is the root cause of issue #7798.
+This patch changes mount_setup_existing_unit to prevent the
+just_mounted mount setup flag from being overwritten if it is set to
+true. This will allow all mount units created from /proc/self/mountinfo
+entries to be initialized properly.
+
+(cherry picked from commit 65d36b49508a53e56bae9609ff00fdc3de340608)
+
+Resolves: #1691511
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 5fd7a86ddd..c7aed2333f 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1527,7 +1527,7 @@ static int mount_setup_unit(
+
+ if (set_flags) {
+ MOUNT(u)->is_mounted = true;
+- MOUNT(u)->just_mounted = !MOUNT(u)->from_proc_self_mountinfo;
++ MOUNT(u)->just_mounted = !MOUNT(u)->from_proc_self_mountinfo || MOUNT(u)->just_mounted;
+ MOUNT(u)->just_changed = changed;
+ }
+
diff --git a/SOURCES/0731-sd-bus-deal-with-cookie-overruns.patch b/SOURCES/0731-sd-bus-deal-with-cookie-overruns.patch
new file mode 100644
index 0000000..095d4b4
--- /dev/null
+++ b/SOURCES/0731-sd-bus-deal-with-cookie-overruns.patch
@@ -0,0 +1,104 @@
+From ac46d01c5f6a211bbbbb43e20f63ecae2549da20 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 2 Apr 2019 10:23:30 +0200
+Subject: [PATCH] sd-bus: deal with cookie overruns
+
+Apparently this happens IRL. Let's carefully deal with issues like this:
+when we overrun, let's not go back to zero but instead leave the highest
+cookie bit set. We use that as indication that we are in "overrun
+territory", and then are particularly careful with checking cookies,
+i.e. that they haven't been used for still outstanding replies yet. This
+should retain the quick cookie generation behaviour we used to have, but
+permits dealing with overruns.
+
+Replaces: #11804
+Fixes: #11809
+
+(cherry picked from commit 1f82f5bb4237ed5f015daf93f818e9db95e764b8)
+Resolves: #1693559
+---
+ src/libsystemd/sd-bus/sd-bus.c | 49 +++++++++++++++++++++++++++++++++-
+ src/shared/macro.h | 2 ++
+ 2 files changed, 50 insertions(+), 1 deletion(-)
+
+diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
+index b0a323792b..44ed2c7497 100644
+--- a/src/libsystemd/sd-bus/sd-bus.c
++++ b/src/libsystemd/sd-bus/sd-bus.c
+@@ -1495,7 +1495,50 @@ _public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) {
+ return 0;
+ }
+
++#define COOKIE_CYCLED (UINT32_C(1) << 31)
++
++static uint64_t cookie_inc(uint64_t cookie) {
++
++ /* Stay within the 32bit range, since classic D-Bus can't deal with more */
++ if (cookie >= UINT32_MAX)
++ return COOKIE_CYCLED; /* Don't go back to zero, but use the highest bit for checking
++ * whether we are looping. */
++
++ return cookie + 1;
++}
++
++static int next_cookie(sd_bus *b) {
++ uint64_t new_cookie;
++
++ assert(b);
++
++ new_cookie = cookie_inc(b->cookie);
++
++ /* Small optimization: don't bother with checking for cookie reuse until we overran cookiespace at
++ * least once, but then do it thorougly. */
++ if (FLAGS_SET(new_cookie, COOKIE_CYCLED)) {
++ uint32_t i;
++
++ /* Check if the cookie is currently in use. If so, pick the next one */
++ for (i = 0; i < COOKIE_CYCLED; i++) {
++ if (!ordered_hashmap_contains(b->reply_callbacks, &new_cookie))
++ goto good;
++
++ new_cookie = cookie_inc(new_cookie);
++ }
++
++ /* Can't fulfill request */
++ return -EBUSY;
++ }
++
++good:
++ b->cookie = new_cookie;
++ return 0;
++}
++
+ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
++ int r;
++
+ assert(b);
+ assert(m);
+
+@@ -1510,7 +1553,11 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
+ if (timeout == 0)
+ timeout = BUS_DEFAULT_TIMEOUT;
+
+- return bus_message_seal(m, ++b->cookie, timeout);
++ r = next_cookie(b);
++ if (r < 0)
++ return r;
++
++ return bus_message_seal(m, b->cookie, timeout);
+ }
+
+ static int bus_remarshal_message(sd_bus *b, sd_bus_message **m) {
+diff --git a/src/shared/macro.h b/src/shared/macro.h
+index 26df270d51..d4cdb1d08b 100644
+--- a/src/shared/macro.h
++++ b/src/shared/macro.h
+@@ -401,6 +401,8 @@ do { \
+
+ #define SET_FLAG(v, flag, b) \
+ (v) = (b) ? ((v) | (flag)) : ((v) & ~(flag))
++#define FLAGS_SET(v, flags) \
++ ((~(v) & (flags)) == 0)
+
+ #define IN_SET(x, y, ...) \
+ ({ \
diff --git a/SOURCES/0732-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/SOURCES/0732-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
new file mode 100644
index 0000000..458e8d0
--- /dev/null
+++ b/SOURCES/0732-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
@@ -0,0 +1,47 @@
+From efecb8966520f1782501f8f5f05c89fde0c19deb Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <rschiron@redhat.com>
+Date: Mon, 4 Feb 2019 14:29:09 +0100
+Subject: [PATCH] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX
+ limit.
+
+Even though the dbus specification does not enforce any length limit on the
+path of a dbus message, having to analyze too long strings in PID1 may be
+time-consuming and it may have security impacts.
+
+In any case, the limit is set so high that real-life applications should not
+have a problem with it.
+
+Related: #1667871
+---
+ src/libsystemd/sd-bus/bus-internal.c | 2 +-
+ src/libsystemd/sd-bus/bus-internal.h | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
+index 91b288cd25..c952d63e10 100644
+--- a/src/libsystemd/sd-bus/bus-internal.c
++++ b/src/libsystemd/sd-bus/bus-internal.c
+@@ -58,7 +58,7 @@ bool object_path_is_valid(const char *p) {
+ if (slash)
+ return false;
+
+- return true;
++ return (q - p) <= BUS_PATH_SIZE_MAX;
+ }
+
+ char* object_path_startswith(const char *a, const char *b) {
+diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
+index 9c1e5a35b8..1c5fbeac2a 100644
+--- a/src/libsystemd/sd-bus/bus-internal.h
++++ b/src/libsystemd/sd-bus/bus-internal.h
+@@ -331,6 +331,10 @@ struct sd_bus {
+
+ #define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
+ #define BUS_AUTH_SIZE_MAX (64*1024)
++/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
++ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
++ * to not clash unnecessarily with real-life applications. */
++#define BUS_PATH_SIZE_MAX (64*1024)
+
+ #define BUS_CONTAINER_DEPTH 128
+
diff --git a/SOURCES/0733-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/SOURCES/0733-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
new file mode 100644
index 0000000..fadf781
--- /dev/null
+++ b/SOURCES/0733-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
@@ -0,0 +1,170 @@
+From 8f77b455f768d1f95971cedd8d4903f249f683bf Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <rschiron@redhat.com>
+Date: Mon, 4 Feb 2019 14:29:28 +0100
+Subject: [PATCH] Allocate temporary strings to hold dbus paths on the heap
+
+Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big
+to be allocated on the stack, so let's switch to the heap where there is a
+clear way to understand if the allocation fails.
+
+Resolves: #1667871
+---
+ src/libsystemd/sd-bus/bus-objects.c | 58 +++++++++++++++++++++++------
+ 1 file changed, 46 insertions(+), 12 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
+index fc6c223283..8df73bdf4c 100644
+--- a/src/libsystemd/sd-bus/bus-objects.c
++++ b/src/libsystemd/sd-bus/bus-objects.c
+@@ -1104,7 +1104,8 @@ static int object_manager_serialize_path_and_fallbacks(
+ const char *path,
+ sd_bus_error *error) {
+
+- char *prefix;
++ _cleanup_free_ char *prefix = NULL;
++ size_t pl;
+ int r;
+
+ assert(bus);
+@@ -1120,7 +1121,12 @@ static int object_manager_serialize_path_and_fallbacks(
+ return 0;
+
+ /* Second, add fallback vtables registered for any of the prefixes */
+- prefix = alloca(strlen(path) + 1);
++ pl = strlen(path);
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
++
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
+ if (r < 0)
+@@ -1316,6 +1322,7 @@ static int object_find_and_run(
+ }
+
+ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
++ _cleanup_free_ char *prefix = NULL;
+ int r;
+ size_t pl;
+ bool found_object = false;
+@@ -1340,9 +1347,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
+ assert(m->member);
+
+ pl = strlen(m->path);
+- do {
+- char prefix[pl+1];
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
+
++ do {
+ bus->nodes_modified = false;
+
+ r = object_find_and_run(bus, m, m->path, false, &found_object);
+@@ -2044,9 +2054,10 @@ _public_ int sd_bus_emit_properties_changed_strv(
+ const char *interface,
+ char **names) {
+
++ _cleanup_free_ char *prefix = NULL;
+ BUS_DONT_DESTROY(bus);
+ bool found_interface = false;
+- char *prefix;
++ size_t pl;
+ int r;
+
+ assert_return(bus, -EINVAL);
+@@ -2064,6 +2075,12 @@ _public_ int sd_bus_emit_properties_changed_strv(
+ if (names && names[0] == NULL)
+ return 0;
+
++ pl = strlen(path);
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
++
+ do {
+ bus->nodes_modified = false;
+
+@@ -2073,7 +2090,6 @@ _public_ int sd_bus_emit_properties_changed_strv(
+ if (bus->nodes_modified)
+ continue;
+
+- prefix = alloca(strlen(path) + 1);
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names);
+ if (r != 0)
+@@ -2204,7 +2220,8 @@ static int object_added_append_all_prefix(
+
+ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
+ _cleanup_set_free_ Set *s = NULL;
+- char *prefix;
++ _cleanup_free_ char *prefix = NULL;
++ size_t pl;
+ int r;
+
+ assert(bus);
+@@ -2249,7 +2266,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
+ if (bus->nodes_modified)
+ return 0;
+
+- prefix = alloca(strlen(path) + 1);
++ pl = strlen(path);
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
++
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = object_added_append_all_prefix(bus, m, s, prefix, path, true);
+ if (r < 0)
+@@ -2380,7 +2402,8 @@ static int object_removed_append_all_prefix(
+
+ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
+ _cleanup_set_free_ Set *s = NULL;
+- char *prefix;
++ _cleanup_free_ char *prefix = NULL;
++ size_t pl;
+ int r;
+
+ assert(bus);
+@@ -2412,7 +2435,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
+ if (bus->nodes_modified)
+ return 0;
+
+- prefix = alloca(strlen(path) + 1);
++ pl = strlen(path);
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
++
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = object_removed_append_all_prefix(bus, m, s, prefix, path, true);
+ if (r < 0)
+@@ -2554,7 +2582,8 @@ static int interfaces_added_append_one(
+ const char *path,
+ const char *interface) {
+
+- char *prefix;
++ _cleanup_free_ char *prefix = NULL;
++ size_t pl;
+ int r;
+
+ assert(bus);
+@@ -2568,7 +2597,12 @@ static int interfaces_added_append_one(
+ if (bus->nodes_modified)
+ return 0;
+
+- prefix = alloca(strlen(path) + 1);
++ pl = strlen(path);
++ assert(pl <= BUS_PATH_SIZE_MAX);
++ prefix = new(char, pl + 1);
++ if (!prefix)
++ return -ENOMEM;
++
+ OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
+ r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
+ if (r != 0)
diff --git a/SOURCES/0734-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch b/SOURCES/0734-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
new file mode 100644
index 0000000..fc83219
--- /dev/null
+++ b/SOURCES/0734-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
@@ -0,0 +1,55 @@
+From 1c53e6f5a6bf9ecd5196518fc824af22c6996141 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 13 Feb 2019 16:51:22 +0100
+Subject: [PATCH] sd-bus: if we receive an invalid dbus message, ignore and
+ proceeed
+
+dbus-daemon might have a slightly different idea of what a valid msg is
+than us (for example regarding valid msg and field sizes). Let's hence
+try to proceed if we can and thus drop messages rather than fail the
+connection if we fail to validate a message.
+
+Hopefully the differences in what is considered valid are not visible
+for real-life usecases, but are specific to exploit attempts only.
+
+(cherry-picked from commit 6d586a13717ae057aa1b4127400c3de61cd5b9e7)
+
+Related: #1667871
+---
+ src/libsystemd/sd-bus/bus-socket.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
+index ab56ef4f33..4437024bb9 100644
+--- a/src/libsystemd/sd-bus/bus-socket.c
++++ b/src/libsystemd/sd-bus/bus-socket.c
+@@ -879,7 +879,7 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
+ }
+
+ static int bus_socket_make_message(sd_bus *bus, size_t size) {
+- sd_bus_message *t;
++ sd_bus_message *t = NULL;
+ void *b;
+ int r;
+
+@@ -905,7 +905,9 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
+ NULL,
+ NULL,
+ &t);
+- if (r < 0) {
++ if (r == -EBADMSG)
++ log_debug_errno(r, "Received invalid message from connection %s, dropping.", strna(bus->description));
++ else if (r < 0) {
+ free(b);
+ return r;
+ }
+@@ -916,7 +918,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
+ bus->fds = NULL;
+ bus->n_fds = 0;
+
+- bus->rqueue[bus->rqueue_size++] = t;
++ if (t)
++ bus->rqueue[bus->rqueue_size++] = t;
+
+ return 1;
+ }
diff --git a/SOURCES/0735-udev-check-if-the-spawned-PID-didn-t-exit-after-reap.patch b/SOURCES/0735-udev-check-if-the-spawned-PID-didn-t-exit-after-reap.patch
new file mode 100644
index 0000000..2c2883c
--- /dev/null
+++ b/SOURCES/0735-udev-check-if-the-spawned-PID-didn-t-exit-after-reap.patch
@@ -0,0 +1,62 @@
+From 2d8d8b2d713a3b0c0aad0552608cc2cd13583207 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Fri, 26 Apr 2019 19:20:09 +0200
+Subject: [PATCH] udev: check if the spawned PID didn't exit after reaping
+ unexpected PID
+
+We shouldn't just continue after getting SIGCHLD for the unexpected
+process because signal coalescing might have happened. If it actually
+did happen we won't get any more SIGCHLDs on signalfd.
+
+Related: #1697909
+---
+ src/udev/udev-event.c | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 0ba079201c..7fe64f04a4 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -597,8 +597,9 @@ static int spawn_wait(struct udev_event *event,
+ }
+
+ if (pfd[0].revents & POLLIN) {
++ int child_exited = -1;
+ struct signalfd_siginfo fdsi;
+- int status;
++ int status, r;
+ ssize_t size;
+
+ size = read(event->fd_signal, &fdsi, sizeof(struct signalfd_siginfo));
+@@ -612,10 +613,28 @@ static int spawn_wait(struct udev_event *event,
+ case SIGCHLD:
+ if (pid != (pid_t) fdsi.ssi_pid) {
+ log_debug("expected SIGCHLD from '%s' ["PID_FMT"] received from unknown process ["PID_FMT"]. Ignoring", cmd, pid, fdsi.ssi_pid);
+- continue;
++
++ /* We got SIGCHLD from unexpected process. Possibly some library that we use forked off something behind our back.
++ In case the PID we wait for also exited the kernel could coalesce SIGCHLDs and we won't get second SIGCHLD
++ on the signalfd. We can't know if coalescing happened or not, hence we need to call waitpid() in a loop until
++ the PID we care for exits, we if it haven't already. */
++ while (child_exited < 0) {
++ r = waitpid(-1, &status, 0);
++ if (r < 0 && errno == EINTR)
++ continue;
++ else if (r < 0)
++ break;
++ else if (r == pid)
++ child_exited = 0;
++ }
+ }
+- if (waitpid(pid, &status, WNOHANG) <= 0)
+- break;
++
++ /* We didn't wait for child yet, let's do that now */
++ if (child_exited < 0) {
++ if (waitpid(pid, &status, WNOHANG) <= 0)
++ break;
++ }
++
+ if (WIFEXITED(status)) {
+ log_debug("'%s' ["PID_FMT"] exit with return code %i", cmd, pid, WEXITSTATUS(status));
+ if (WEXITSTATUS(status) != 0)
diff --git a/SOURCES/0736-udev-call-poll-again-after-killing-the-spawned-proce.patch b/SOURCES/0736-udev-call-poll-again-after-killing-the-spawned-proce.patch
new file mode 100644
index 0000000..c971cb6
--- /dev/null
+++ b/SOURCES/0736-udev-call-poll-again-after-killing-the-spawned-proce.patch
@@ -0,0 +1,31 @@
+From c34ec3588a40e595bb837f3c12e44808c7cd20fd Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 1 May 2019 15:52:42 +0200
+Subject: [PATCH] udev: call poll() again after killing the spawned process
+
+Later we check .revents of pfd. Hence we need to initialize it properly
+and to do that we need to call poll() once again because previously it
+exited twice with timeout and hence left pfd uninitialized. For the
+third time it should return immediately since we killed the spawned
+process with SIGKILL.
+
+Related: #1697909
+---
+ src/udev/udev-event.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 7fe64f04a4..07b82d093e 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -593,6 +593,10 @@ static int spawn_wait(struct udev_event *event,
+ if (fdcount == 0) {
+ log_error("timeout: killing '%s' ["PID_FMT"]", cmd, pid);
+ kill(pid, SIGKILL);
++
++ fdcount = poll(pfd, 1, 1000);
++ if (fdcount <= 0)
++ continue;
+ }
+ }
+
diff --git a/SOURCES/0737-udev-check-age-against-both-timeouts-to-prevent-inte.patch b/SOURCES/0737-udev-check-age-against-both-timeouts-to-prevent-inte.patch
new file mode 100644
index 0000000..9d8ad2a
--- /dev/null
+++ b/SOURCES/0737-udev-check-age-against-both-timeouts-to-prevent-inte.patch
@@ -0,0 +1,41 @@
+From 2b0874a8a0ff4bced5da0c25a4b3f3fbd2595e23 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 1 May 2019 15:58:44 +0200
+Subject: [PATCH] udev: check age against both timeouts to prevent integer
+ wraparound
+
+If we get back to while loop after timeout_warn (roughly 60s)
+expired for the first time, but before age of the event is larger than
+second timeout (roughly 120s) we would try to recompute timeout_warn
+again. Previously the following code,
+
+if (timeout_warn_usec > 0)
+ timeout_warn = ((timeout_warn_usec - age_usec) / USEC_PER_MSEC) + MSEC_PER_SEC;
+
+would cause an integer wraparound because (timeout_warn_usec - age_usec)
+is negative however both timeout_warn_usec and age_usec are
+unsigned.
+
+This can happen if we get SIGTERM from the main daemon while waiting in
+the second poll(), i.e. after timeout_warn already expired, because on
+SIGTERM we just take a note of that happening in event->sigterm and
+continue.
+
+Related: #1697909
+---
+ src/udev/udev-event.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 07b82d093e..5550ec93de 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -559,7 +559,7 @@ static int spawn_wait(struct udev_event *event,
+ usec_t age_usec;
+
+ age_usec = now(CLOCK_MONOTONIC) - event->birth_usec;
+- if (age_usec >= timeout_usec)
++ if (age_usec >= timeout_usec || age_usec >= timeout_warn_usec)
+ timeout = 1000;
+ else {
+ if (timeout_warn_usec > 0)
diff --git a/SOURCES/0738-avoid-possible-hang-if-our-child-process-hangs.patch b/SOURCES/0738-avoid-possible-hang-if-our-child-process-hangs.patch
new file mode 100644
index 0000000..336e895
--- /dev/null
+++ b/SOURCES/0738-avoid-possible-hang-if-our-child-process-hangs.patch
@@ -0,0 +1,52 @@
+From 64d0115dcda445a5b1c069f696a363730f654425 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 2 May 2019 12:55:04 +0200
+Subject: [PATCH] avoid possible hang if our child process hangs
+
+If there is one or more unexpected child processes that terminate, but
+the "main" child process hangs, we will loop through the terminated
+children and then, eventually, get stuck in the waitpid() call. Let's
+repeat the main cycle if that situation happens, as that allows us to
+finish after timeout.
+
+Related: #1697909
+---
+ src/udev/udev-event.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
+index 5550ec93de..79b8614ec2 100644
+--- a/src/udev/udev-event.c
++++ b/src/udev/udev-event.c
+@@ -605,6 +605,7 @@ static int spawn_wait(struct udev_event *event,
+ struct signalfd_siginfo fdsi;
+ int status, r;
+ ssize_t size;
++ bool wait_again = false;
+
+ size = read(event->fd_signal, &fdsi, sizeof(struct signalfd_siginfo));
+ if (size != sizeof(struct signalfd_siginfo))
+@@ -622,15 +623,21 @@ static int spawn_wait(struct udev_event *event,
+ In case the PID we wait for also exited the kernel could coalesce SIGCHLDs and we won't get second SIGCHLD
+ on the signalfd. We can't know if coalescing happened or not, hence we need to call waitpid() in a loop until
+ the PID we care for exits, we if it haven't already. */
+- while (child_exited < 0) {
+- r = waitpid(-1, &status, 0);
++ while (child_exited < 0 && !wait_again) {
++ r = waitpid(-1, &status, WNOHANG);
+ if (r < 0 && errno == EINTR)
+ continue;
+ else if (r < 0)
+ break;
+ else if (r == pid)
+ child_exited = 0;
++ else if (r == 0)
++ wait_again = true;
+ }
++
++ /* Only unexpected process(es) have been terminated. Continue waiting */
++ if (wait_again)
++ continue;
+ }
+
+ /* We didn't wait for child yet, let's do that now */
diff --git a/SOURCES/0739-missing-when-adding-syscall-replacements-use-differe.patch b/SOURCES/0739-missing-when-adding-syscall-replacements-use-differe.patch
new file mode 100644
index 0000000..e41537d
--- /dev/null
+++ b/SOURCES/0739-missing-when-adding-syscall-replacements-use-differe.patch
@@ -0,0 +1,144 @@
+From 2cbb8dd0984e46b8650678c69f426d06e37c117b Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Thu, 4 Apr 2019 11:23:59 +0200
+Subject: [PATCH] missing: when adding syscall replacements, use different
+ names
+
+Based on 5187dd2c403caf92d09f3491e41f1ceb3f10491f
+
+Resolves: #1694605
+---
+ src/shared/missing.h | 40 ++++++++++++++++++++++++++++++----------
+ 1 file changed, 30 insertions(+), 10 deletions(-)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index a7771bc996..4596b2b494 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -127,9 +127,11 @@
+ #endif
+
+ #if !HAVE_DECL_PIVOT_ROOT
+-static inline int pivot_root(const char *new_root, const char *put_old) {
++static inline int missing_pivot_root(const char *new_root, const char *put_old) {
+ return syscall(SYS_pivot_root, new_root, put_old);
+ }
++
++#define pivot_root missing_pivot_root
+ #endif
+
+ #ifndef __NR_memfd_create
+@@ -197,13 +199,15 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
+ #endif
+
+ #ifndef HAVE_FANOTIFY_INIT
+-static inline int fanotify_init(unsigned int flags, unsigned int event_f_flags) {
++static inline int missing_fanotify_init(unsigned int flags, unsigned int event_f_flags) {
+ return syscall(__NR_fanotify_init, flags, event_f_flags);
+ }
++
++#define fanotify_init missing_fanotify_init
+ #endif
+
+ #ifndef HAVE_FANOTIFY_MARK
+-static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
++static inline int missing_fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t mask,
+ int dfd, const char *pathname) {
+ #if defined _MIPS_SIM && _MIPS_SIM == _MIPS_SIM_ABI32 || defined __powerpc__ && !defined __powerpc64__ \
+ || defined __arm__ && !defined __aarch64__
+@@ -219,12 +223,16 @@ static inline int fanotify_mark(int fanotify_fd, unsigned int flags, uint64_t ma
+ return syscall(__NR_fanotify_mark, fanotify_fd, flags, mask, dfd, pathname);
+ #endif
+ }
++
++#define fanotify_mark missing_fanotify_mark
+ #endif
+
+ #ifndef HAVE_MEMFD_CREATE
+-static inline int memfd_create(const char *name, unsigned int flags) {
++static inline int missing_memfd_create(const char *name, unsigned int flags) {
+ return syscall(__NR_memfd_create, name, flags);
+ }
++
++#define memfd_create missing_memfd_create
+ #endif
+
+ #ifndef __NR_getrandom
+@@ -261,9 +269,11 @@ static inline int memfd_create(const char *name, unsigned int flags) {
+ #endif
+
+ #if !HAVE_DECL_GETRANDOM
+-static inline int getrandom(void *buffer, size_t count, unsigned flags) {
++static inline int missing_getrandom(void *buffer, size_t count, unsigned flags) {
+ return syscall(__NR_getrandom, buffer, count, flags);
+ }
++
++#define getrandom missing_getrandom
+ #endif
+
+ #ifndef GRND_NONBLOCK
+@@ -529,9 +539,11 @@ struct btrfs_ioctl_clone_range_args {
+ #endif
+
+ #if !HAVE_DECL_GETTID
+-static inline pid_t gettid(void) {
++static inline pid_t missing_gettid(void) {
+ return (pid_t) syscall(SYS_gettid);
+ }
++
++#define gettid missing_gettid
+ #endif
+
+ #ifndef SCM_SECURITY
+@@ -583,9 +595,11 @@ struct file_handle {
+ unsigned char f_handle[0];
+ };
+
+-static inline int name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) {
++static inline int missing_name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) {
+ return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
+ }
++
++#define name_to_handle_at missing_name_to_handle_at
+ #endif
+
+ #ifndef HAVE_SECURE_GETENV
+@@ -647,9 +661,11 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #endif
+
+ #if !HAVE_DECL_SETNS
+-static inline int setns(int fd, int nstype) {
++static inline int missing_setns(int fd, int nstype) {
+ return syscall(__NR_setns, fd, nstype);
+ }
++
++#define setns missing_setns
+ #endif
+
+ #if !HAVE_DECL_LO_FLAGS_PARTSCAN
+@@ -986,9 +1002,11 @@ static inline pid_t raw_getpid(void) {
+ # endif
+ #endif
+
+-static inline int renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) {
++static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) {
+ return syscall(__NR_renameat2, oldfd, oldname, newfd, newname, flags);
+ }
++
++#define renameat2 missing_renameat2
+ #endif
+
+ #ifndef RENAME_NOREPLACE
+@@ -996,9 +1014,11 @@ static inline int renameat2(int oldfd, const char *oldname, int newfd, const cha
+ #endif
+
+ #if !HAVE_DECL_KCMP
+-static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
++static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) {
+ return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2);
+ }
++
++#define kcmp missing_kcmp
+ #endif
+
+ #ifndef KCMP_FILE
diff --git a/SOURCES/0740-include-sys-sysmacros.h-in-more-places.patch b/SOURCES/0740-include-sys-sysmacros.h-in-more-places.patch
new file mode 100644
index 0000000..d275bff
--- /dev/null
+++ b/SOURCES/0740-include-sys-sysmacros.h-in-more-places.patch
@@ -0,0 +1,67 @@
+From 747f3af70c0ee9089e520ccd8917ded397a5cd2a Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <fsumsal@redhat.com>
+Date: Thu, 4 Apr 2019 12:21:45 +0200
+Subject: [PATCH] include sys/sysmacros.h in more places
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places. This seems to cover most makedev/major/minor usage.
+
+(cherry picked from commit 27d13af71c3af6b2f9b60556d2c046dbb6e36e23)
+
+Resolves: #1694605
+---
+ src/libudev/libudev.h | 1 +
+ src/shared/macro.h | 1 +
+ src/shared/util.h | 1 +
+ src/udev/udev.h | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
+index a94505c09e..cfff02746d 100644
+--- a/src/libudev/libudev.h
++++ b/src/libudev/libudev.h
+@@ -23,6 +23,7 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+diff --git a/src/shared/macro.h b/src/shared/macro.h
+index d4cdb1d08b..d490406483 100644
+--- a/src/shared/macro.h
++++ b/src/shared/macro.h
+@@ -23,6 +23,7 @@
+
+ #include <assert.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
+ #include <inttypes.h>
+diff --git a/src/shared/util.h b/src/shared/util.h
+index d89f0d34a1..538ca4be2d 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -45,6 +45,7 @@
+ #include <mntent.h>
+ #include <sys/socket.h>
+ #include <sys/inotify.h>
++#include <sys/sysmacros.h>
+ #include <glob.h>
+
+ #if SIZEOF_PID_T == 4
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index dece6eccab..281b2e5ce5 100644
+--- a/src/udev/udev.h
++++ b/src/udev/udev.h
+@@ -20,6 +20,7 @@
+
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <signal.h>
+
+ #include "macro.h"
diff --git a/SOURCES/0741-sd-bus-unify-three-code-paths-which-free-struct-bus_.patch b/SOURCES/0741-sd-bus-unify-three-code-paths-which-free-struct-bus_.patch
new file mode 100644
index 0000000..58697c5
--- /dev/null
+++ b/SOURCES/0741-sd-bus-unify-three-code-paths-which-free-struct-bus_.patch
@@ -0,0 +1,160 @@
+From 0c4a78cc276249e51bcaa50b29df3efcf6d22ec3 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 12 Feb 2019 11:10:59 +0100
+Subject: [PATCH] sd-bus: unify three code-paths which free struct
+ bus_container
+
+We didn't free one of the fields in two of the places.
+
+$ valgrind --show-leak-kinds=all --leak-check=full \
+ build/fuzz-bus-message \
+ test/fuzz/fuzz-bus-message/leak-c09c0e2256d43bc5e2d02748c8d8760e7bc25d20
+...
+==14457== HEAP SUMMARY:
+==14457== in use at exit: 3 bytes in 1 blocks
+==14457== total heap usage: 509 allocs, 508 frees, 51,016 bytes allocated
+==14457==
+==14457== 3 bytes in 1 blocks are definitely lost in loss record 1 of 1
+==14457== at 0x4C2EBAB: malloc (vg_replace_malloc.c:299)
+==14457== by 0x53AFE79: strndup (in /usr/lib64/libc-2.27.so)
+==14457== by 0x4F52EB8: free_and_strndup (string-util.c:1039)
+==14457== by 0x4F8E1AB: sd_bus_message_peek_type (bus-message.c:4193)
+==14457== by 0x4F76CB5: bus_message_dump (bus-dump.c:144)
+==14457== by 0x108F12: LLVMFuzzerTestOneInput (fuzz-bus-message.c:24)
+==14457== by 0x1090F7: main (fuzz-main.c:34)
+==14457==
+==14457== LEAK SUMMARY:
+==14457== definitely lost: 3 bytes in 1 blocks
+
+(cherry picked from commit 6d1e0f4fcba8d6f425da3dc91805db95399b3c8b)
+Resolves: #1643394
+---
+ src/libsystemd/sd-bus/bus-message.c | 66 +++++++++++++++--------------
+ 1 file changed, 35 insertions(+), 31 deletions(-)
+
+diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
+index 121e65674d..b786f943e4 100644
+--- a/src/libsystemd/sd-bus/bus-message.c
++++ b/src/libsystemd/sd-bus/bus-message.c
+@@ -104,20 +104,42 @@ static void message_reset_parts(sd_bus_message *m) {
+ m->cached_rindex_part_begin = 0;
+ }
+
+-static void message_reset_containers(sd_bus_message *m) {
+- unsigned i;
++static struct bus_container *message_get_container(sd_bus_message *m) {
++ assert(m);
++
++ if (m->n_containers == 0)
++ return &m->root_container;
++
++ assert(m->containers);
++ return m->containers + m->n_containers - 1;
++}
++
++static void message_free_last_container(sd_bus_message *m) {
++ struct bus_container *c;
+
++ c = message_get_container(m);
++
++ free(c->signature);
++ free(c->peeked_signature);
++ free(c->offsets);
++
++ /* Move to previous container, but not if we are on root container */
++ if (m->n_containers > 0)
++ m->n_containers--;
++}
++
++
++
++static void message_reset_containers(sd_bus_message *m) {
+ assert(m);
+
+- for (i = 0; i < m->n_containers; i++) {
+- free(m->containers[i].signature);
+- free(m->containers[i].offsets);
+- }
++ while (m->n_containers > 0)
++ message_free_last_container(m);
+
+ free(m->containers);
+ m->containers = NULL;
+
+- m->n_containers = m->containers_allocated = 0;
++ m->containers_allocated = 0;
+ m->root_container.index = 0;
+ }
+
+@@ -151,10 +173,8 @@ static void message_free(sd_bus_message *m) {
+ }
+
+ message_reset_containers(m);
+- free(m->root_container.signature);
+- free(m->root_container.offsets);
+-
+- free(m->root_container.peeked_signature);
++ assert(m->n_containers == 0);
++ message_free_last_container(m);
+
+ bus_creds_done(&m->creds);
+ free(m);
+@@ -1179,16 +1199,6 @@ _public_ int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *
+ return 0;
+ }
+
+-static struct bus_container *message_get_container(sd_bus_message *m) {
+- assert(m);
+-
+- if (m->n_containers == 0)
+- return &m->root_container;
+-
+- assert(m->containers);
+- return m->containers + m->n_containers - 1;
+-}
+-
+ struct bus_body_part *message_append_part(sd_bus_message *m) {
+ struct bus_body_part *part;
+
+@@ -2107,6 +2117,7 @@ _public_ int sd_bus_message_open_container(
+ w = m->containers + m->n_containers++;
+ w->enclosing = type;
+ w->signature = signature;
++ w->peeked_signature = NULL;
+ w->index = 0;
+ w->array_size = array_size;
+ w->before = before;
+@@ -4195,13 +4206,9 @@ _public_ int sd_bus_message_exit_container(sd_bus_message *m) {
+ return -EBUSY;
+ }
+
+- free(c->signature);
+- free(c->peeked_signature);
+- free(c->offsets);
+- m->n_containers--;
++ message_free_last_container(m);
+
+ c = message_get_container(m);
+-
+ saved = c->index;
+ c->index = c->saved_index;
+ r = container_next_item(m, c, &m->rindex);
+@@ -4219,16 +4226,13 @@ static void message_quit_container(sd_bus_message *m) {
+ assert(m->sealed);
+ assert(m->n_containers > 0);
+
+- c = message_get_container(m);
+-
+ /* Undo seeks */
++ c = message_get_container(m);
+ assert(m->rindex >= c->before);
+ m->rindex = c->before;
+
+ /* Free container */
+- free(c->signature);
+- free(c->offsets);
+- m->n_containers--;
++ message_free_last_container(m);
+
+ /* Correct index of new top-level container */
+ c = message_get_container(m);
diff --git a/SOURCES/0742-hashmap-don-t-use-mempool.patch b/SOURCES/0742-hashmap-don-t-use-mempool.patch
new file mode 100644
index 0000000..f44efa1
--- /dev/null
+++ b/SOURCES/0742-hashmap-don-t-use-mempool.patch
@@ -0,0 +1,26 @@
+From 7ae5fed80b6d7dbe70a36e85ab05415b11bbbc00 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 5 Mar 2019 10:21:55 +0100
+Subject: [PATCH] hashmap: don't use mempool
+
+RHEL-only
+
+Resolves: #1609349
+---
+ src/shared/hashmap.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
+index e63ba4bb5a..c05f79a393 100644
+--- a/src/shared/hashmap.c
++++ b/src/shared/hashmap.c
+@@ -776,7 +776,8 @@ static struct HashmapBase *hashmap_base_new(const struct hash_ops *hash_ops, enu
+ const struct hashmap_type_info *hi = &hashmap_type_info[type];
+ bool use_pool;
+
+- use_pool = is_main_thread();
++ /* RHEL-only. See #1609349. */
++ use_pool = false;
+
+ h = use_pool ? mempool_alloc0_tile(hi->mempool) : malloc0(hi->head_size);
+
diff --git a/SOURCES/0743-man-be-more-explicit-about-thread-safety-of-sd_journ.patch b/SOURCES/0743-man-be-more-explicit-about-thread-safety-of-sd_journ.patch
new file mode 100644
index 0000000..9ca3786
--- /dev/null
+++ b/SOURCES/0743-man-be-more-explicit-about-thread-safety-of-sd_journ.patch
@@ -0,0 +1,395 @@
+From dd004bcc058dbb7c66b8eb1a728732ccfce746c7 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Tue, 5 Mar 2019 10:45:07 +0100
+Subject: [PATCH] man: be more explicit about thread safety of sd_journal
+
+This adds two generic paragaphs we include via xinclude. One is the
+"strict" version, which contains wording saying that we are thread
+agnostic and what that means. And the other is the "safe" version, for
+the cases we provide fully safety.
+
+Let's then change most man pages to use either of these generic
+paragraphs. With one exception: man/sd_journal_get_catalog.xml contains
+both kinds of function, we hence use manual wording.
+
+(cherry picked from commit 64a7ef8bc06b5dcfcd9f99ea10a43bde75c4370f)
+
+Related: #1609349
+---
+ man/sd-journal.xml | 14 ++++++++++++++
+ man/sd_journal_get_catalog.xml | 9 +++++++++
+ man/sd_journal_get_cursor.xml | 4 +++-
+ man/sd_journal_get_cutoff_realtime_usec.xml | 4 +++-
+ man/sd_journal_get_data.xml | 4 +++-
+ man/sd_journal_get_fd.xml | 4 +++-
+ man/sd_journal_get_realtime_usec.xml | 4 +++-
+ man/sd_journal_get_usage.xml | 4 +++-
+ man/sd_journal_has_runtime_files.xml | 8 +++++++-
+ man/sd_journal_next.xml | 4 +++-
+ man/sd_journal_open.xml | 4 +++-
+ man/sd_journal_print.xml | 4 +++-
+ man/sd_journal_query_unique.xml | 4 +++-
+ man/sd_journal_seek_head.xml | 4 +++-
+ man/sd_journal_stream_fd.xml | 4 +++-
+ man/threads-aware.xml | 17 +++++++++++++++++
+ 16 files changed, 83 insertions(+), 13 deletions(-)
+ create mode 100644 man/threads-aware.xml
+
+diff --git a/man/sd-journal.xml b/man/sd-journal.xml
+index a1185d372b..11af4cd9b9 100644
+--- a/man/sd-journal.xml
++++ b/man/sd-journal.xml
+@@ -97,6 +97,20 @@
+ tool.</para>
+ </refsect1>
+
++ <refsect1>
++ <title>Thread safety</title>
++
++ <para>Functions that operate on <structname>sd_journal</structname> objects are thread agnostic — given
++ <structname>sd_journal</structname> pointer may only be used from one specific thread at all times (and it has to
++ be the very same one during the entire lifetime of the object), but multiple, independent threads may use multiple,
++ independent objects safely. Other functions — those that are used to send entries to the journal, like
++ <citerefentry><refentrytitle>sd_journal_print</refentrytitle><manvolnum>3</manvolnum></citerefentry> and similar,
++ or those that are used to retrieve global information like
++ <citerefentry><refentrytitle>sd_journal_stream_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
++ <citerefentry><refentrytitle>sd_journal_get_catalog_for_message_id</refentrytitle><manvolnum>3</manvolnum></citerefentry>
++ are fully thread-safe and may be called from multiple threads in parallel.</para>
++ </refsect1>
++
+ <xi:include href="libsystemd-pkgconfig.xml" />
+
+ <refsect1>
+diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
+index c19eb11b20..86eb659fe5 100644
+--- a/man/sd_journal_get_catalog.xml
++++ b/man/sd_journal_get_catalog.xml
+@@ -112,6 +112,15 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <para>Function <function>sd_journal_get_catalog()</function> is thread-agnostic and only
++ a single specific thread may operate on a given object during its entire lifetime. It's safe to allocate multiple
++ independent objects and use each from a specific thread in parallel. However, it's not safe to allocate such an
++ object in one thread, and operate or free it from any other, even if locking is used to ensure these threads don't
++ operate on it at the very same time.</para>
++
++ <para>Function <function>sd_journal_get_catalog_for_message_id()</function> is are thread-safe and may be called in
++ parallel from multiple threads.</para>
++
+ <para>The <function>sd_journal_get_catalog()</function> and
+ <function>sd_journal_get_catalog_for_message_id()</function>
+ interfaces are available as a shared library, which can be
+diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
+index a400d8b1b5..0a20c36146 100644
+--- a/man/sd_journal_get_cursor.xml
++++ b/man/sd_journal_get_cursor.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_cursor">
++<refentry id="sd_journal_get_cursor" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_cursor</title>
+@@ -122,6 +122,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict" />
++
+ <para>The <function>sd_journal_get_cursor()</function> and
+ <function>sd_journal_test_cursor()</function> interfaces are
+ available as a shared library, which can be compiled and linked to
+diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
+index 23e7cc65e8..782228009d 100644
+--- a/man/sd_journal_get_cutoff_realtime_usec.xml
++++ b/man/sd_journal_get_cutoff_realtime_usec.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_cutoff_realtime_usec">
++<refentry id="sd_journal_get_cutoff_realtime_usec" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_cutoff_realtime_usec</title>
+@@ -120,6 +120,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict" />
++
+ <para>The
+ <function>sd_journal_get_cutoff_realtime_usec()</function> and
+ <function>sd_journal_get_cutoff_monotonic_usec()</function>
+diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
+index 1afbd7371c..dce421795a 100644
+--- a/man/sd_journal_get_data.xml
++++ b/man/sd_journal_get_data.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_data">
++<refentry id="sd_journal_get_data" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_data</title>
+@@ -183,6 +183,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_get_data()</function>,
+ <function>sd_journal_enumerate_data()</function>,
+ <function>sd_journal_restart_data()</function>,
+diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
+index 3a38f733ab..a96857d0df 100644
+--- a/man/sd_journal_get_fd.xml
++++ b/man/sd_journal_get_fd.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_fd">
++<refentry id="sd_journal_get_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_fd</title>
+@@ -231,6 +231,8 @@ else {
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_get_fd()</function>,
+ <function>sd_journal_get_events()</function>,
+ <function>sd_journal_reliable_fd()</function>,
+diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
+index 607d74666b..b67e4d6c2d 100644
+--- a/man/sd_journal_get_realtime_usec.xml
++++ b/man/sd_journal_get_realtime_usec.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_realtime_usec">
++<refentry id="sd_journal_get_realtime_usec" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_realtime_usec</title>
+@@ -115,6 +115,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_get_realtime_usec()</function> and
+ <function>sd_journal_get_monotonic_usec()</function> interfaces
+ are available as a shared library, which can be compiled and
+diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
+index 72c804d834..6281bc850d 100644
+--- a/man/sd_journal_get_usage.xml
++++ b/man/sd_journal_get_usage.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_get_usage">
++<refentry id="sd_journal_get_usage" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_get_usage</title>
+@@ -80,6 +80,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_get_usage()</function> interface is
+ available as a shared library, which can be compiled and linked to
+ with the
+diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml
+index 237e649206..4dff3c67d0 100644
+--- a/man/sd_journal_has_runtime_files.xml
++++ b/man/sd_journal_has_runtime_files.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_has_runtime_files">
++<refentry id="sd_journal_has_runtime_files" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_has_runtime_files</title>
+@@ -85,6 +85,12 @@
+ </para>
+ </refsect1>
+
++ <refsect1>
++ <title>Notes</title>
++
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++ </refsect1>
++
+ <refsect1>
+ <title>See Also</title>
+ <para>
+diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
+index 115fe26661..c8664994ce 100644
+--- a/man/sd_journal_next.xml
++++ b/man/sd_journal_next.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_next">
++<refentry id="sd_journal_next" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_next</title>
+@@ -146,6 +146,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_next()</function>,
+ <function>sd_journal_previous()</function>,
+ <function>sd_journal_next_skip()</function> and
+diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
+index fb572802a3..c3044670de 100644
+--- a/man/sd_journal_open.xml
++++ b/man/sd_journal_open.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_open">
++<refentry id="sd_journal_open" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_open</title>
+@@ -196,6 +196,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_open()</function>,
+ <function>sd_journal_open_directory()</function> and
+ <function>sd_journal_close()</function> interfaces are available
+diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
+index 0cd0b45b9a..50ad5de7be 100644
+--- a/man/sd_journal_print.xml
++++ b/man/sd_journal_print.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_print">
++<refentry id="sd_journal_print" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_print</title>
+@@ -232,6 +232,8 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="safe"/>
++
+ <para>The <function>sd_journal_print()</function>,
+ <function>sd_journal_printv()</function>,
+ <function>sd_journal_send()</function> and
+diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
+index ac0e5f633f..074dfd6789 100644
+--- a/man/sd_journal_query_unique.xml
++++ b/man/sd_journal_query_unique.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_query_unique">
++<refentry id="sd_journal_query_unique" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_query_unique</title>
+@@ -145,6 +145,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_query_unique()</function>,
+ <function>sd_journal_enumerate_unique()</function> and
+ <function>sd_journal_restart_unique()</function> interfaces are
+diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
+index d74c2d5bbc..8bbbb22a73 100644
+--- a/man/sd_journal_seek_head.xml
++++ b/man/sd_journal_seek_head.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_seek_head">
++<refentry id="sd_journal_seek_head" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_seek_head</title>
+@@ -144,6 +144,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="strict"/>
++
+ <para>The <function>sd_journal_seek_head()</function>,
+ <function>sd_journal_seek_tail()</function>,
+ <function>sd_journal_seek_monotonic_usec()</function>,
+diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
+index 2ea7731b48..340760ba36 100644
+--- a/man/sd_journal_stream_fd.xml
++++ b/man/sd_journal_stream_fd.xml
+@@ -21,7 +21,7 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+-<refentry id="sd_journal_stream_fd">
++<refentry id="sd_journal_stream_fd" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <refentryinfo>
+ <title>sd_journal_stream_fd</title>
+@@ -104,6 +104,8 @@
+ <refsect1>
+ <title>Notes</title>
+
++ <xi:include href="threads-aware.xml" xpointer="safe"/>
++
+ <para>The <function>sd_journal_stream_fd()</function> interface is
+ available as a shared library, which can be compiled and linked to
+ with the
+diff --git a/man/threads-aware.xml b/man/threads-aware.xml
+new file mode 100644
+index 0000000000..7985f4acd1
+--- /dev/null
++++ b/man/threads-aware.xml
+@@ -0,0 +1,17 @@
++<?xml version="1.0"?>
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
++
++<!--
++ SPDX-License-Identifier: LGPL-2.1+
++-->
++
++<refsect1>
++
++<para id="strict">All functions listed here are thread-agnostic and only a single specific thread may operate on a
++given object during its entire lifetime. It's safe to allocate multiple independent objects and use each from a
++specific thread in parallel. However, it's not safe to allocate such an object in one thread, and operate or free it
++from any other, even if locking is used to ensure these threads don't operate on it at the very same time.</para>
++
++<para id="safe">All functions listed here are thread-safe and may be called in parallel from multiple threads.</para>
++
++</refsect1>
diff --git a/SOURCES/0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch b/SOURCES/0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch
new file mode 100644
index 0000000..818fda4
--- /dev/null
+++ b/SOURCES/0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch
@@ -0,0 +1,45 @@
+From cfc1fde83d46d86d06ca2e76986cb4cf2607b188 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Tue, 26 Feb 2019 17:33:27 +0100
+Subject: [PATCH] selinux: don't log SELINUX_INFO and SELINUX_WARNING messages
+ to audit
+
+Previously we logged even info message from libselinux as USER_AVC's to
+audit. For example, setting SELinux to permissive mode generated
+following audit message,
+
+time->Tue Feb 26 11:29:29 2019
+type=USER_AVC msg=audit(1551198569.423:334): pid=1 uid=0 auid=4294967295 ses=4294967295 subj=system_u:system_r:init_t:s0 msg='avc: received setenforce notice (enforcing=0) exe="/usr/lib/systemd/systemd" sauid=0 hostname=? addr=? terminal=?'
+
+This is unnecessary and wrong at the same time. First, kernel already
+records audit event that SELinux was switched to permissive mode, also
+the type of the message really shouldn't be USER_AVC.
+
+Let's ignore SELINUX_WARNING and SELINUX_INFO and forward to audit only
+USER_AVC's and errors as these two libselinux message types have clear
+mapping to audit message types.
+
+(cherry picked from commit 6227fc14c48c4c17daed4b91f61cdd4aa375790a)
+
+Resolves: #1240730
+---
+ src/core/selinux-access.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
+index 6cc0a49b92..8edfc86009 100644
+--- a/src/core/selinux-access.c
++++ b/src/core/selinux-access.c
+@@ -104,7 +104,11 @@ _printf_(2, 3) static int log_callback(int type, const char *fmt, ...) {
+ va_end(ap);
+
+ if (r >= 0) {
+- audit_log_user_avc_message(get_audit_fd(), AUDIT_USER_AVC, buf, NULL, NULL, NULL, 0);
++ if (type == SELINUX_AVC)
++ audit_log_user_avc_message(get_audit_fd(), AUDIT_USER_AVC, buf, NULL, NULL, NULL, 0);
++ else if (type == SELINUX_ERROR)
++ audit_log_user_avc_message(get_audit_fd(), AUDIT_USER_SELINUX_ERR, buf, NULL, NULL, NULL, 0);
++
+ return 0;
+ }
+ }
diff --git a/SOURCES/0745-fix-mis-merge.patch b/SOURCES/0745-fix-mis-merge.patch
new file mode 100644
index 0000000..19784d2
--- /dev/null
+++ b/SOURCES/0745-fix-mis-merge.patch
@@ -0,0 +1,25 @@
+From 702a5878c3cce3da02403b29ac6e7b8317857dec Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 30 May 2019 13:40:23 +0200
+Subject: [PATCH] fix mis-merge
+
+Regression since commit c0f32feb77768aa76d8c813471b3484c93bc2651 .
+
+Resolves: #1714503
+---
+ src/core/service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 06b39e3a5a..93e4759171 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -3046,7 +3046,7 @@ static void service_notify_message(
+ if (!service_notify_message_authorized(SERVICE(u), ucred->pid, tags, fds))
+ return;
+
+- if (s->notify_access == NOTIFY_NONE) {
++ if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
+ _cleanup_free_ char *cc = NULL;
+
+ cc = strv_join(tags, ", ");
diff --git a/SOURCES/0746-fs-util-chase_symlinks-prevent-double-free.patch b/SOURCES/0746-fs-util-chase_symlinks-prevent-double-free.patch
new file mode 100644
index 0000000..b735fae
--- /dev/null
+++ b/SOURCES/0746-fs-util-chase_symlinks-prevent-double-free.patch
@@ -0,0 +1,36 @@
+From e4834c7be945dfbb0a6d7f13c736924bf9489cd2 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 21 Jan 2018 19:19:25 +0900
+Subject: [PATCH] fs-util: chase_symlinks(): prevent double free
+
+Fixes CID #1385316.
+
+(cherry picked from commit b539437a056953cb0b537db4af61f1f1bf97ed44)
+
+Resolves: #1714782
+---
+ src/shared/util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 354d15ff18..07de902aaf 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -9414,8 +9414,6 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+ if (fd < 0)
+ return -errno;
+
+- free(done);
+-
+ if (flags & CHASE_SAFE) {
+ if (fstat(fd, &st) < 0)
+ return -errno;
+@@ -9426,6 +9424,8 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
+ previous_stat = st;
+ }
+
++ free(done);
++
+ /* Note that we do not revalidate the root, we take it as is. */
+ if (isempty(root))
+ done = NULL;
diff --git a/SOURCES/0747-return-error-value-on-failure.patch b/SOURCES/0747-return-error-value-on-failure.patch
new file mode 100644
index 0000000..573bdfa
--- /dev/null
+++ b/SOURCES/0747-return-error-value-on-failure.patch
@@ -0,0 +1,39 @@
+From 0ee2318c1bc5f13904b8f60e3826eadfe2b7c66f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 4 Jul 2019 15:57:23 +0200
+Subject: [PATCH] return error value on failure
+
+Regression from commit c0f32feb77768aa76d8c813471b3484c93bc2651 .
+
+(cherry picked from commit e4a25c5d867e6ed832a077c32f3555bcd49ef8a6)
+
+Resolves: #1729226
+---
+ src/core/service.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 93e4759171..957c6f37cc 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -750,9 +750,9 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+
+ fd = chase_symlinks(s->pid_file, NULL, CHASE_OPEN|CHASE_SAFE, NULL);
+ if (fd == -EPERM)
+- return log_unit_full(UNIT(s)->id, prio, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
++ return log_unit_full_errno(UNIT(s)->id, prio, fd, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
+ if (fd < 0)
+- return log_unit_full(UNIT(s)->id, prio, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
++ return log_unit_full_errno(UNIT(s)->id, prio, fd, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
+
+ /* Let's read the PID file now that we chased it down. But we need to convert the O_PATH fd chase_symlinks() returned us into a proper fd first. */
+ xsprintf(procfs, "/proc/self/fd/%i", fd);
+@@ -762,7 +762,7 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+
+ r = parse_pid(k, &pid);
+ if (r < 0)
+- return log_unit_full(UNIT(s)->id, prio, "Failed to parse PID from file %s: %m", s->pid_file);
++ return log_unit_full_errno(UNIT(s)->id, prio, r, "Failed to parse PID from file %s: %m", s->pid_file);
+
+ if (s->main_pid_known && pid == s->main_pid)
+ return 0;
diff --git a/SOURCES/0748-revert-local-changes-made-during-backport-of-the-tes.patch b/SOURCES/0748-revert-local-changes-made-during-backport-of-the-tes.patch
new file mode 100644
index 0000000..4bad426
--- /dev/null
+++ b/SOURCES/0748-revert-local-changes-made-during-backport-of-the-tes.patch
@@ -0,0 +1,31 @@
+From 067cc9cc451ef4b98f451bf3a67c10660749ddd0 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Wed, 10 Jul 2019 09:48:51 +0200
+Subject: [PATCH] revert local changes made during backport of the test
+
+(cherry picked from commit 225a458ec4c1bee97d0cee13895977614fd8cc16)
+
+Related: #1729226
+---
+ test/TEST-20-MAINPIDGAMES/testsuite.sh | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh
+index d4ad63865c..8b0b664652 100755
+--- a/test/TEST-20-MAINPIDGAMES/testsuite.sh
++++ b/test/TEST-20-MAINPIDGAMES/testsuite.sh
+@@ -175,12 +175,10 @@ ExecStart=/dev/shm/mainpid3.sh
+ EOF
+
+ systemctl daemon-reload
+-systemctl start mainpidsh3.service
++! systemctl start mainpidsh3.service
+
+ # Test that this failed due to timeout, and not some other error
+-# test `systemctl_show_value -p Result mainpidsh3.service` = timeout
+-# Just check that there is no MainPID => the pid file was ignored
+-test `systemctl_show_value -p MainPID mainpidsh3.service` -eq 0
++test `systemctl_show_value -p Result mainpidsh3.service` = timeout
+
+ systemd-analyze set-log-level info
+
diff --git a/SOURCES/0749-core-timer-Prevent-timer-looping-when-unit-cannot-st.patch b/SOURCES/0749-core-timer-Prevent-timer-looping-when-unit-cannot-st.patch
new file mode 100644
index 0000000..0266c15
--- /dev/null
+++ b/SOURCES/0749-core-timer-Prevent-timer-looping-when-unit-cannot-st.patch
@@ -0,0 +1,75 @@
+From d7eac3e0ae20510e2737dc4e23975391fef5ece3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>
+Date: Tue, 16 Jan 2018 19:22:46 +0100
+Subject: [PATCH] core/timer: Prevent timer looping when unit cannot start
+
+When a unit job finishes early (e.g. when fork(2) fails) triggered unit goes
+through states
+ stopped->failed (or failed->failed),
+in case a ExecStart= command fails unit passes through
+ stopped->starting->failed.
+
+The former transition doesn't result in unit active/inactive timestamp being
+updated and timer (OnUnitActiveSec= or OnUnitInactiveSec=) would use an expired
+timestamp triggering immediately again (repeatedly).
+
+This patch exploits timer's last trigger timestamp to ensure the timer isn't
+triggered more frequently than OnUnitActiveSec=/OnUnitInactiveSec= period.
+
+Steps to reproduce:
+
+0) Create sample units:
+
+cat >~/.config/systemd/user/looper.service <<EOD
+[Service]
+ExecStart=/usr/bin/sleep 2
+EOD
+
+cat >~/.config/systemd/user/looper.timer <<EOD
+[Timer]
+AccuracySec=5
+OnUnitActiveSec=5
+EOD
+
+1) systemctl --user daemon-reload
+
+2) systemctl --user start looper.timer
+ # to have first activation timestamp/sentinel
+ systemctl --user start looper.service
+
+o Observe the service is being regularly triggered.
+
+3) systemctl set-property user@$UID.service TasksMax=2
+
+o Observe the tight looping as long as the looper.service cannot be started.
+
+Ref: #5969
+
+(cherry picked from commit 204d140c4def364c47d36226e4514a7e077fa196)
+(cherry picked from commit fe81f6f734ee46a4877df6dda6e31cdc24c00a3c)
+
+Resolves: #1729230
+---
+ src/core/timer.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/core/timer.c b/src/core/timer.c
+index d32b007c7c..1d4868643a 100644
+--- a/src/core/timer.c
++++ b/src/core/timer.c
+@@ -416,6 +416,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
+
+ if (base <= 0)
+ continue;
++ base = MAX(base, t->last_trigger.monotonic);
+
+ break;
+
+@@ -428,6 +429,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
+
+ if (base <= 0)
+ continue;
++ base = MAX(base, t->last_trigger.monotonic);
+
+ break;
+
diff --git a/SOURCES/0750-core-add-a-Requires-dependency-between-units-and-the.patch b/SOURCES/0750-core-add-a-Requires-dependency-between-units-and-the.patch
new file mode 100644
index 0000000..5bdd59c
--- /dev/null
+++ b/SOURCES/0750-core-add-a-Requires-dependency-between-units-and-the.patch
@@ -0,0 +1,40 @@
+From e932760979f8658ff62b93b039a98a6d7f0f4656 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 29 Sep 2015 13:06:28 +0200
+Subject: [PATCH] core: add a "Requires=" dependency between units and the
+ slices they are located in
+
+We place the processes we fork off in the cgroup anyway, and we probably
+shouldn't be able to get that far if we couldn't set up the slice due to
+resource problems or unmet conditions. Hence upgrade the dependency
+between units and the slices they are located in from Wants= to
+Requires=.
+
+(cherry picked from commit 8c8da0e0cb498245c765732cf9caa081a70c560f)
+(cherry picked from commit 0600681f04e3818282a2d518ec3e6afee85f7978)
+
+Related: #1729228
+---
+ src/core/unit.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 37fac8db3a..1dff541ac3 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -1113,12 +1113,12 @@ static int unit_add_slice_dependencies(Unit *u) {
+ return 0;
+
+ if (UNIT_ISSET(u->slice))
+- return unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, UNIT_DEREF(u->slice), true);
++ return unit_add_two_dependencies(u, UNIT_AFTER, UNIT_REQUIRES, UNIT_DEREF(u->slice), true);
+
+- if (streq(u->id, SPECIAL_ROOT_SLICE))
++ if (unit_has_name(u, SPECIAL_ROOT_SLICE))
+ return 0;
+
+- return unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, SPECIAL_ROOT_SLICE, NULL, true);
++ return unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_ROOT_SLICE, NULL, true);
+ }
+
+ static int unit_add_mount_dependencies(Unit *u) {
diff --git a/SOURCES/0751-core-rerun-GC-logic-for-a-unit-that-loses-a-referenc.patch b/SOURCES/0751-core-rerun-GC-logic-for-a-unit-that-loses-a-referenc.patch
new file mode 100644
index 0000000..e871262
--- /dev/null
+++ b/SOURCES/0751-core-rerun-GC-logic-for-a-unit-that-loses-a-referenc.patch
@@ -0,0 +1,36 @@
+From 2175fc04df0f8e272cbff7540acd38eced9c63d7 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 29 Apr 2016 11:18:53 +0200
+Subject: [PATCH] core: rerun GC logic for a unit that loses a reference
+
+Let's make sure when we drop a reference to a unit, that we run the GC queue on
+it again.
+
+This (together with the previous commit) should deal with the GC issues pointed
+out in:
+
+https://github.com/systemd/systemd/pull/2993#issuecomment-215331189
+
+(cherry picked from commit b75102e5bf4cf249052d42be955d403e3e03b47c)
+(cherry picked from commit 0ace07115f14a57c81afbc9a7e947778a743870e)
+
+Related: #1729228
+---
+ src/core/unit.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 1dff541ac3..b004aa8fcd 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -3145,6 +3145,10 @@ void unit_ref_unset(UnitRef *ref) {
+ if (!ref->unit)
+ return;
+
++ /* We are about to drop a reference to the unit, make sure the garbage collection has a look at it as it might
++ * be unreferenced now. */
++ unit_add_to_gc_queue(ref->unit);
++
+ LIST_REMOVE(refs, ref->unit->refs, ref);
+ ref->unit = NULL;
+ }
diff --git a/SOURCES/0752-pid1-rename-unit_check_gc-to-unit_may_gc.patch b/SOURCES/0752-pid1-rename-unit_check_gc-to-unit_may_gc.patch
new file mode 100644
index 0000000..cc822f8
--- /dev/null
+++ b/SOURCES/0752-pid1-rename-unit_check_gc-to-unit_may_gc.patch
@@ -0,0 +1,360 @@
+From cb1a8f709ff3c27fc9f43aa27f985131422795bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 13 Feb 2018 10:50:13 +0100
+Subject: [PATCH] pid1: rename unit_check_gc to unit_may_gc
+
+"check" is unclear: what is true, what is false? Let's rename to "can_gc" and
+revert the return value ("positive" values are easier to grok).
+
+v2:
+- rename from unit_can_gc to unit_may_gc
+
+(cherry picked from commit f2f725e5cc950e84ebfd09bd64bc01c0ebdb6734)
+(cherry picked from commit 1716821fc5b93667a0bf821b25905de00818aec9)
+
+Related: #1729228
+---
+ src/core/automount.c | 13 ++++++++-----
+ src/core/manager.c | 2 +-
+ src/core/mount.c | 9 ++++++---
+ src/core/scope.c | 8 ++++----
+ src/core/service.c | 8 ++++----
+ src/core/socket.c | 6 +++---
+ src/core/socket.h | 4 ++--
+ src/core/swap.c | 9 ++++++---
+ src/core/unit.c | 31 +++++++++++++++++--------------
+ src/core/unit.h | 9 ++++-----
+ 10 files changed, 55 insertions(+), 44 deletions(-)
+
+diff --git a/src/core/automount.c b/src/core/automount.c
+index 4678bdc7c9..7b9c4aaf1d 100644
+--- a/src/core/automount.c
++++ b/src/core/automount.c
+@@ -936,13 +936,16 @@ static const char *automount_sub_state_to_string(Unit *u) {
+ return automount_state_to_string(AUTOMOUNT(u)->state);
+ }
+
+-static bool automount_check_gc(Unit *u) {
++static bool automount_may_gc(Unit *u) {
++ Unit *t;
++
+ assert(u);
+
+- if (!UNIT_TRIGGER(u))
+- return false;
++ t = UNIT_TRIGGER(u);
++ if (!t)
++ return true;
+
+- return UNIT_VTABLE(UNIT_TRIGGER(u))->check_gc(UNIT_TRIGGER(u));
++ return UNIT_VTABLE(t)->may_gc(t);
+ }
+
+ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, void *userdata) {
+@@ -1115,7 +1118,7 @@ const UnitVTable automount_vtable = {
+ .active_state = automount_active_state,
+ .sub_state_to_string = automount_sub_state_to_string,
+
+- .check_gc = automount_check_gc,
++ .may_gc = automount_may_gc,
+
+ .reset_failed = automount_reset_failed,
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 3bca61d0b1..9dfdd67860 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -871,7 +871,7 @@ static void unit_gc_sweep(Unit *u, unsigned gc_marker) {
+ if (u->in_cleanup_queue)
+ goto bad;
+
+- if (unit_check_gc(u))
++ if (!unit_may_gc(u))
+ goto good;
+
+ u->gc_marker = gc_marker + GC_OFFSET_IN_PATH;
+diff --git a/src/core/mount.c b/src/core/mount.c
+index c7aed2333f..8a25ebd163 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1180,12 +1180,15 @@ _pure_ static const char *mount_sub_state_to_string(Unit *u) {
+ return mount_state_to_string(MOUNT(u)->state);
+ }
+
+-_pure_ static bool mount_check_gc(Unit *u) {
++_pure_ static bool mount_may_gc(Unit *u) {
+ Mount *m = MOUNT(u);
+
+ assert(m);
+
+- return m->from_proc_self_mountinfo;
++ if (m->from_proc_self_mountinfo)
++ return false;
++
++ return true;
+ }
+
+ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+@@ -1954,7 +1957,7 @@ const UnitVTable mount_vtable = {
+ .active_state = mount_active_state,
+ .sub_state_to_string = mount_sub_state_to_string,
+
+- .check_gc = mount_check_gc,
++ .may_gc = mount_may_gc,
+
+ .sigchld_event = mount_sigchld_event,
+
+diff --git a/src/core/scope.c b/src/core/scope.c
+index 29954ba285..e9b45aa3f8 100644
+--- a/src/core/scope.c
++++ b/src/core/scope.c
+@@ -381,7 +381,7 @@ static int scope_deserialize_item(Unit *u, const char *key, const char *value, F
+ return 0;
+ }
+
+-static bool scope_check_gc(Unit *u) {
++static bool scope_may_gc(Unit *u) {
+ assert(u);
+
+ /* Never clean up scopes that still have a process around,
+@@ -392,10 +392,10 @@ static bool scope_check_gc(Unit *u) {
+
+ r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
+ if (r <= 0)
+- return true;
++ return false;
+ }
+
+- return false;
++ return true;
+ }
+
+ static void scope_notify_cgroup_empty_event(Unit *u) {
+@@ -547,7 +547,7 @@ const UnitVTable scope_vtable = {
+ .active_state = scope_active_state,
+ .sub_state_to_string = scope_sub_state_to_string,
+
+- .check_gc = scope_check_gc,
++ .may_gc = scope_may_gc,
+
+ .sigchld_event = scope_sigchld_event,
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 957c6f37cc..69ec916f2d 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -2436,7 +2436,7 @@ static const char *service_sub_state_to_string(Unit *u) {
+ return service_state_to_string(SERVICE(u)->state);
+ }
+
+-static bool service_check_gc(Unit *u) {
++static bool service_may_gc(Unit *u) {
+ Service *s = SERVICE(u);
+
+ assert(s);
+@@ -2446,9 +2446,9 @@ static bool service_check_gc(Unit *u) {
+ if (cgroup_good(s) > 0 ||
+ main_pid_good(s) > 0 ||
+ control_pid_good(s) > 0)
+- return true;
++ return false;
+
+- return false;
++ return true;
+ }
+
+ _pure_ static bool service_check_snapshot(Unit *u) {
+@@ -3461,7 +3461,7 @@ const UnitVTable service_vtable = {
+ .active_state = service_active_state,
+ .sub_state_to_string = service_sub_state_to_string,
+
+- .check_gc = service_check_gc,
++ .may_gc = service_may_gc,
+ .check_snapshot = service_check_snapshot,
+
+ .sigchld_event = service_sigchld_event,
+diff --git a/src/core/socket.c b/src/core/socket.c
+index efefe7ce5d..3e4cdd467f 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -2269,12 +2269,12 @@ const char* socket_port_type_to_string(SocketPort *p) {
+ }
+ }
+
+-_pure_ static bool socket_check_gc(Unit *u) {
++_pure_ static bool socket_may_gc(Unit *u) {
+ Socket *s = SOCKET(u);
+
+ assert(u);
+
+- return s->n_connections > 0;
++ return s->n_connections == 0;
+ }
+
+ static int socket_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
+@@ -2713,7 +2713,7 @@ const UnitVTable socket_vtable = {
+ .active_state = socket_active_state,
+ .sub_state_to_string = socket_sub_state_to_string,
+
+- .check_gc = socket_check_gc,
++ .may_gc = socket_may_gc,
+
+ .sigchld_event = socket_sigchld_event,
+
+diff --git a/src/core/socket.h b/src/core/socket.h
+index a2e08998c0..cc1428b3f7 100644
+--- a/src/core/socket.h
++++ b/src/core/socket.h
+@@ -114,8 +114,8 @@ struct Socket {
+ ExecRuntime *exec_runtime;
+
+ /* For Accept=no sockets refers to the one service we'll
+- activate. For Accept=yes sockets is either NULL, or filled
+- when the next service we spawn. */
++ * activate. For Accept=yes sockets is either NULL, or filled
++ * to refer to the next service we spawn. */
+ UnitRef service;
+
+ SocketState state, deserialized_state;
+diff --git a/src/core/swap.c b/src/core/swap.c
+index e71de4e657..1f69736aa3 100644
+--- a/src/core/swap.c
++++ b/src/core/swap.c
+@@ -949,12 +949,15 @@ _pure_ static const char *swap_sub_state_to_string(Unit *u) {
+ return swap_state_to_string(SWAP(u)->state);
+ }
+
+-_pure_ static bool swap_check_gc(Unit *u) {
++_pure_ static bool swap_may_gc(Unit *u) {
+ Swap *s = SWAP(u);
+
+ assert(s);
+
+- return s->from_proc_swaps;
++ if (s->from_proc_swaps)
++ return false;
++
++ return true;
+ }
+
+ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+@@ -1497,7 +1500,7 @@ const UnitVTable swap_vtable = {
+ .active_state = swap_active_state,
+ .sub_state_to_string = swap_sub_state_to_string,
+
+- .check_gc = swap_check_gc,
++ .may_gc = swap_may_gc,
+
+ .sigchld_event = swap_sigchld_event,
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index b004aa8fcd..1b8ec9a20e 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -282,15 +282,19 @@ int unit_set_description(Unit *u, const char *description) {
+ return 0;
+ }
+
+-bool unit_check_gc(Unit *u) {
++bool unit_may_gc(Unit *u) {
+ UnitActiveState state;
+ assert(u);
+
++ /* Checks whether the unit is ready to be unloaded for garbage collection.
++ * Returns true when the unit may be collected, and false if there's some
++ * reason to keep it loaded. */
++
+ if (u->job)
+- return true;
++ return false;
+
+ if (u->nop_job)
+- return true;
++ return false;
+
+ state = unit_active_state(u);
+
+@@ -303,22 +307,21 @@ bool unit_check_gc(Unit *u) {
+ /* But we keep the unit object around for longer when it is
+ * referenced or configured to not be gc'ed */
+ if (state != UNIT_INACTIVE)
+- return true;
++ return false;
+
+ if (UNIT_VTABLE(u)->no_gc)
+- return true;
++ return false;
+
+ if (u->no_gc)
+- return true;
++ return false;
+
+ if (u->refs)
+- return true;
++ return false;
+
+- if (UNIT_VTABLE(u)->check_gc)
+- if (UNIT_VTABLE(u)->check_gc(u))
+- return true;
++ if (UNIT_VTABLE(u)->may_gc && !UNIT_VTABLE(u)->may_gc(u))
++ return false;
+
+- return false;
++ return true;
+ }
+
+ void unit_add_to_load_queue(Unit *u) {
+@@ -348,7 +351,7 @@ void unit_add_to_gc_queue(Unit *u) {
+ if (u->in_gc_queue || u->in_cleanup_queue)
+ return;
+
+- if (unit_check_gc(u))
++ if (!unit_may_gc(u))
+ return;
+
+ LIST_PREPEND(gc_queue, u->manager->gc_queue, u);
+@@ -888,7 +891,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
+ "%s\tActive Enter Timestamp: %s\n"
+ "%s\tActive Exit Timestamp: %s\n"
+ "%s\tInactive Enter Timestamp: %s\n"
+- "%s\tGC Check Good: %s\n"
++ "%s\tMay GC: %s\n"
+ "%s\tNeed Daemon Reload: %s\n"
+ "%s\tTransient: %s\n"
+ "%s\tSlice: %s\n"
+@@ -905,7 +908,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
+ prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->active_enter_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->active_exit_timestamp.realtime)),
+ prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->inactive_enter_timestamp.realtime)),
+- prefix, yes_no(unit_check_gc(u)),
++ prefix, yes_no(unit_may_gc(u)),
+ prefix, yes_no(unit_need_daemon_reload(u)),
+ prefix, yes_no(u->transient),
+ prefix, strna(unit_slice_name(u)),
+diff --git a/src/core/unit.h b/src/core/unit.h
+index 091ef7596e..3f411a1793 100644
+--- a/src/core/unit.h
++++ b/src/core/unit.h
+@@ -353,10 +353,9 @@ struct UnitVTable {
+ * unit is in. */
+ const char* (*sub_state_to_string)(Unit *u);
+
+- /* Return true when there is reason to keep this entry around
+- * even nothing references it and it isn't active in any
+- * way */
+- bool (*check_gc)(Unit *u);
++ /* Return false when there is a reason to prevent this unit from being gc'ed
++ * even though nothing references it and it isn't active in any way. */
++ bool (*may_gc)(Unit *u);
+
+ /* When the unit is not running and no job for it queued we
+ * shall release its runtime resources */
+@@ -496,7 +495,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c);
+ int unit_choose_id(Unit *u, const char *name);
+ int unit_set_description(Unit *u, const char *description);
+
+-bool unit_check_gc(Unit *u);
++bool unit_may_gc(Unit *u);
+
+ void unit_add_to_load_queue(Unit *u);
+ void unit_add_to_dbus_queue(Unit *u);
diff --git a/SOURCES/0753-pid1-include-the-source-unit-in-UnitRef.patch b/SOURCES/0753-pid1-include-the-source-unit-in-UnitRef.patch
new file mode 100644
index 0000000..e90ac06
--- /dev/null
+++ b/SOURCES/0753-pid1-include-the-source-unit-in-UnitRef.patch
@@ -0,0 +1,276 @@
+From c6da3d5d824f7b125b3fd95a961eca98db7febf7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 13 Feb 2018 13:12:43 +0100
+Subject: [PATCH] pid1: include the source unit in UnitRef
+
+No functional change.
+
+The source unit manages the reference. It allocates the UnitRef structure and
+registers it in the target unit, and then the reference must be destroyed
+before the source unit is destroyed. Thus, is should be OK to include the
+pointer to the source unit, it should be live as long as the reference exists.
+
+v2:
+- rename refs to refs_by_target
+
+(cherry picked from commit 7f7d01ed5804afef220ebdb29f22d8177d0d3a5c)
+(cherry picked from commit ff80bfd94181327a5f8e0fbd70b9b7afe0c5545c)
+
+Related: #1729228
+---
+ src/core/busname.c | 2 +-
+ src/core/dbus-manager.c | 2 +-
+ src/core/dbus-unit.c | 2 +-
+ src/core/load-fragment.c | 6 +++---
+ src/core/service.c | 2 +-
+ src/core/slice.c | 2 +-
+ src/core/socket.c | 4 ++--
+ src/core/unit.c | 35 ++++++++++++++++++-----------------
+ src/core/unit.h | 12 ++++++------
+ 9 files changed, 34 insertions(+), 33 deletions(-)
+
+diff --git a/src/core/busname.c b/src/core/busname.c
+index a5e659049d..97886f1e05 100644
+--- a/src/core/busname.c
++++ b/src/core/busname.c
+@@ -175,7 +175,7 @@ static int busname_add_extras(BusName *n) {
+ if (r < 0)
+ return r;
+
+- unit_ref_set(&n->service, x);
++ unit_ref_set(&n->service, u, x);
+ }
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(n->service), true);
+diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
+index 1766163b33..8267d44e1a 100644
+--- a/src/core/dbus-manager.c
++++ b/src/core/dbus-manager.c
+@@ -649,7 +649,7 @@ static int transient_unit_from_message(
+ u->fragment_path ||
+ u->source_path ||
+ !strv_isempty(u->dropin_paths) ||
+- u->refs ||
++ u->refs_by_target ||
+ set_size(u->dependencies[UNIT_REFERENCED_BY]) > 0)
+ return sd_bus_error_setf(error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name);
+
+diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
+index f0f75e01b0..77073308c8 100644
+--- a/src/core/dbus-unit.c
++++ b/src/core/dbus-unit.c
+@@ -967,7 +967,7 @@ static int bus_unit_set_transient_property(
+ return -EINVAL;
+
+ if (mode != UNIT_CHECK) {
+- unit_ref_set(&u->slice, slice);
++ unit_ref_set(&u->slice, u, slice);
+ unit_write_drop_in_private_format(u, mode, name, "Slice=%s\n", s);
+ }
+ }
+diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
+index f3d0851fe2..1721fea8f3 100644
+--- a/src/core/load-fragment.c
++++ b/src/core/load-fragment.c
+@@ -1836,7 +1836,7 @@ int config_parse_socket_service(
+ return 0;
+ }
+
+- unit_ref_set(&s->service, x);
++ unit_ref_set(&s->service, UNIT(s), x);
+
+ return 0;
+ }
+@@ -2006,7 +2006,7 @@ int config_parse_busname_service(
+ return 0;
+ }
+
+- unit_ref_set(&n->service, x);
++ unit_ref_set(&n->service, UNIT(n), x);
+
+ return 0;
+ }
+@@ -2933,7 +2933,7 @@ int config_parse_unit_slice(
+ return 0;
+ }
+
+- unit_ref_set(&u->slice, slice);
++ unit_ref_set(&u->slice, u, slice);
+ return 0;
+ }
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 69ec916f2d..eaa588863f 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -3299,7 +3299,7 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock, bool selinux_context
+ s->socket_fd = fd;
+ s->socket_fd_selinux_context_net = selinux_context_net;
+
+- unit_ref_set(&s->accept_socket, UNIT(sock));
++ unit_ref_set(&s->accept_socket, UNIT(s), UNIT(sock));
+
+ return unit_add_two_dependencies(UNIT(sock), UNIT_BEFORE, UNIT_TRIGGERS, UNIT(s), false);
+ }
+diff --git a/src/core/slice.c b/src/core/slice.c
+index 1cce3e1217..0985a65286 100644
+--- a/src/core/slice.c
++++ b/src/core/slice.c
+@@ -76,7 +76,7 @@ static int slice_add_parent_slice(Slice *s) {
+ if (r < 0)
+ return r;
+
+- unit_ref_set(&UNIT(s)->slice, parent);
++ unit_ref_set(&UNIT(s)->slice, UNIT(s), parent);
+ return 0;
+ }
+
+diff --git a/src/core/socket.c b/src/core/socket.c
+index 3e4cdd467f..8489575de6 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -208,7 +208,7 @@ int socket_instantiate_service(Socket *s) {
+ return r;
+
+ u->no_gc = true;
+- unit_ref_set(&s->service, u);
++ unit_ref_set(&s->service, UNIT(s), u);
+
+ return unit_add_two_dependencies(UNIT(s), UNIT_BEFORE, UNIT_TRIGGERS, u, false);
+ }
+@@ -313,7 +313,7 @@ static int socket_add_extras(Socket *s) {
+ if (r < 0)
+ return r;
+
+- unit_ref_set(&s->service, x);
++ unit_ref_set(&s->service, u, x);
+ }
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(s->service), true);
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 1b8ec9a20e..5376ef862f 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -315,7 +315,7 @@ bool unit_may_gc(Unit *u) {
+ if (u->no_gc)
+ return false;
+
+- if (u->refs)
++ if (u->refs_by_target)
+ return false;
+
+ if (UNIT_VTABLE(u)->may_gc && !UNIT_VTABLE(u)->may_gc(u))
+@@ -553,9 +553,8 @@ void unit_free(Unit *u) {
+ condition_free_list(u->asserts);
+
+ unit_ref_unset(&u->slice);
+-
+- while (u->refs)
+- unit_ref_unset(u->refs);
++ while (u->refs_by_target)
++ unit_ref_unset(u->refs_by_target);
+
+ free(u);
+ }
+@@ -737,8 +736,8 @@ int unit_merge(Unit *u, Unit *other) {
+ return r;
+
+ /* Redirect all references */
+- while (other->refs)
+- unit_ref_set(other->refs, u);
++ while (other->refs_by_target)
++ unit_ref_set(other->refs_by_target, other->refs_by_target->source, u);
+
+ /* Merge dependencies */
+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
+@@ -2493,7 +2492,7 @@ int unit_add_default_slice(Unit *u, CGroupContext *c) {
+ if (r < 0)
+ return r;
+
+- unit_ref_set(&u->slice, slice);
++ unit_ref_set(&u->slice, u, slice);
+ return 0;
+ }
+
+@@ -3130,30 +3129,32 @@ int unit_get_unit_file_preset(Unit *u) {
+ return u->unit_file_preset;
+ }
+
+-Unit* unit_ref_set(UnitRef *ref, Unit *u) {
++Unit* unit_ref_set(UnitRef *ref, Unit *source, Unit *target) {
+ assert(ref);
+- assert(u);
++ assert(source);
++ assert(target);
+
+- if (ref->unit)
++ if (ref->target)
+ unit_ref_unset(ref);
+
+- ref->unit = u;
+- LIST_PREPEND(refs, u->refs, ref);
+- return u;
++ ref->source = source;
++ ref->target = target;
++ LIST_PREPEND(refs_by_target, target->refs_by_target, ref);
++ return target;
+ }
+
+ void unit_ref_unset(UnitRef *ref) {
+ assert(ref);
+
+- if (!ref->unit)
++ if (!ref->target)
+ return;
+
+ /* We are about to drop a reference to the unit, make sure the garbage collection has a look at it as it might
+ * be unreferenced now. */
+- unit_add_to_gc_queue(ref->unit);
++ unit_add_to_gc_queue(ref->target);
+
+- LIST_REMOVE(refs, ref->unit->refs, ref);
+- ref->unit = NULL;
++ LIST_REMOVE(refs_by_target, ref->target->refs_by_target, ref);
++ ref->source = ref->target = NULL;
+ }
+
+ int unit_patch_contexts(Unit *u) {
+diff --git a/src/core/unit.h b/src/core/unit.h
+index 3f411a1793..a6e21d60ce 100644
+--- a/src/core/unit.h
++++ b/src/core/unit.h
+@@ -84,8 +84,8 @@ struct UnitRef {
+ * that we can merge two units if necessary and correct all
+ * references to them */
+
+- Unit* unit;
+- LIST_FIELDS(UnitRef, refs);
++ Unit *source, *target;
++ LIST_FIELDS(UnitRef, refs_by_target);
+ };
+
+ struct Unit {
+@@ -125,7 +125,7 @@ struct Unit {
+ char *job_timeout_reboot_arg;
+
+ /* References to this */
+- LIST_HEAD(UnitRef, refs);
++ LIST_HEAD(UnitRef, refs_by_target);
+
+ /* Conditions to check */
+ LIST_HEAD(Condition, conditions);
+@@ -591,11 +591,11 @@ void unit_trigger_notify(Unit *u);
+ UnitFileState unit_get_unit_file_state(Unit *u);
+ int unit_get_unit_file_preset(Unit *u);
+
+-Unit* unit_ref_set(UnitRef *ref, Unit *u);
++Unit* unit_ref_set(UnitRef *ref, Unit *source, Unit *target);
+ void unit_ref_unset(UnitRef *ref);
+
+-#define UNIT_DEREF(ref) ((ref).unit)
+-#define UNIT_ISSET(ref) (!!(ref).unit)
++#define UNIT_DEREF(ref) ((ref).target)
++#define UNIT_ISSET(ref) (!!(ref).target)
+
+ int unit_patch_contexts(Unit *u);
+
diff --git a/SOURCES/0754-pid1-fix-collection-of-cycles-of-units-which-referen.patch b/SOURCES/0754-pid1-fix-collection-of-cycles-of-units-which-referen.patch
new file mode 100644
index 0000000..d6ac1bd
--- /dev/null
+++ b/SOURCES/0754-pid1-fix-collection-of-cycles-of-units-which-referen.patch
@@ -0,0 +1,76 @@
+From 98774bdfb6d40e5b7d41b86238ee2d98ff12cb69 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 13 Feb 2018 14:37:11 +0100
+Subject: [PATCH] pid1: fix collection of cycles of units which reference one
+ another
+
+A .socket will reference a .service unit, by registering a UnitRef with the
+.service unit. If this .service unit has the .socket unit listed in Wants or
+Sockets or such, a cycle will be created. We would not free this cycle
+properly, because we treated any unit with non-empty refs as uncollectable. To
+solve this issue, treats refs with UnitRef in u->refs_by_target similarly to
+the refs in u->dependencies, and check if the "other" unit is known to be
+needed. If it is not needed, do not treat the reference from it as preventing
+the unit we are looking at from being freed.
+
+(cherry picked from commit 2641f02e23ac7d5385db7f932aff221a063f245e)
+(cherry picked from commit 703cc4991049cdf3ad3506e432cda982b3b3b007)
+
+Resolves: #1729228
+---
+ src/core/manager.c | 14 ++++++++++++++
+ src/core/unit.c | 9 +++++----
+ 2 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 9dfdd67860..fdbb3c0fd9 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -888,6 +888,20 @@ static void unit_gc_sweep(Unit *u, unsigned gc_marker) {
+ is_bad = false;
+ }
+
++ if (u->refs_by_target) {
++ const UnitRef *ref;
++
++ LIST_FOREACH(refs_by_target, ref, u->refs_by_target) {
++ unit_gc_sweep(ref->source, gc_marker);
++
++ if (ref->source->gc_marker == gc_marker + GC_OFFSET_GOOD)
++ goto good;
++
++ if (ref->source->gc_marker != gc_marker + GC_OFFSET_BAD)
++ is_bad = false;
++ }
++ }
++
+ if (is_bad)
+ goto bad;
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 5376ef862f..2204be26d2 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -288,7 +288,11 @@ bool unit_may_gc(Unit *u) {
+
+ /* Checks whether the unit is ready to be unloaded for garbage collection.
+ * Returns true when the unit may be collected, and false if there's some
+- * reason to keep it loaded. */
++ * reason to keep it loaded.
++ *
++ * References from other units are *not* checked here. Instead, this is done
++ * in unit_gc_sweep(), but using markers to properly collect dependency loops.
++ */
+
+ if (u->job)
+ return false;
+@@ -315,9 +319,6 @@ bool unit_may_gc(Unit *u) {
+ if (u->no_gc)
+ return false;
+
+- if (u->refs_by_target)
+- return false;
+-
+ if (UNIT_VTABLE(u)->may_gc && !UNIT_VTABLE(u)->may_gc(u))
+ return false;
+
diff --git a/SOURCES/0755-pid1-free-basic-unit-information-at-the-very-end-bef.patch b/SOURCES/0755-pid1-free-basic-unit-information-at-the-very-end-bef.patch
new file mode 100644
index 0000000..3d0fc44
--- /dev/null
+++ b/SOURCES/0755-pid1-free-basic-unit-information-at-the-very-end-bef.patch
@@ -0,0 +1,58 @@
+From 20d684011c93bed4b45c736ac1f9104983a090dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 14 Feb 2018 00:01:05 +0100
+Subject: [PATCH] pid1: free basic unit information at the very end, before
+ freeing the unit
+
+We would free stuff like the names of the unit first, and then recurse
+into other structures to remove the unit from there. Technically this
+was OK, since the code did not access the name, but this makes debugging
+harder. And if any log messages are added in any of those functions, they
+are likely to access u->id and such other basic information about the unit.
+So let's move the removal of this "basic" information towards the end
+of unit_free().
+
+(cherry picked from commit a946fa9bb968ac197d7a99970e27388b751dca94)
+(cherry picked from commit 42a93a826cd726d1e4d3ea2c8cb347cec2f0dabe)
+
+Related: #1729228
+---
+ src/core/unit.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 2204be26d2..63f00acc0a 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -537,6 +537,15 @@ void unit_free(Unit *u) {
+ set_remove(u->manager->failed_units, u);
+ set_remove(u->manager->startup_units, u);
+
++ unit_unwatch_all_pids(u);
++
++ unit_ref_unset(&u->slice);
++ while (u->refs_by_target)
++ unit_ref_unset(u->refs_by_target);
++
++ condition_free_list(u->conditions);
++ condition_free_list(u->asserts);
++
+ free(u->description);
+ strv_free(u->documentation);
+ free(u->fragment_path);
+@@ -548,15 +557,6 @@ void unit_free(Unit *u) {
+
+ set_free_free(u->names);
+
+- unit_unwatch_all_pids(u);
+-
+- condition_free_list(u->conditions);
+- condition_free_list(u->asserts);
+-
+- unit_ref_unset(&u->slice);
+- while (u->refs_by_target)
+- unit_ref_unset(u->refs_by_target);
+-
+ free(u);
+ }
+
diff --git a/SOURCES/0756-pid1-properly-remove-references-to-the-unit-from-gc-.patch b/SOURCES/0756-pid1-properly-remove-references-to-the-unit-from-gc-.patch
new file mode 100644
index 0000000..b4c8472
--- /dev/null
+++ b/SOURCES/0756-pid1-properly-remove-references-to-the-unit-from-gc-.patch
@@ -0,0 +1,79 @@
+From 019b19130bcba9d88c0328b40f2639e6ebbb513c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 13 Feb 2018 23:57:43 +0100
+Subject: [PATCH] pid1: properly remove references to the unit from gc queue
+ during final cleanup
+
+When various references to the unit were dropped during cleanup in unit_free(),
+add_to_gc_queue() could be called on this unit. If the unit was previously in
+the gc queue (at the time when unit_free() was called on it), this wouldn't
+matter, because it'd have in_gc_queue still set even though it was already
+removed from the queue. But if it wasn't set, then the unit could be added to
+the queue. Then after unit_free() would deallocate the unit, we would be left
+with a dangling pointer in gc_queue.
+
+A unit could be added to the gc queue in two places called from unit_free():
+in the job_install calls, and in unit_ref_unset(). The first was OK, because
+it was above the LIST_REMOVE(gc_queue,...) call, but the second was not, because
+it was after that. Move the all LIST_REMOVE() calls down.
+
+(cherry picked from commit 1bdf2790025e661e41894129eb390bb032b88585)
+(cherry picked from commit 8f1df942e2237124f7559176081af7ac631d3422)
+
+Related: #1729228
+---
+ src/core/unit.c | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 63f00acc0a..def36a0930 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -506,23 +506,6 @@ void unit_free(Unit *u) {
+ for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
+ bidi_set_free(u, u->dependencies[d]);
+
+- if (u->type != _UNIT_TYPE_INVALID)
+- LIST_REMOVE(units_by_type, u->manager->units_by_type[u->type], u);
+-
+- if (u->in_load_queue)
+- LIST_REMOVE(load_queue, u->manager->load_queue, u);
+-
+- if (u->in_dbus_queue)
+- LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
+-
+- if (u->in_cleanup_queue)
+- LIST_REMOVE(cleanup_queue, u->manager->cleanup_queue, u);
+-
+- if (u->in_gc_queue) {
+- LIST_REMOVE(gc_queue, u->manager->gc_queue, u);
+- u->manager->n_in_gc_queue--;
+- }
+-
+ if (u->in_target_deps_queue)
+ LIST_REMOVE(target_deps_queue, u->manager->target_deps_queue, u);
+
+@@ -543,6 +526,23 @@ void unit_free(Unit *u) {
+ while (u->refs_by_target)
+ unit_ref_unset(u->refs_by_target);
+
++ if (u->type != _UNIT_TYPE_INVALID)
++ LIST_REMOVE(units_by_type, u->manager->units_by_type[u->type], u);
++
++ if (u->in_load_queue)
++ LIST_REMOVE(load_queue, u->manager->load_queue, u);
++
++ if (u->in_dbus_queue)
++ LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
++
++ if (u->in_cleanup_queue)
++ LIST_REMOVE(cleanup_queue, u->manager->cleanup_queue, u);
++
++ if (u->in_gc_queue) {
++ LIST_REMOVE(gc_queue, u->manager->gc_queue, u);
++ u->manager->n_in_gc_queue--;
++ }
++
+ condition_free_list(u->conditions);
+ condition_free_list(u->asserts);
+
diff --git a/SOURCES/0757-service-relax-PID-file-symlink-chain-checks-a-bit-81.patch b/SOURCES/0757-service-relax-PID-file-symlink-chain-checks-a-bit-81.patch
new file mode 100644
index 0000000..4983c8f
--- /dev/null
+++ b/SOURCES/0757-service-relax-PID-file-symlink-chain-checks-a-bit-81.patch
@@ -0,0 +1,59 @@
+From 625b30e09d0090f81722aa8f02e7057839dfcf4f Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 9 Feb 2018 17:05:17 +0100
+Subject: [PATCH] service: relax PID file symlink chain checks a bit (#8133)
+
+Let's read the PID file after all if there's a potentially unsafe
+symlink chain in place. But if we do, then refuse taking the PID if its
+outside of the cgroup.
+
+Fixes: #8085
+
+(cherry picked from commit 73969ab61c39357e6892747e43307fbf07cafbed)
+(cherry picked from commit ce87ed7b47c61e649a0f9da39d272631b9524740)
+
+Resolves: #1729414
+---
+ src/core/service.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index eaa588863f..6b61ccac18 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -736,6 +736,7 @@ static int service_is_suitable_main_pid(Service *s, pid_t pid, int prio) {
+
+ static int service_load_pid_file(Service *s, bool may_warn) {
+ char procfs[sizeof("/proc/self/fd/") - 1 + DECIMAL_STR_MAX(int)];
++ bool questionable_pid_file = false;
+ _cleanup_free_ char *k = NULL;
+ _cleanup_close_ int fd = -1;
+ int r, prio;
+@@ -749,8 +750,13 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+ prio = may_warn ? LOG_INFO : LOG_DEBUG;
+
+ fd = chase_symlinks(s->pid_file, NULL, CHASE_OPEN|CHASE_SAFE, NULL);
+- if (fd == -EPERM)
+- return log_unit_full_errno(UNIT(s)->id, prio, fd, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
++ if (fd == -EPERM) {
++ log_unit_full(UNIT(s)->id, LOG_DEBUG, "Permission denied while opening PID file or potentially unsafe symlink chain, will now retry with relaxed checks: %s", s->pid_file);
++
++ questionable_pid_file = true;
++
++ fd = chase_symlinks(s->pid_file, NULL, CHASE_OPEN, NULL);
++ }
+ if (fd < 0)
+ return log_unit_full_errno(UNIT(s)->id, prio, fd, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
+
+@@ -773,6 +779,11 @@ static int service_load_pid_file(Service *s, bool may_warn) {
+ if (r == 0) {
+ struct stat st;
+
++ if (questionable_pid_file) {
++ log_unit_error(UNIT(s)->id, "Refusing to accept PID outside of service control group, acquired through unsafe symlink chain: %s", s->pid_file);
++ return -EPERM;
++ }
++
+ /* Hmm, it's not clear if the new main PID is safe. Let's allow this if the PID file is owned by root */
+
+ if (fstat(fd, &st) < 0)
diff --git a/SOURCES/0758-path-util-fix-more-path_is_mount-e792e890f-fallout.patch b/SOURCES/0758-path-util-fix-more-path_is_mount-e792e890f-fallout.patch
new file mode 100644
index 0000000..6cfafb1
--- /dev/null
+++ b/SOURCES/0758-path-util-fix-more-path_is_mount-e792e890f-fallout.patch
@@ -0,0 +1,83 @@
+From a4f13a2fdf5cf1650edbb02ac0393c6815ef472c Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 7 Apr 2015 16:03:45 +0200
+Subject: [PATCH] path-util: fix more path_is_mount e792e890f fallout
+
+(cherry picked from commit da00518b3f3a8b08d521c4b72068eafa2db566cc)
+
+Resolves: #1279231
+---
+ src/core/automount.c | 6 ++----
+ src/nspawn/nspawn.c | 2 +-
+ src/shared/cgroup-util.c | 6 ++++--
+ src/test/test-path-util.c | 10 ++++++++--
+ 4 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/automount.c b/src/core/automount.c
+index 7b9c4aaf1d..2d6f5f3a77 100644
+--- a/src/core/automount.c
++++ b/src/core/automount.c
+@@ -789,10 +789,8 @@ static int automount_start(Unit *u) {
+ assert(a);
+ assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
+
+- if (path_is_mount_point(a->where, false)) {
+- log_unit_error(u->id,
+- "Path %s is already a mount point, refusing start for %s",
+- a->where, u->id);
++ if (path_is_mount_point(a->where, false) > 0) {
++ log_unit_error(u->id, "Path %s is already a mount point, refusing start for %s", a->where, u->id);
+ return -EEXIST;
+ }
+
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index ee2e1832f1..e7ecee8674 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -864,7 +864,7 @@ static int mount_all(const char *dest) {
+ return log_oom();
+
+ t = path_is_mount_point(where, true);
+- if (t < 0) {
++ if (t < 0 && t != -ENOENT) {
+ log_error_errno(t, "Failed to detect whether %s is a mount point: %m", where);
+
+ if (r == 0)
+diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
+index 4585450b39..f1bed8a25a 100644
+--- a/src/shared/cgroup-util.c
++++ b/src/shared/cgroup-util.c
+@@ -489,8 +489,10 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
+ int r;
+
+ r = path_is_mount_point("/sys/fs/cgroup", false);
+- if (r <= 0)
+- return r < 0 ? r : -ENOENT;
++ if (r < 0)
++ return r;
++ if (r == 0)
++ return -ENOENT;
+
+ /* Cache this to save a few stat()s */
+ good = true;
+diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
+index aee1f4e036..aebfa3821d 100644
+--- a/src/test/test-path-util.c
++++ b/src/test/test-path-util.c
+@@ -86,8 +86,14 @@ static void test_path(void) {
+ test_parent("/aa///file...", "/aa///");
+ test_parent("file.../", NULL);
+
+- assert_se(path_is_mount_point("/", true));
+- assert_se(path_is_mount_point("/", false));
++ assert_se(path_is_mount_point("/", true) > 0);
++ assert_se(path_is_mount_point("/", false) > 0);
++
++ assert_se(path_is_mount_point("/proc", true) > 0);
++ assert_se(path_is_mount_point("/proc", false) > 0);
++
++ assert_se(path_is_mount_point("/sys", true) > 0);
++ assert_se(path_is_mount_point("/sys", false) > 0);
+
+ {
+ char p1[] = "aaa/bbb////ccc";