diff --git a/5000-core-manager-run-generators-directly-when-we-are-in-.patch b/5000-core-manager-run-generators-directly-when-we-are-in-.patch deleted file mode 100644 index 20c0b682..00000000 --- a/5000-core-manager-run-generators-directly-when-we-are-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9d0f728f65e6c3ad586e276c1ed3c2cd8cc944be Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 20 Feb 2023 12:00:30 +0900 -Subject: [PATCH 5000/5000] core/manager: run generators directly when we are - in initrd - -Some initrd system write files at ourside of /run, /etc, or other -allowed places. This is a kind of workaround, but in most cases, such -sandboxing is not necessary as the filesystem is on ramfs when we are in -initrd. - -Fixes #26488. ---- - src/core/manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/core/manager.c b/src/core/manager.c -index 380a4e30d7..6135205761 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) { - /* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If - * we are the user manager, let's just execute the generators directly. We might not have the - * necessary privileges, and the system manager has already mounted /tmp/ and everything else for us. -- */ -- if (MANAGER_IS_USER(m)) { -+ * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */ -+ if (MANAGER_IS_USER(m) || in_initrd()) { - r = manager_execute_generators(m, paths, /* remount_ro= */ false); - goto finish; - } --- -2.35.3 - diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 717dd254..6f07aeb3 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -12,3 +12,8 @@ addFilter(".*tmpfile-not-in-filelist .*") # shlib policy does not cover multibuilds addFilter("libsystemd0-mini\..*: E: shlib-policy-name-error SONAME: libsystemd.so.0.*") +addFilter("libudev.*-mini\..*: E: shlib-policy-name-error SONAME: libudev.*") + +# These are NSS plugins and are not really subject to shlib policy. +addFilter("systemd-container\..*: E: shlib-policy-name-error .* libnss_mymachines") +addFilter("systemd-network\..*: E: shlib-policy-name-error .* libnss_resolve") diff --git a/systemd.changes b/systemd.changes index 19bb94ca..2403066f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Oct 5 15:04:50 UTC 2023 - Franck Bui + +- rpmlintrc: allow systemd-network and systemd-container sub-packages to ship + shared libs. These are actually NSS plugins and are not really subject to + shlib policy. + +------------------------------------------------------------------- +Wed Oct 4 09:00:32 UTC 2023 - Franck Bui + +- Drop 5000-core-manager-run-generators-directly-when-we-are-in-.patch + + Since dracut-059+suse.447.g9d1fc722, this workaround is not needed anymore. + ------------------------------------------------------------------- Wed Sep 27 13:14:12 UTC 2023 - Franck Bui @@ -589,6 +603,10 @@ Mon Mar 6 10:08:33 UTC 2023 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v253/NEWS for details. + This includes the following bug fixes: + + - upstream commit 3022916b4d2483452c3ddbbac9ee7c4372b1cb46 (bsc#1215241) + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch * Ship systemd-journald-audit.socket again: it can now be disabled via the diff --git a/systemd.spec b/systemd.spec index 1fda0289..dd65ca2a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -206,7 +206,6 @@ Patch5: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch # very few cases, some stuff might be broken in upstream and need to be fixed or # worked around quickly. In these cases, the patches are added temporarily and # will be removed as soon as a proper fix will be merged by upstream. -Patch5000: 5000-core-manager-run-generators-directly-when-we-are-in-.patch %description Systemd is a system and service manager, compatible with SysV and LSB