systemd-250-10

Resolves: #2120222

0335-shared-install-fix-crash-when-reenable-is-called-wit.patch

@@ -0,0 +1,26 @@
+From b419d118455739757b1b426989964123d2e94869 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 12 Apr 2022 20:42:32 +0200
+Subject: [PATCH] shared/install: fix crash when reenable is called without
+ --root
+
+(cherry picked from commit 6e961aeb262521742a4cd92e4620de193f159f7c)
+
+Resolves: #2120222
+---
+ src/shared/install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/install.c b/src/shared/install.c
+index d3661521a9..b8d18d1484 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -2827,7 +2827,7 @@ static int normalize_linked_files(
+                         return r;
+ 
+                 const char *p = NULL;
+-                if (i && i->path)
++                if (i && i->path && i->root)
+                         /* Use startswith here, because we know that paths are normalized, and
+                          * path_startswith() would give us a relative path, but we need an absolute path
+                          * relative to i->root.

systemd.spec

@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        250
-Release:        9%{?dist}
+Release:        10%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -412,6 +412,7 @@ Patch0331: 0331-Added-DERE-DBook-D10-24173.patch
 Patch0332: 0332-hwdb-analyzers-Clarify-the-type-of-devices-we-want-l.patch
 Patch0333: 0333-hwdb-Add-Greaseweazle-drives-to-the-list-of-analyzer.patch
 Patch0334: 0334-hwdb-Apply-existing-accel-orientation-quirk-to-all-C.patch
+Patch0335: 0335-shared-install-fix-crash-when-reenable-is-called-wit.patch
 
 # Downstream-only patches (9000–9999)
 
@@ -1193,6 +1194,9 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Mon Aug 22 2022 systemd maintenance team <systemd-maint@redhat.com> - 250-10
+- shared/install: fix crash when reenable is called without --root (#2120222)
+
 * Thu Aug 18 2022 systemd maintenance team <systemd-maint@redhat.com> - 250-9
 - Revert "shared/install: create relative symlinks for enablement and aliasing" (#2118668)
 - glyph-util: add new glyphs for up/down arrows (#2118297)