From d80a45533db738147b5def10874f0b84d97b8b64 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 13 2023 10:09:53 +0000
Subject: Version 254~rc1


- Way too many changes to list. See
  https://raw.githubusercontent.com/systemd/systemd/v254-rc1/NEWS
- Fix regression in socket activation of services (rhbz#2213660).

---

diff --git a/fedora-use-system-auth-in-pam-systemd-user.patch b/fedora-use-system-auth-in-pam-systemd-user.patch
index 3b7c10d..df820e2 100644
--- a/fedora-use-system-auth-in-pam-systemd-user.patch
+++ b/fedora-use-system-auth-in-pam-systemd-user.patch
@@ -1,14 +1,14 @@
-From 4e6479054ae2090b99a50d6ae954d22efc8340a0 Mon Sep 17 00:00:00 2001
+From c4b803dc60b63a35c977d39610b7872175ec03bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
 Date: Wed, 14 Dec 2022 22:24:53 +0100
-Subject: [PATCH 4/4] fedora: use system-auth in pam systemd-user
+Subject: [PATCH] fedora: use system-auth in pam systemd-user
 
 ---
  src/login/systemd-user.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/login/systemd-user.in b/src/login/systemd-user.in
-index 9a665bd959..703a4b3174 100644
+index 8a3c9e0165..74ef5f2552 100644
 --- a/src/login/systemd-user.in
 +++ b/src/login/systemd-user.in
 @@ -7,7 +7,7 @@
@@ -20,12 +20,12 @@ index 9a665bd959..703a4b3174 100644
  
  {% if HAVE_SELINUX %}
  session  required   pam_selinux.so close
-@@ -19,4 +19,4 @@ session  required   pam_namespace.so
- {% if ENABLE_HOMED %}
+@@ -20,4 +20,4 @@ session  required   pam_namespace.so
  -session optional   pam_systemd_home.so
  {% endif %}
+ session  optional   pam_umask.so silent
 -session  optional   pam_systemd.so
 +session  include    system-auth
 -- 
-2.38.1
+2.41.0
 
diff --git a/sources b/sources
index b97b829..704ea14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemd-253.5.tar.gz) = 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e
+SHA512 (systemd-254-rc1.tar.gz) = 84124f4f861e17734bb07e235135cb20d8a2092de6f779ff71dccf93844e7b972304660193aa14834b74a64e29af9b3f70b342aac645aa36230e5cc2462d6d77
diff --git a/systemd.spec b/systemd.spec
index ccb75b6..6444e58 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -28,7 +28,7 @@
 Name:           systemd
 Url:            https://systemd.io
 %if %{without inplace}
-Version:        253.5
+Version:        254~rc1
 %else
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@@ -537,7 +537,7 @@ other libraries from systemd-libs. This package conflicts with the main systemd
 package and is meant for use in exitrds.
 
 %prep
-%autosetup -n %{?commit:%{name}%{?stable:-stable}-%{commit}}%{!?commit:%{name}%{?stable:-stable}-%{version_no_tilde}} -p1
+%autosetup -n %{?commit:%{name}%[%stable?"-stable":""]-%{commit}}%{!?commit:%{name}%[%stable?"-stable":""]-%{version_no_tilde}} -p1
 
 # We want to update sd-boot from packaging scriptlets after package update.
 # Let's disable the service.
diff --git a/use-bfq-scheduler.patch b/use-bfq-scheduler.patch
index 59e642a..6ad5e5d 100644
--- a/use-bfq-scheduler.patch
+++ b/use-bfq-scheduler.patch
@@ -27,17 +27,17 @@ index 0000000000..850b64540e
 +  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
+index 20fca222da..94fee9d7c0 100644
 --- a/rules.d/meson.build
 +++ b/rules.d/meson.build
-@@ -8,6 +8,7 @@ rules = [
+@@ -7,6 +7,7 @@ install_data(
+ rules = [
          [files('60-autosuspend.rules',
                 '60-block.rules',
-                '60-cdrom_id.rules',
 +               '60-block-scheduler.rules',
+                '60-cdrom_id.rules',
+                '60-dmi-id.rules',
                 '60-drm.rules',
-                '60-evdev.rules',
-                '60-fido-id.rules',
 -- 
-2.37.2
+2.41.0