$ git diff --patch-with-stat --summary 13779d476bd2973b0ad3f4d1b1b6576d8a382583..0f3135f543a064e03669dcdad6d42b7280d1125d

 .abf.yml                                           |  2 +-
 ...urnal-Add-option-to-skip-boot-kmsg-events.patch | 76 +++++++---------------
 ...generator-Do-not-automount-boot-partition.patch | 26 --------
 0018-more-udev-children-workers.patch              |  8 +--
 0019-not-load-iptables.patch                       | 14 ++--
 0028-Compile-udev-with-O3.patch                    | 10 +--
 systemd-245-importctl-fix-bsdtar-attributes.patch  | 14 ++--
 systemd.spec                                       | 61 +++++++++++------
 use-bfq-scheduler.patch                            | 43 ++++++++++++
 9 files changed, 129 insertions(+), 125 deletions(-)
 delete mode 100644 0008-efi-boot-generator-Do-not-automount-boot-partition.patch
 create mode 100644 use-bfq-scheduler.patch

diff --git a/.abf.yml b/.abf.yml
index b3e5b95..9dc92e2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  systemd-252.20230103.tar.xz: 68192f5cea357dfebc1a4b7d85253e20ceded486
+  v253.2.tar.gz: 5f1f70b77ba40925ffcf2b85195ce60628cf0bbf
diff --git a/0002-journal-Add-option-to-skip-boot-kmsg-events.patch b/0002-journal-Add-option-to-skip-boot-kmsg-events.patch
index b62cacb..0524694 100644
--- a/0002-journal-Add-option-to-skip-boot-kmsg-events.patch
+++ b/0002-journal-Add-option-to-skip-boot-kmsg-events.patch
@@ -1,37 +1,7 @@
-From 4186cb11ddf3c731d0c365bb819a4479ecf6b299 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
-Date: Tue, 23 Jun 2015 11:25:41 +0100
-Subject: [PATCH 02/45] journal: Add option to skip boot kmsg events
-
-The `BootKMsg` boolean is added. It defaults to `true` in the default
-system namespace, and doesn't change the default behavior of the
-journal.
-
-If set to `false`, then, when `systemd-journald` starts in the default
-namespace, it will ignore any existing message in the `kmsg` ring buffer
-and not insert these into the journal. We do this to reduce the time
-needed for the journal to start and reduce CPU overhead, since the
-kernel ring buffer can be large, and contain information that the user
-perhaps does not care about (e.g. initcall debug output).
-
-The information remains accessible through `dmesg` in case it needs
-to be retrieved later. This contains code originally added to
-ClearLinux by Dimitri -xnox- Ledkov in 2015.
-
-Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
-Cc: Dimitri John Ledkov <xnox@ubuntu.com>
----
- man/journald.conf.xml            |  9 +++++++++
- src/journal/journald-gperf.gperf |  1 +
- src/journal/journald-kmsg.c      | 11 +++++++++++
- src/journal/journald-server.c    |  2 +-
- src/journal/journald-server.h    |  1 +
- 5 files changed, 23 insertions(+), 1 deletion(-)
-
-diff -Naur systemd-246.20200811/man/journald.conf.xml systemd-246.20200811.tpg/man/journald.conf.xml
---- systemd-246.20200811/man/journald.conf.xml	2020-08-07 15:09:53.000000000 +0000
-+++ systemd-246.20200811.tpg/man/journald.conf.xml	2020-08-18 10:09:21.817030856 +0000
-@@ -421,6 +421,15 @@
+diff -up systemd-stable-253/man/journald.conf.xml.13~ systemd-stable-253/man/journald.conf.xml
+--- systemd-stable-253/man/journald.conf.xml.13~	2023-02-15 20:11:52.000000000 +0100
++++ systemd-stable-253/man/journald.conf.xml	2023-02-16 11:49:28.387773470 +0100
+@@ -438,6 +438,15 @@
        </varlistentry>
  
        <varlistentry>
@@ -47,10 +17,10 @@ diff -Naur systemd-246.20200811/man/journald.conf.xml systemd-246.20200811.tpg/m
          <term><varname>TTYPath=</varname></term>
  
          <listitem><para>Change the console TTY to use if
-diff -Naur systemd-246.20200811/src/journal/journald-gperf.gperf systemd-246.20200811.tpg/src/journal/journald-gperf.gperf
---- systemd-246.20200811/src/journal/journald-gperf.gperf	2020-08-07 15:09:53.000000000 +0000
-+++ systemd-246.20200811.tpg/src/journal/journald-gperf.gperf	2020-08-18 10:10:10.282031129 +0000
-@@ -22,6 +22,7 @@
+diff -up systemd-stable-253/src/journal/journald-gperf.gperf.13~ systemd-stable-253/src/journal/journald-gperf.gperf
+--- systemd-stable-253/src/journal/journald-gperf.gperf.13~	2023-02-15 20:11:52.000000000 +0100
++++ systemd-stable-253/src/journal/journald-gperf.gperf	2023-02-16 11:49:28.387773470 +0100
+@@ -23,6 +23,7 @@ Journal.Storage,            config_parse
  Journal.Compress,           config_parse_compress,   0, offsetof(Server, compress)
  Journal.Seal,               config_parse_bool,       0, offsetof(Server, seal)
  Journal.ReadKMsg,           config_parse_bool,       0, offsetof(Server, read_kmsg)
@@ -58,10 +28,10 @@ diff -Naur systemd-246.20200811/src/journal/journald-gperf.gperf systemd-246.202
  Journal.Audit,              config_parse_tristate,   0, offsetof(Server, set_audit)
  Journal.SyncIntervalSec,    config_parse_sec,        0, offsetof(Server, sync_interval_usec)
  # The following is a legacy name for compatibility
-diff -Naur systemd-246.20200811/src/journal/journald-kmsg.c systemd-246.20200811.tpg/src/journal/journald-kmsg.c
---- systemd-246.20200811/src/journal/journald-kmsg.c	2020-08-07 15:09:53.000000000 +0000
-+++ systemd-246.20200811.tpg/src/journal/journald-kmsg.c	2020-08-18 10:11:38.099031623 +0000
-@@ -384,6 +384,17 @@
+diff -up systemd-stable-253/src/journal/journald-kmsg.c.13~ systemd-stable-253/src/journal/journald-kmsg.c
+--- systemd-stable-253/src/journal/journald-kmsg.c.13~	2023-02-16 11:49:28.388773475 +0100
++++ systemd-stable-253/src/journal/journald-kmsg.c	2023-02-16 11:50:40.626345160 +0100
+@@ -397,6 +397,17 @@ int server_open_dev_kmsg(Server *s) {
          if (!s->read_kmsg)
                  return 0;
  
@@ -77,12 +47,12 @@ diff -Naur systemd-246.20200811/src/journal/journald-kmsg.c systemd-246.20200811
 +        }
 +
          r = sd_event_add_io(s->event, &s->dev_kmsg_event_source, s->dev_kmsg_fd, EPOLLIN, dispatch_dev_kmsg, s);
-         if (r < 0) {
- 
-diff -Naur systemd-246.20200811/src/journal/journald-server.c systemd-246.20200811.tpg/src/journal/journald-server.c
---- systemd-246.20200811/src/journal/journald-server.c	2020-08-18 10:07:02.936030073 +0000
-+++ systemd-246.20200811.tpg/src/journal/journald-server.c	2020-08-18 10:12:01.348031754 +0000
-@@ -2239,7 +2239,7 @@
+         if (r == -EPERM) { /* This will fail with EPERM on older kernels where /dev/kmsg is not readable. */
+                 r = 0;
+diff -up systemd-stable-253/src/journal/journald-server.c.13~ systemd-stable-253/src/journal/journald-server.c
+--- systemd-stable-253/src/journal/journald-server.c.13~	2023-02-16 11:49:28.344773243 +0100
++++ systemd-stable-253/src/journal/journald-server.c	2023-02-16 11:49:28.388773475 +0100
+@@ -2403,7 +2403,7 @@ int server_init(Server *s, const char *n
                  return r;
  
          /* By default, only read from /dev/kmsg if are the main namespace */
@@ -91,10 +61,10 @@ diff -Naur systemd-246.20200811/src/journal/journald-server.c systemd-246.202008
          s->storage = s->namespace ? STORAGE_PERSISTENT : STORAGE_AUTO;
  
          journal_reset_metrics(&s->system_storage.metrics);
-diff -Naur systemd-246.20200811/src/journal/journald-server.h systemd-246.20200811.tpg/src/journal/journald-server.h
---- systemd-246.20200811/src/journal/journald-server.h	2020-08-07 15:09:53.000000000 +0000
-+++ systemd-246.20200811.tpg/src/journal/journald-server.h	2020-08-18 10:12:47.060032012 +0000
-@@ -108,6 +108,7 @@
+diff -up systemd-stable-253/src/journal/journald-server.h.13~ systemd-stable-253/src/journal/journald-server.h
+--- systemd-stable-253/src/journal/journald-server.h.13~	2023-02-15 20:11:52.000000000 +0100
++++ systemd-stable-253/src/journal/journald-server.h	2023-02-16 11:49:28.388773475 +0100
+@@ -108,6 +108,7 @@ struct Server {
          JournalCompressOptions compress;
          bool seal;
          bool read_kmsg;
@@ -102,5 +72,3 @@ diff -Naur systemd-246.20200811/src/journal/journald-server.h systemd-246.202008
          int set_audit;
  
          bool forward_to_kmsg;
--- 
-2.26.0
diff --git a/0008-efi-boot-generator-Do-not-automount-boot-partition.patch b/0008-efi-boot-generator-Do-not-automount-boot-partition.patch
deleted file mode 100644
index 031f81c..0000000
--- a/0008-efi-boot-generator-Do-not-automount-boot-partition.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From efecb6bbcb01dbcb2a6960982fc711de26b7a35a Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
-Date: Tue, 23 Jun 2015 11:48:36 +0100
-Subject: [PATCH 08/45] efi-boot-generator: Do not automount boot partition.
-
----
- src/gpt-auto-generator/gpt-auto-generator.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 2067eeaf89..b82ae66c9f 100644
---- a/src/gpt-auto-generator/gpt-auto-generator.c
-+++ b/src/gpt-auto-generator/gpt-auto-generator.c
-@@ -433,6 +433,9 @@ static int add_automount(
-         if (r < 0)
-                 return log_error_errno(r, "Failed to write unit file %s: %m", p);
- 
-+        if (streq(id, "boot"))
-+                return 0;
-+
-         return generator_add_symlink(arg_dest, SPECIAL_LOCAL_FS_TARGET, "wants", unit);
- }
- 
--- 
-2.26.0
-
diff --git a/0018-more-udev-children-workers.patch b/0018-more-udev-children-workers.patch
index 3d7956e..6e30bea 100644
--- a/0018-more-udev-children-workers.patch
+++ b/0018-more-udev-children-workers.patch
@@ -1,12 +1,12 @@
-diff -up systemd-249.20210625/units/systemd-udevd.service.in.20~ systemd-249.20210625/units/systemd-udevd.service.in
---- systemd-249.20210625/units/systemd-udevd.service.in.20~	2021-06-25 17:30:26.609387649 +0200
-+++ systemd-249.20210625/units/systemd-udevd.service.in	2021-06-25 17:31:18.234899641 +0200
+diff -up systemd-stable-253/units/systemd-udevd.service.in.18~ systemd-stable-253/units/systemd-udevd.service.in
+--- systemd-stable-253/units/systemd-udevd.service.in.18~	2023-02-16 11:50:57.730587839 +0100
++++ systemd-stable-253/units/systemd-udevd.service.in	2023-02-16 11:51:33.838086195 +0100
 @@ -24,7 +24,7 @@ OOMScoreAdjust=-1000
  Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
  Restart=always
  RestartSec=0
 -ExecStart={{ROOTLIBEXECDIR}}/systemd-udevd
 +ExecStart={{ROOTLIBEXECDIR}}/systemd-udevd --children-max=16
- ExecReload=udevadm control --reload --timeout 0
  KillMode=mixed
  TasksMax=infinity
+ PrivateMounts=yes
diff --git a/0019-not-load-iptables.patch b/0019-not-load-iptables.patch
index 6820c7f..c161c6f 100644
--- a/0019-not-load-iptables.patch
+++ b/0019-not-load-iptables.patch
@@ -1,14 +1,14 @@
-diff -up systemd-251.20220617/src/core/kmod-setup.c.21~ systemd-251.20220617/src/core/kmod-setup.c
---- systemd-251.20220617/src/core/kmod-setup.c.21~	2022-06-17 12:50:00.503083082 +0200
-+++ systemd-251.20220617/src/core/kmod-setup.c	2022-06-17 12:50:39.852292409 +0200
-@@ -108,10 +108,6 @@ int kmod_setup(void) {
+diff -up systemd-stable-253/src/core/kmod-setup.c.19~ systemd-stable-253/src/core/kmod-setup.c
+--- systemd-stable-253/src/core/kmod-setup.c.19~	2023-02-16 11:51:47.608271475 +0100
++++ systemd-stable-253/src/core/kmod-setup.c	2023-02-16 11:52:16.864656816 +0100
+@@ -109,10 +109,6 @@ int kmod_setup(void) {
                  /* This should never be a module */
-                 { "unix",      "/proc/net/unix",            true,   true,    NULL      },
+                 { "unix",        "/proc/net/unix",            true,  true,  NULL           },
  
 -#if HAVE_LIBIPTC
 -                /* netfilter is needed by networkd, nspawn among others, and cannot be autoloaded */
--                { "ip_tables", "/proc/net/ip_tables_names", false,  false,   NULL      },
+-                { "ip_tables",   "/proc/net/ip_tables_names", false, false, NULL           },
 -#endif
                  /* virtio_rng would be loaded by udev later, but real entropy might be needed very early */
-                 { "virtio_rng", NULL,                       false,  false,   has_virtio_rng },
+                 { "virtio_rng",  NULL,                        false, false, has_virtio_rng },
  
diff --git a/0028-Compile-udev-with-O3.patch b/0028-Compile-udev-with-O3.patch
index 9de45e9..01ad756 100644
--- a/0028-Compile-udev-with-O3.patch
+++ b/0028-Compile-udev-with-O3.patch
@@ -1,11 +1,11 @@
-diff -up systemd-251.20220617/meson.build.26~ systemd-251.20220617/meson.build
---- systemd-251.20220617/meson.build.26~	2022-06-17 12:52:11.782785457 +0200
-+++ systemd-251.20220617/meson.build	2022-06-17 12:52:40.622941175 +0200
-@@ -3545,6 +3545,7 @@ public_programs += executable(
+diff -up systemd-stable-253/meson.build.24~ systemd-stable-253/meson.build
+--- systemd-stable-253/meson.build.24~	2023-02-16 11:52:35.308894166 +0100
++++ systemd-stable-253/meson.build	2023-02-16 11:53:06.420285236 +0100
+@@ -3826,6 +3826,7 @@ public_programs += executable(
  udevadm = executable(
          'udevadm',
          udevadm_sources,
 +        c_args : ['-O3'],
          include_directories : includes,
          link_with : [libudevd_core],
-         dependencies : [versiondep,
+         dependencies : [threads,
diff --git a/systemd-245-importctl-fix-bsdtar-attributes.patch b/systemd-245-importctl-fix-bsdtar-attributes.patch
index 91676b5..c771da2 100644
--- a/systemd-245-importctl-fix-bsdtar-attributes.patch
+++ b/systemd-245-importctl-fix-bsdtar-attributes.patch
@@ -1,15 +1,15 @@
-diff -up systemd-246.20200806/src/import/import-common.c.34~ systemd-246.20200806/src/import/import-common.c
---- systemd-246.20200806/src/import/import-common.c.34~	2020-08-06 23:02:11.227462692 +0200
-+++ systemd-246.20200806/src/import/import-common.c	2020-08-06 23:03:02.525124891 +0200
-@@ -85,7 +85,6 @@ int import_fork_tar_x(const char *path,
-                        "-C", path,
-                        "-px",
+diff -Naur systemd-252.20230212/src/import/import-common.c systemd-252.20230212.tpg/src/import/import-common.c
+--- systemd-252.20230212/src/import/import-common.c	2023-02-10 20:28:11.000000000 +0000
++++ systemd-252.20230212.tpg/src/import/import-common.c	2023-02-14 19:05:38.770960827 +0000
+@@ -49,7 +49,6 @@
+                        "-pxf",
+                        "-",
                         "--xattrs",
 -                       "--xattrs-include=*",
                         use_selinux ? "--selinux" : "--no-selinux",
                         NULL
                  };
-@@ -156,7 +155,6 @@ int import_fork_tar_c(const char *path,
+@@ -120,7 +119,6 @@
                          "-C", path,
                          "-c",
                          "--xattrs",
diff --git a/systemd.spec b/systemd.spec
index 4d4c36e..4dce461 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -39,22 +39,23 @@
 %define udev_rules_dir %{udev_libdir}/rules.d
 %define udev_user_rules_dir %{_sysconfdir}/udev/rules.d
 
-%define major 252
-%define stable 20230103
+%define major 253.2
+%define major1 %(echo %{major} |cut -d. -f1)
+%define stable %{nil}
 
 Summary:	A System and Session Manager
 Name:		systemd
 %if 0%stable
 Version:	%{major}.%{stable}
 # Packaged from v%(echo %{version} |cut -d. -f1)-stable branch of
-# git clone https://github.com/systemd/systemd-stable/ -b v252-stable
-# cd systemd-stable && git archive --prefix=systemd-252.$(date +%Y%m%d)/ --format=tar origin/v252-stable | xz -9ef > ../systemd-252.$(date +%Y%m%d).tar.xz
+# git clone https://github.com/systemd/systemd-stable/ -b v253-stable
+# cd systemd-stable && git archive --prefix=systemd-stable-253.$(date +%Y%m%d)/ --format=tar origin/v253-stable | xz -9ef > ../systemd-stable-253.$(date +%Y%m%d).tar.xz
 Source0:	systemd-%{version}.tar.xz
 %else
 Version:	%{major}
-Source0:	https://github.com/systemd/systemd/archive/v%{version}.tar.gz
+Source0:	https://github.com/systemd/systemd-stable/archive/refs/tags/v%{version}.tar.gz
 %endif
-Release:	1
+Release:	2
 License:	GPLv2+
 Group:		System/Configuration/Boot and Init
 Url:		https://systemd.io/
@@ -107,7 +108,6 @@ Patch101:	0002-journal-Add-option-to-skip-boot-kmsg-events.patch
 Patch102:	0003-core-use-mmap-to-load-files.patch
 Patch103:	0005-journal-flush-var-kmsg-after-starting-disable-kmsg-f.patch
 Patch104:	0007-sd-event-return-malloc-memory-reserves-when-main-loo.patch
-Patch105:	0008-efi-boot-generator-Do-not-automount-boot-partition.patch
 Patch107:	0016-tmpfiles-Make-var-cache-ldconfig-world-readable.patch
 Patch108:	0018-more-udev-children-workers.patch
 Patch109:	0019-not-load-iptables.patch
@@ -130,6 +130,7 @@ Patch1002:	systemd-245-importctl-fix-bsdtar-attributes.patch
 Patch1003:	systemd-250-compile.patch
 
 # (tpg) Fedora patches
+Patch1100:	https://src.fedoraproject.org/rpms/systemd/raw/rawhide/f/use-bfq-scheduler.patch
 
 # Upstream patches from master that haven't landed in -stable yet
 
@@ -189,6 +190,7 @@ BuildRequires:	pkgconfig(mount) >= 2.27
 BuildRequires:	pkgconfig(fdisk)
 BuildRequires:	pkgconfig(pwquality)
 BuildRequires:	python3dist(jinja2)
+BuildRequires:	pkgconfig(tss2-sys)
 # make sure we have /etc/os-release available, required by --with-distro
 BuildRequires:	distro-release-OpenMandriva
 %if !%{with bootstrap}
@@ -270,7 +272,6 @@ BuildRequires:	libc6
 BuildRequires:	devel(libcap)
 BuildRequires:	devel(libpcre2-8)
 BuildRequires:	devel(libcrypto)
-BuildRequires:	devel(libcurl)
 BuildRequires:	devel(libcrypt) libcrypt-devel
 BuildRequires:	devel(liblzma)
 BuildRequires:	devel(libglib-2.0)
@@ -726,10 +727,10 @@ Group:		System/Configuration/Boot and Init
 Requires:	%{name} = %{EVRD}
 
 %description integritysetup
-System integrity checker
+System integrity checker.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n systemd-stable-%{version}
 
 %build
 %ifarch %{ix86}
@@ -813,6 +814,7 @@ PATH=$PWD/bin:$PATH
 	-Dfirst-boot-full-preset=false \
 	-Dcryptolib=openssl \
 	-Dlibiptc=false \
+	-Dlibcurl=false \
 	-Dbpf-framework=false \
 	-Dlz4=false \
 	-Ddefault-compression=zstd
@@ -1229,7 +1231,7 @@ if [ -f /etc/nsswitch.conf ]; then
 		s/^(passwd:.*) mymachines$/\1/;
 		s/^(group:.*) mymachines$/\1/;
 		' /etc/nsswitch.conf &>/dev/null || :
-fie
+fi
 
 %triggerin -- %{libnss_resolve} < 237
 if [ -f /etc/nsswitch.conf ]; then
@@ -1250,6 +1252,11 @@ fi
 %pre journal-remote
 %sysusers_create_package systemd-remote.conf %{SOURCE25}
 
+%ifarch %{efi}
+%postun boot
+%systemd_postun_with_restart systemd-boot-update.service
+%endif
+
 %files
 %dir %{_prefix}/lib/firmware
 %dir %{_prefix}/lib/firmware/updates
@@ -1385,6 +1392,7 @@ fi
 %{_bindir}/hostnamectl
 %{_bindir}/kernel-install
 %{_bindir}/localectl
+%{_bindir}/systemd-ac-power
 %{_bindir}/systemd-cat
 %{_bindir}/systemd-detect-virt
 %{_bindir}/systemd-dissect
@@ -1492,10 +1500,13 @@ fi
 %{systemd_libdir}/system/systemd-binfmt.service
 %{systemd_libdir}/system/systemd-bless-boot.service
 %{systemd_libdir}/system/systemd-boot-check-no-failures.service
+%{systemd_libdir}/system/systemd-boot-random-seed.service
 %{systemd_libdir}/system/systemd-exit.service
 %{systemd_libdir}/system/systemd-firstboot.service
 %{systemd_libdir}/system/systemd-fsck-root.service
 %{systemd_libdir}/system/systemd-fsck@.service
+%{systemd_libdir}/system/systemd-growfs-root.service
+%{systemd_libdir}/system/systemd-growfs@.service
 %{systemd_libdir}/system/systemd-halt.service
 %{systemd_libdir}/system/systemd-hibernate-resume@.service
 %{systemd_libdir}/system/systemd-hibernate.service
@@ -1514,6 +1525,10 @@ fi
 %{systemd_libdir}/system/systemd-pcrphase-initrd.service
 %{systemd_libdir}/system/systemd-pcrphase-sysinit.service
 %{systemd_libdir}/system/systemd-pcrphase.service
+%{systemd_libdir}/system/systemd-journald-audit.socket
+%{systemd_libdir}/system/systemd-pcrfs-root.service
+%{systemd_libdir}/system/systemd-pcrfs@.service
+%{systemd_libdir}/system/systemd-pcrmachine.service
 %{systemd_libdir}/system/systemd-poweroff.service
 %{systemd_libdir}/system/systemd-pstore.service
 %{systemd_libdir}/system/systemd-quotacheck.service
@@ -1547,7 +1562,6 @@ fi
 # Sockets
 %{systemd_libdir}/system/syslog.socket
 %{systemd_libdir}/system/systemd-initctl.socket
-%{systemd_libdir}/system/systemd-journald-audit.socket
 %{systemd_libdir}/system/systemd-journald-dev-log.socket
 %{systemd_libdir}/system/systemd-journald-varlink@.socket
 %{systemd_libdir}/system/systemd-journald.socket
@@ -1633,7 +1647,6 @@ fi
 %{systemd_libdir}/system/multi-user.target.wants/getty.target
 %{systemd_libdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service
 %{systemd_libdir}/system/sockets.target.wants/systemd-initctl.socket
-%{systemd_libdir}/system/sockets.target.wants/systemd-journald-audit.socket
 %{systemd_libdir}/system/sockets.target.wants/systemd-journald-dev-log.socket
 %{systemd_libdir}/system/sockets.target.wants/systemd-journald.socket
 %{systemd_libdir}/system/sockets.target.wants/systemd-udevd-control.socket
@@ -1650,12 +1663,14 @@ fi
 %{systemd_libdir}/system/sysinit.target.wants/sys-kernel-tracing.mount
 %{systemd_libdir}/system/sysinit.target.wants/systemd-ask-password-console.path
 %{systemd_libdir}/system/sysinit.target.wants/systemd-binfmt.service
+%{systemd_libdir}/system/sysinit.target.wants/systemd-boot-random-seed.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-firstboot.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-journal-catalog-update.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-journal-flush.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-journald.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-machine-id-commit.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-modules-load.service
+%{systemd_libdir}/system/sysinit.target.wants/systemd-pcrmachine.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-pcrphase-sysinit.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-pcrphase.service
 %{systemd_libdir}/system/sysinit.target.wants/systemd-random-seed.service
@@ -1671,7 +1686,6 @@ fi
 %{systemd_libdir}/system/usb-gadget.target
 %{systemd_libdir}/system/timers.target.wants/systemd-tmpfiles-clean.timer
 %{systemd_libdir}/systemd
-%{systemd_libdir}/systemd-ac-power
 %{systemd_libdir}/systemd-backlight
 %{systemd_libdir}/systemd-binfmt
 %{systemd_libdir}/systemd-bless-boot
@@ -1688,7 +1702,9 @@ fi
 %{systemd_libdir}/systemd-localed
 %{systemd_libdir}/systemd-logind
 %{systemd_libdir}/systemd-makefs
+%{systemd_libdir}/systemd-measure
 %{systemd_libdir}/systemd-modules-load
+%{systemd_libdir}/systemd-pcrphase
 %{systemd_libdir}/systemd-pstore
 %{systemd_libdir}/systemd-quotacheck
 %{systemd_libdir}/systemd-random-seed
@@ -1717,15 +1733,17 @@ fi
 %{systemd_libdir}/systemd-xdg-autostart-condition
 %{systemd_libdir}/resolv.conf
 # (tpg) internal libraries - only systemd uses them
-%{_libdir}/systemd/libsystemd-core-%{major}.so
-%{_libdir}/systemd/libsystemd-shared-%{major}.so
+%{_libdir}/systemd/libsystemd-core-%{major1}.so
+%{_libdir}/systemd/libsystemd-shared-%{major1}.so
 #
 %{udev_rules_dir}/10-imx.rules
 %{udev_rules_dir}/50-udev-default.rules
 %{udev_rules_dir}/50-udev-mandriva.rules
 %{udev_rules_dir}/60-autosuspend.rules
 %{udev_rules_dir}/60-block.rules
+%{udev_rules_dir}/60-block-scheduler.rules
 %{udev_rules_dir}/60-fido-id.rules
+%{udev_rules_dir}/60-infiniband.rules
 %{udev_rules_dir}/60-persistent-storage.rules
 %{udev_rules_dir}/60-sensor.rules
 %{udev_rules_dir}/60-serial.rules
@@ -1784,6 +1802,7 @@ fi
 %{systemd_libdir}/system/factory-reset.target
 %{systemd_libdir}/system/systemd-boot-update.service
 %{systemd_libdir}/systemd-update-helper
+%{systemd_libdir}/ukify
 %{_prefix}/lib/kernel/install.conf
 %{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml
@@ -1961,8 +1980,6 @@ fi
 %ifarch %{efi}
 %files boot
 %{_bindir}/bootctl
-%{systemd_libdir}/system/systemd-boot-system-token.service
-%{systemd_libdir}/system/sysinit.target.wants/systemd-boot-system-token.service
 %dir %{_prefix}/lib/%{name}/boot
 %dir %{_prefix}/lib/%{name}/boot/efi
 %dir %{_datadir}/%{name}/bootctl
@@ -1970,12 +1987,12 @@ fi
 %{_prefix}/lib/%{name}/boot/efi/*.stub
 %{_datadir}/%{name}/bootctl/*.conf
 %ghost %{_datadir}/%{name}/bootctl/splash-omv.bmp
-%endif
 
 %post boot
 if [ ! -e %{_datadir}/%{name}/bootctl/splash-omv.bmp ] && [ -e %{_datadir}/pixmaps/system-logo-white.png ] && [ -x %{_bindir}/convert ]; then
     convert %{_datadir}/pixmaps/system-logo-white.png -type truecolor %{_datadir}/%{name}/bootctl/splash-omv.bmp
 fi
+%endif
 
 %files console
 %{systemd_libdir}/systemd-vconsole-setup
@@ -2049,6 +2066,7 @@ fi
 %{_bindir}/networkctl
 %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
 %{systemd_libdir}/network/80-container-host0.network
+%{systemd_libdir}/network/80-container-vb.network
 %{systemd_libdir}/network/80-container-ve.network
 %{systemd_libdir}/network/80-container-vz.network
 %{systemd_libdir}/network/80-vm-vt.network
@@ -2084,6 +2102,7 @@ fi
 %{systemd_libdir}/system/veritysetup.target
 %{_bindir}/systemd-cryptenroll
 %{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
+%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so
 %endif
 
 %files zsh-completion
@@ -2121,8 +2140,8 @@ fi
 
 %files -n %{lib32systemd}
 %{_prefix}/lib/libsystemd.so.*
-%{_prefix}/lib/systemd/libsystemd-core-%{major}.so
-%{_prefix}/lib/systemd/libsystemd-shared-%{major}.so
+%{_prefix}/lib/systemd/libsystemd-core-%{major1}.so
+%{_prefix}/lib/systemd/libsystemd-shared-%{major1}.so
 
 %files -n %{lib32udev}
 %{_prefix}/lib/libudev.so.*
diff --git a/use-bfq-scheduler.patch b/use-bfq-scheduler.patch
new file mode 100644
index 0000000..59e642a
--- /dev/null
+++ b/use-bfq-scheduler.patch
@@ -0,0 +1,43 @@
+From 1990fb757f6d275d807fcb48ad09f5fc7c947bc6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 14 Aug 2019 15:57:42 +0200
+Subject: [PATCH] udev: use bfq as the default scheduler
+
+As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828.
+Test results are that bfq seems to behave better and more consistently on
+typical hardware. The kernel does not have a configuration option to set
+the default scheduler, and it currently needs to be set by userspace.
+
+See the bug for more discussion and links.
+---
+ rules.d/60-block-scheduler.rules | 5 +++++
+ rules.d/meson.build              | 1 +
+ 2 files changed, 6 insertions(+)
+ create mode 100644 rules.d/60-block-scheduler.rules
+
+diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules
+new file mode 100644
+index 0000000000..850b64540e
+--- /dev/null
++++ b/rules.d/60-block-scheduler.rules
+@@ -0,0 +1,5 @@
++# do not edit this file, it will be overwritten on update
++
++ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \
++  KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \
++  ATTR{queue/scheduler}="bfq"
+diff --git a/rules.d/meson.build b/rules.d/meson.build
+index 8d2878a36d..a3b395c9ce 100644
+--- a/rules.d/meson.build
++++ b/rules.d/meson.build
+@@ -8,6 +8,7 @@ rules = [
+         [files('60-autosuspend.rules',
+                '60-block.rules',
+                '60-cdrom_id.rules',
++               '60-block-scheduler.rules',
+                '60-drm.rules',
+                '60-evdev.rules',
+                '60-fido-id.rules',
+-- 
+2.37.2
+