From 5cd59634104957491da94b6d8ecf7198189a78af Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mar 17 2022 21:02:39 +0000
Subject: Update to version 250.4


250.3 does not build because of the rebased bfq patch.

---

diff --git a/bbe53713455be38c0a587626439fd171f28c77fc.patch b/bbe53713455be38c0a587626439fd171f28c77fc.patch
deleted file mode 100644
index 9f5bd29..0000000
--- a/bbe53713455be38c0a587626439fd171f28c77fc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bbe53713455be38c0a587626439fd171f28c77fc Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Sun, 30 Jan 2022 23:40:05 +0100
-Subject: [PATCH] basic: update CIFS magic
-
-Kernel commit dea2903719283c156b53741126228c4a1b40440f exposed (and
-renamed) CIFS_MAGIC_NUMBER as CIFS_SUPER_MAGIC along with
-SMB2_SUPER_MAGIC.
-
-This fixes the following build fail on current Fedora Rawhide:
-```
-../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers:
-
-Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC
-Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC
-```
----
- src/basic/filesystems-gperf.gperf |  4 ++--
- src/basic/missing_magic.h         | 11 ++++++++---
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf
-index 08c8c445105a..e8c5357f9146 100644
---- a/src/basic/filesystems-gperf.gperf
-+++ b/src/basic/filesystems-gperf.gperf
-@@ -40,7 +40,7 @@ ceph,            {CEPH_SUPER_MAGIC}
- cgroup2,         {CGROUP2_SUPER_MAGIC}
- # note that the cgroupfs magic got reassigned from cpuset
- cgroup,          {CGROUP_SUPER_MAGIC}
--cifs,            {CIFS_MAGIC_NUMBER}
-+cifs,            {CIFS_SUPER_MAGIC, SMB2_SUPER_MAGIC}
- coda,            {CODA_SUPER_MAGIC}
- configfs,        {CONFIGFS_MAGIC}
- cramfs,          {CRAMFS_MAGIC}
-@@ -109,7 +109,7 @@ selinuxfs,       {SELINUX_MAGIC}
- shiftfs,         {SHIFTFS_MAGIC}
- smackfs,         {SMACK_MAGIC}
- # smb3 is an alias for cifs
--smb3,            {CIFS_MAGIC_NUMBER}
-+smb3,            {CIFS_SUPER_MAGIC}
- # smbfs was removed from the kernel in 2010, the magic remains
- smbfs,           {SMB_SUPER_MAGIC}
- sockfs,          {SOCKFS_MAGIC}
-diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h
-index 7d9320bb6dc9..c104fcfba315 100644
---- a/src/basic/missing_magic.h
-+++ b/src/basic/missing_magic.h
-@@ -38,9 +38,14 @@
- #define XFS_SB_MAGIC 0x58465342
- #endif
- 
--/* Not exposed yet. Defined at fs/cifs/cifsglob.h */
--#ifndef CIFS_MAGIC_NUMBER
--#define CIFS_MAGIC_NUMBER 0xFF534D42
-+/* dea2903719283c156b53741126228c4a1b40440f (5.17) */
-+#ifndef CIFS_SUPER_MAGIC
-+#define CIFS_SUPER_MAGIC 0xFF534D42
-+#endif
-+
-+/* dea2903719283c156b53741126228c4a1b40440f (5.17) */
-+#ifndef SMB2_SUPER_MAGIC
-+#define SMB2_SUPER_MAGIC 0xFE534D42
- #endif
- 
- /* 257f871993474e2bde6c497b54022c362cf398e1 (4.5) */
diff --git a/sources b/sources
index a1317df..59fb38c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemd-250.3.tar.gz) = 81847fb088ff271138b1ea318995a2ca2ee5d4c5d839c9dd81f0210d366198049199d59c49b25ef8783df2c6b8dd9fcdf2d916777788b1a6d42deec9da8e9da5
+SHA512 (systemd-250.4.tar.gz) = 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
diff --git a/systemd.spec b/systemd.spec
index d6132d6..d5ca3bc 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -30,8 +30,8 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 %if %{without inplace}
-Version:        250.3
-Release:        7%{?dist}
+Version:        250.4
+Release:        1%{?dist}
 %else
 # determine the build information from local checkout
 Version:        %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@@ -90,7 +90,7 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
 # Any patches which are "in preparation" upstream should be listed
 # here, rather than in the next section. Packit CI will drop any
 # patches in this range before applying upstream pull requests.
-Patch:          https://github.com/systemd/systemd/commit/bbe53713455be38c0a587626439fd171f28c77fc.patch
+
 
 # Downstream-only patches (5000–9999)
 # https://bugzilla.redhat.com/show_bug.cgi?id=1738828
@@ -1004,11 +1004,10 @@ fi
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
-* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-7
+* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.4-1
 - Move libcryptsetup plugins to -udev (#2031873)
-
-* Mon Mar 14 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 250.3-7
-- Disable default DNS over TLS (#1889901)
+- Move systemd-cryptenroll to -udev (David Tardon)
+- Disable default DNS over TLS (#1889901) (Michael Catanzaro)
 
 * Thu Feb 24 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 250.3-6
 - Avoid trying to create the symlink if there's a dangling symlink already in