diff --git a/systemd.yaml b/systemd.yaml index 0cc84345681..f58683411a4 100644 --- a/systemd.yaml +++ b/systemd.yaml @@ -1,8 +1,8 @@ package: name: systemd # 35712.patch can be dropped when 258 releases - version: "257.7" - epoch: 1 + version: "257.8" + epoch: 0 description: The systemd System and Service Manager copyright: - license: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -90,11 +90,7 @@ pipeline: with: repository: https://github.com/systemd/systemd tag: v${{package.version}} - expected-commit: 162e5e4a77931e4a7a7c9b6f86f09a70ec52a3e5 - - - uses: patch - with: - patches: 35712.patch + expected-commit: 5e38d199a623563698ab4a69acbbe3afa9135198 - uses: meson/configure with: diff --git a/systemd/35712.patch b/systemd/35712.patch deleted file mode 100644 index f61e4d34ae6..00000000000 --- a/systemd/35712.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dbebba11c3b80549ef80bd9005abe0c78a0dfdfe Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Sat, 21 Dec 2024 17:01:27 +0100 -Subject: [PATCH] units: Order systemd-oomd after systemd-sysusers - -systemd-sysusers might create the systemd-oom system user that -systemd-oomd runs under so let's order systemd-oomd after -systemd-sysusers. ---- - units/systemd-oomd.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in -index 670d5e6140814..6838ddccef46a 100644 ---- a/units/systemd-oomd.service.in -+++ b/units/systemd-oomd.service.in -@@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/cpu - ConditionPathExists=/proc/pressure/io - ConditionPathExists=/proc/pressure/memory - Requires=systemd-oomd.socket --After=systemd-oomd.socket -+After=systemd-oomd.socket systemd-sysusers.service - - [Service] - AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE