From e63f21063579876c71fdd67e9b817a086fc310c8 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Sep 29 2021 07:41:30 +0000 Subject: 249.4-2.3: fix to allow verifying dot files again --- diff --git a/SOURCES/20875.patch b/SOURCES/20875.patch new file mode 100644 index 0000000..610ee4c --- /dev/null +++ b/SOURCES/20875.patch @@ -0,0 +1,26 @@ +From 84e1818ce1dc9f5f7eb7b4d4bc87124d82c5080f Mon Sep 17 00:00:00 2001 +From: Anita Zhang +Date: Tue, 28 Sep 2021 23:52:39 -0700 +Subject: [PATCH] basic/unit-file: don't filter out names starting with dot + +Fixes #20859 +--- + src/basic/unit-file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c +index 884a0674a9..0d58b1c4fe 100644 +--- a/src/basic/unit-file.c ++++ b/src/basic/unit-file.c +@@ -284,7 +284,7 @@ int unit_file_build_name_map( + continue; + } + +- FOREACH_DIRENT(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) { ++ FOREACH_DIRENT_ALL(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) { + char *filename; + _cleanup_free_ char *_filename_free = NULL, *simplified = NULL; + const char *suffix, *dst = NULL; +-- +2.31.1 + diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index da8cf7c..feea93d 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -40,7 +40,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd %if %{without inplace} Version: 249.4 -Release: 2.2%{?dist} +Release: 2.3%{?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/') @@ -115,6 +115,7 @@ Patch0006: 18621-fb.patch Patch0006: https://github.com/systemd/systemd/pull/18621.patch %endif +# PRs to support additional systemd.network and systemd.link features Patch0007: https://github.com/systemd/systemd/pull/20743.patch Patch0008: https://github.com/systemd/systemd/pull/20458.patch Patch0009: https://github.com/systemd/systemd/pull/20472.patch @@ -126,6 +127,9 @@ Patch0014: https://github.com/systemd/systemd/pull/20541.patch Patch0015: https://github.com/systemd/systemd/pull/20729.patch Patch0016: https://github.com/systemd/systemd/pull/20828.patch +# PR 20875: allow verifying hidden (dot) files again +Patch0017: https://github.com/systemd/systemd/pull/20875.patch + # Downstream-only patches (0500–9999) # https://github.com/systemd/systemd/pull/17050 @@ -1071,6 +1075,9 @@ fi %endif %changelog +* Wed Sep 29 2021 Anita Zhang - 249.4-2.3 +- Fix to allow verifying hidden (dot) files again (PR #20875) + * Fri Sep 24 2021 Anita Zhang - 249.4-2.2 - Backport more feature support for systemd-networkd (#20450, #20541, #20729, #20828)