diff --git a/0001-sync-upstream-patches.patch b/0001-sync-upstream-patches.patch new file mode 100644 index 0000000000000000000000000000000000000000..9e6d9753358ea1c9ec257282fd85ecf551664200 --- /dev/null +++ b/0001-sync-upstream-patches.patch @@ -0,0 +1,74 @@ +From 216a6ed35b98f02a29801476377664eba49bca85 Mon Sep 17 00:00:00 2001 +From: licunlong +Date: Sat, 13 Apr 2024 14:27:19 +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 58c4476..df5218f 100644 +--- a/systemd.spec ++++ b/systemd.spec +@@ -25,7 +25,7 @@ + Name: systemd + Url: https://www.freedesktop.org/wiki/Software/systemd + Version: 255 +-Release: 7 ++Release: 8 + License: MIT and LGPLv2+ and GPLv2+ + Summary: System and Service Manager + +@@ -57,6 +57,7 @@ Patch6003: backport-temporarily-disable-test-seccomp.patch + Patch6004: backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch + Patch6005: backport-resolved-limit-the-number-of-signature-validations-i.patch + Patch6006: backport-resolved-reduce-the-maximum-nsec3-iterations-to-100.patch ++Patch6007: backport-fix-typo-myself.patch + + Patch9008: update-rtc-with-system-clock-when-shutdown.patch + Patch9009: udev-add-actions-while-rename-netif-failed.patch +@@ -1638,6 +1639,9 @@ fi + %{_libdir}/security/pam_systemd_loadkey.so + + %changelog ++* Sat Apr 13 2024 licunlong - 255-8 ++- sync upstream patch ++ + * Wed Mar 27 2024 huyubiao - 255-7 + - DESC:add backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch + backport-resolved-limit-the-number-of-signature-validations-i.patch +-- +2.33.0 + diff --git a/backport-fix-typo-myself.patch b/backport-fix-typo-myself.patch new file mode 100644 index 0000000000000000000000000000000000000000..febfe316d17b68bd884c864187458815edb8e418 --- /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 f3e9f5099a979526ce8e5230ff89dedcc1610116..f0bc0d2f124b9ae37518b5f58338b82e18bd7894 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