From d8abc7e796111ed2b1319b32595fef0672f0835f Mon Sep 17 00:00:00 2001 From: licunlong Date: Sat, 13 Apr 2024 14:57:32 +0800 Subject: [PATCH] sync upstream patches --- backport-fix-typo-myself.patch | 23 +++++++++++++++++++++++ systemd.spec | 6 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 backport-fix-typo-myself.patch diff --git a/backport-fix-typo-myself.patch b/backport-fix-typo-myself.patch new file mode 100644 index 0000000..febfe31 --- /dev/null +++ b/backport-fix-typo-myself.patch @@ -0,0 +1,23 @@ +From 693a28d7482355906501a910ae48b32979e46d8f Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Mon, 8 Apr 2024 09:12:06 +0900 +Subject: [PATCH] nspawn: fix typo + +Follow-up for 0af7e294343b29d769c1bae6a8d390236560ec1a. +--- + src/nspawn/nspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 7edb45dd172cf..f4da91797e363 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -5095,7 +5095,7 @@ static int run_container( + if (arg_privileged) { + assert(userns_fd < 0); + +- /* If we have no user namespace then we'll clone and create a new mount namepsace right-away. */ ++ /* If we have no user namespace then we'll clone and create a new mount namespace right-away. */ + + *pid = raw_clone(SIGCHLD|CLONE_NEWNS); + if (*pid < 0) diff --git a/systemd.spec b/systemd.spec index f3e9f50..f0bc0d2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 73 +Release: 74 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -639,6 +639,7 @@ Patch6590: backport-shutdown-get-only-active-md-arrays.patch Patch6591: backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch Patch6592: backport-resolved-limit-the-number-of-signature-validations-i.patch Patch6593: backport-resolved-reduce-the-maximum-nsec3-iterations-to-100.patch +Patch6594: backport-fix-typo-myself.patch Patch9001: update-rtc-with-system-clock-when-shutdown.patch Patch9002: udev-add-actions-while-rename-netif-failed.patch @@ -2125,6 +2126,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Sat Apr 13 2024 licunlong - 249-74 +- sync upstream patch + * Wed Mar 27 2024 huyubiao - 249-73 - DESC:add backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch backport-resolved-limit-the-number-of-signature-validations-i.patch -- Gitee