From 0b51ecfabd22bb1e9ff3ab8832217cb6ac78db31 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Oct 07 2022 16:39:55 +0000
Subject: Version 252-rc1


... (for details see https://raw.githubusercontent.com/systemd/systemd/v252-rc1/NEWS)

systemd-pcrphase and systemd-measure and initrd-* units are moved to systemd-udev.
systemd-udev should be part of the initrd, and those tools don't make much sense
in systems without hardware (i.e. containers). (systemd-measure could possibly be
useful, but we can always move it back if there's a good reason.)

---

diff --git a/0002-test-mountpoint-util-support-running-on-a-mount-name.patch b/0002-test-mountpoint-util-support-running-on-a-mount-name.patch
deleted file mode 100644
index 00c056b..0000000
--- a/0002-test-mountpoint-util-support-running-on-a-mount-name.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b13268dc09eed68426c2e68a402c96b93f8b0fff Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Mon, 12 Sep 2022 04:57:17 +0900
-Subject: [PATCH] test-mountpoint-util: support running on a mount namespace
- with another mount on /proc
-
-Fixes #11505.
----
- src/test/test-mountpoint-util.c | 30 +++++++++++++++++++++---------
- 1 file changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c
-index 92eed0be62..391e1c97ba 100644
---- a/src/test/test-mountpoint-util.c
-+++ b/src/test/test-mountpoint-util.c
-@@ -83,24 +83,36 @@ TEST(mnt_id) {
- 
-         HASHMAP_FOREACH_KEY(p, k, h) {
-                 int mnt_id = PTR_TO_INT(k), mnt_id2;
-+                const char *q;
- 
-                 r = path_get_mnt_id(p, &mnt_id2);
-                 if (r < 0) {
--                        log_debug_errno(r, "Failed to get the mnt id of %s: %m\n", p);
-+                        log_debug_errno(r, "Failed to get the mnt id of %s: %m", p);
-                         continue;
-                 }
- 
-                 if (mnt_id == mnt_id2) {
--                        log_debug("mnt ids of %s is %i\n", p, mnt_id);
-+                        log_debug("mnt ids of %s is %i.", p, mnt_id);
-                         continue;
-                 } else
--                        log_debug("mnt ids of %s are %i, %i\n", p, mnt_id, mnt_id2);
--
--                /* The ids don't match? If so, then there are two mounts on the same path, let's check if
--                 * that's really the case */
--                char *t = hashmap_get(h, INT_TO_PTR(mnt_id2));
--                log_debug("the other path for mnt id %i is %s\n", mnt_id2, t);
--                assert_se(path_equal(p, t));
-+                        log_debug("mnt ids of %s are %i (from /proc/self/mountinfo), %i (from path_get_mnt_id()).", p, mnt_id, mnt_id2);
-+
-+                /* The ids don't match? This can easily happen e.g. running with "unshare --mount-proc".
-+                 * See #11505. */
-+                assert_se(q = hashmap_get(h, INT_TO_PTR(mnt_id2)));
-+
-+                assert_se((r = path_is_mount_point(p, NULL, 0)) >= 0);
-+                if (r == 0) {
-+                        /* If the path is not a mount point anymore, then it must be a sub directory of
-+                         * the path corresponds to mnt_id2. */
-+                        log_debug("The path %s for mnt id %i is not a mount point.", p, mnt_id2);
-+                        assert_se(!isempty(path_startswith(p, q)));
-+                } else {
-+                        /* If the path is still a mount point, then it must be equivalent to the path
-+                         * corresponds to mnt_id2 */
-+                        log_debug("There are multiple mounts on the same path %s.", p);
-+                        assert_se(path_equal(p, q));
-+                }
-         }
- }
- 
--- 
-2.37.2
-
diff --git a/sources b/sources
index 835d223..ffaf9f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemd-251.5.tar.gz) = 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
+SHA512 (systemd-252-rc1.tar.gz) = e249eb39da41aca1bc371c9e2b61f135227b0653e4e175c4c6453b0ca4e1cd50894c005d4ef267b5122af4f339cd9b5a4b90a98c4f84f998f96a7ca1ed637d28
diff --git a/split-files.py b/split-files.py
index 835be3d..1227ec9 100644
--- a/split-files.py
+++ b/split-files.py
@@ -129,6 +129,8 @@ for file in files(buildroot):
                        integritysetup|
                        integritytab|
                        remount-fs|
+                       /initrd|
+                       systemd-pcrphase|
                        /boot$|
                        /boot/efi|
                        /kernel/|
diff --git a/systemd.spec b/systemd.spec
index 2a44ac2..8a766cb 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,7 +1,7 @@
 #global commit c4b843473a75fb38ed5bf54e9d3cfb1cb3719efa
 %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})}
 
-%global stable 1
+#global stable 1
 
 # We ship a .pc file but don't want to have a dep on pkg-config. We
 # strip the automatically generated dep here and instead co-own the
@@ -30,7 +30,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 %if %{without inplace}
-Version:        251.5
+Version:        252~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/')
@@ -89,8 +89,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
 # than in the next section. Packit CI will drop any patches in this range before
 # applying upstream pull requests.
 
-# PR https://github.com/systemd/systemd/pull/24639
-Patch0002:      0002-test-mountpoint-util-support-running-on-a-mount-name.patch
 
 # Those are downstream-only patches, but we don't want them in packit builds:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1738828