From 5ef25cd129f206f15085a737acb11dd03bb717bb Mon Sep 17 00:00:00 2001 From: wangyuhang Date: Thu, 30 May 2024 16:18:22 +0800 Subject: [PATCH] add backport-units-modprobe-.service-don-t-unescape-instance-name.patch --- ...service-don-t-unescape-instance-name.patch | 37 ++++++ systemd.spec | 112 +++++++++--------- 2 files changed, 95 insertions(+), 54 deletions(-) create mode 100644 backport-units-modprobe-.service-don-t-unescape-instance-name.patch diff --git a/backport-units-modprobe-.service-don-t-unescape-instance-name.patch b/backport-units-modprobe-.service-don-t-unescape-instance-name.patch new file mode 100644 index 0000000..a970d6c --- /dev/null +++ b/backport-units-modprobe-.service-don-t-unescape-instance-name.patch @@ -0,0 +1,37 @@ +From 540b3c5d53f7b5889247e9cb4aea62d3983a48b8 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Fri, 20 Oct 2023 16:25:15 +0200 +Subject: [PATCH] units: modprobe@.service: don't unescape instance name + +modprobe treats "-" and "_" interchangeably, thereby avoiding frequent +errors because some module names contain dashes and others underscores. + +Because modprobe@.service unescapes the instance name, an attempt to +start "modprobe@dm-crypt.service" will run "modprobe -abq dm/crypt", +which is doomed to fail. "modprobe@dm_crypt.service" will work as +expected. Thus unescaping the instance name has surprising side effects. +Use "%i" instead. + +(cherry picked from commit bf25cf6c49253e922524dfa0e7960f554838f18b) +(cherry picked from commit c98d0130dc8efd826cd85020337353cdbe644bb4) +(cherry picked from commit 6d5eba0814e7dfc15ebb68ca5afdabab214c9da6) + +Conflict:NA +Reference:https://github.com/systemd/systemd-stable/commit/540b3c5d53f7b5889247e9cb4aea62d3983a48b8 +--- + units/modprobe@.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/modprobe@.service b/units/modprobe@.service +index 85a2c08dee..fe631fffeb 100644 +--- a/units/modprobe@.service ++++ b/units/modprobe@.service +@@ -17,4 +17,4 @@ StartLimitIntervalSec=0 + + [Service] + Type=oneshot +-ExecStart=-/sbin/modprobe -abq %I ++ExecStart=-/sbin/modprobe -abq %i +-- +2.33.0 + diff --git a/systemd.spec b/systemd.spec index 6aafa8b..4fa74b5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io/ Version: 249 -Release: 75 +Release: 76 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -588,59 +588,60 @@ Patch6539: backport-core-unit-fix-notification-about-unit-dependency-cha.pa Patch6540: backport-core-unit-make-JoinsNamespaceOf-implies-the-inverse-.patch Patch6541: backport-core-unit-update-bidirectional-dependency-simultaneo.patch Patch6542: backport-journalctl-verify-that-old-entries-are-not-sealed-wi.patch -Patch6543: backport-core-path-do-not-enqueue-new-job-in-.trigger_notify-.patch -Patch6544: backport-socket-fix-use-of-ERRNO_IS_DISCONNECT.patch -Patch6545: backport-sd-bus-fix-use-of-ERRNO_IS_DISCONNECT.patch -Patch6546: backport-resolved-fix-use-of-ERRNO_IS_DISCONNECT.patch -Patch6547: backport-bus-add-some-minimal-bounds-check-on-signatures.patch -Patch6548: backport-udev-builtin-net_id-fix-potential-buffer-overflow.patch -Patch6549: backport-hostname-Make-sure-we-pass-error-to-bus_verify_polki.patch -Patch6550: backport-Limit-rlim_max-in-rlimit_nofile_safe-to-nr_open.patch -Patch6551: backport-udev-raise-RLIMIT_NOFILE-as-high-as-we-can.patch -Patch6552: backport-json-use-unsigned-for-refernce-counter.patch -Patch6553: backport-macro-check-over-flow-in-reference-counter.patch -Patch6554: backport-sd-bus-fix-reference-counter-to-be-incremented.patch -Patch6555: backport-sd-bus-introduce-ref-unref-function-for-track_item.patch -Patch6556: backport-sd-bus-do-not-read-unused-value.patch -Patch6557: backport-sd-bus-do-not-return-negative-errno-when-unknown-nam.patch -Patch6558: backport-sd-bus-use-hashmap_contains-and-drop-unnecessary-cas.patch -Patch6559: backport-test-shorten-code-a-bit.patch -Patch6560: backport-test-add-several-tests-for-track-item.patch -Patch6561: backport-sd-bus-switch-to-a-manual-overflow-check-in.patch -Patch6562: backport-Use-dummy-allocator-to-make-accesses-defined-as-per-standard.patch -Patch6563: backport-rules-import-previous-SYSTEMD_READY-state-for-suspen.patch -Patch6564: backport-rules-go-to-the-end-of-rules-indeed-when-dm-is-suspe.patch -Patch6565: backport-CVE-2023-7008.patch -Patch6566: backport-core-add-possibility-to-not-track-certain-unit-types.patch -Patch6567: backport-journal-recalculate-line_max-when-stdout-stream-stat.patch -Patch6568: backport-pid1-terminate-cylon-string.patch -Patch6569: backport-pid1-move-draw_cylong-to-pretty-print.-ch.patch -Patch6570: backport-test-add-test-for-draw_cylon.patch -Patch6571: backport-locale-util-do-not-call-setlocale-when-multi-threade.patch -Patch6572: backport-resolve-fix-wrong-error-cause-assignment-to-log_debu.patch -Patch6573: backport-resolve-do-not-trigger-assertion-on-exit.patch -Patch6574: backport-network-neighbor-add-missing-OOM-check.patch -Patch6575: backport-dissect-tool-right-align-the-partition-number.patch -Patch6576: backport-dissect-image-fix-fd-leak-in-dissected_image_acquire.patch -Patch6577: backport-udev-even-if-a-device-is-a-zac-device-scsi-ID_SERIAL.patch -Patch6578: backport-core-log-message-when-reloading-finishes.patch -Patch6579: backport-sd-device-reduce-indentation.patch -Patch6580: backport-sd-device-use-ERRNO_IS_DEVICE_ABSENT-at-one-more-pla.patch -Patch6581: backport-sd-device-fix-possible-use-of-uninitialized-value.patch -Patch6582: backport-sd-device-rename-arguments-and-variables.patch -Patch6583: backport-sd-device-drop-unused-device_copy_properties.patch -Patch6584: backport-sd-device-make-device_shallow_clone-static.patch -Patch6585: backport-sd-device-do-not-read-uevent-file-in-device_clone_wi.patch -Patch6586: backport-basic-fix-overflow-detection-in-sigbus_pop.patch -Patch6587: backport-busctl-avoid-asserting-on-NULL-message.patch -Patch6588: backport-resolve-don-t-add-sockets-to-the-graveyard-on-shutdo.patch -Patch6589: backport-sd-journal-check-sd-event-state-before-setting-up-po.patch -Patch6590: backport-shutdown-get-only-active-md-arrays.patch -Patch6591: backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch -Patch6592: backport-CVE-2023-50387.patch -Patch6593: backport-CVE-2023-50868.patch -Patch6594: backport-login-user-runtime-dir-properly-check-for-mount-poin.patch -Patch6595: backport-user-util-validate-the-right-field.patch +Patch6543: backport-units-modprobe-.service-don-t-unescape-instance-name.patch +Patch6544: backport-core-path-do-not-enqueue-new-job-in-.trigger_notify-.patch +Patch6545: backport-socket-fix-use-of-ERRNO_IS_DISCONNECT.patch +Patch6546: backport-sd-bus-fix-use-of-ERRNO_IS_DISCONNECT.patch +Patch6547: backport-resolved-fix-use-of-ERRNO_IS_DISCONNECT.patch +Patch6548: backport-bus-add-some-minimal-bounds-check-on-signatures.patch +Patch6549: backport-udev-builtin-net_id-fix-potential-buffer-overflow.patch +Patch6550: backport-hostname-Make-sure-we-pass-error-to-bus_verify_polki.patch +Patch6551: backport-Limit-rlim_max-in-rlimit_nofile_safe-to-nr_open.patch +Patch6552: backport-udev-raise-RLIMIT_NOFILE-as-high-as-we-can.patch +Patch6553: backport-json-use-unsigned-for-refernce-counter.patch +Patch6554: backport-macro-check-over-flow-in-reference-counter.patch +Patch6555: backport-sd-bus-fix-reference-counter-to-be-incremented.patch +Patch6556: backport-sd-bus-introduce-ref-unref-function-for-track_item.patch +Patch6557: backport-sd-bus-do-not-read-unused-value.patch +Patch6558: backport-sd-bus-do-not-return-negative-errno-when-unknown-nam.patch +Patch6559: backport-sd-bus-use-hashmap_contains-and-drop-unnecessary-cas.patch +Patch6560: backport-test-shorten-code-a-bit.patch +Patch6561: backport-test-add-several-tests-for-track-item.patch +Patch6562: backport-sd-bus-switch-to-a-manual-overflow-check-in.patch +Patch6563: backport-Use-dummy-allocator-to-make-accesses-defined-as-per-standard.patch +Patch6564: backport-rules-import-previous-SYSTEMD_READY-state-for-suspen.patch +Patch6565: backport-rules-go-to-the-end-of-rules-indeed-when-dm-is-suspe.patch +Patch6566: backport-CVE-2023-7008.patch +Patch6567: backport-core-add-possibility-to-not-track-certain-unit-types.patch +Patch6568: backport-journal-recalculate-line_max-when-stdout-stream-stat.patch +Patch6569: backport-pid1-terminate-cylon-string.patch +Patch6570: backport-pid1-move-draw_cylong-to-pretty-print.-ch.patch +Patch6571: backport-test-add-test-for-draw_cylon.patch +Patch6572: backport-locale-util-do-not-call-setlocale-when-multi-threade.patch +Patch6573: backport-resolve-fix-wrong-error-cause-assignment-to-log_debu.patch +Patch6574: backport-resolve-do-not-trigger-assertion-on-exit.patch +Patch6575: backport-network-neighbor-add-missing-OOM-check.patch +Patch6576: backport-dissect-tool-right-align-the-partition-number.patch +Patch6577: backport-dissect-image-fix-fd-leak-in-dissected_image_acquire.patch +Patch6578: backport-udev-even-if-a-device-is-a-zac-device-scsi-ID_SERIAL.patch +Patch6579: backport-core-log-message-when-reloading-finishes.patch +Patch6580: backport-sd-device-reduce-indentation.patch +Patch6581: backport-sd-device-use-ERRNO_IS_DEVICE_ABSENT-at-one-more-pla.patch +Patch6582: backport-sd-device-fix-possible-use-of-uninitialized-value.patch +Patch6583: backport-sd-device-rename-arguments-and-variables.patch +Patch6584: backport-sd-device-drop-unused-device_copy_properties.patch +Patch6585: backport-sd-device-make-device_shallow_clone-static.patch +Patch6586: backport-sd-device-do-not-read-uevent-file-in-device_clone_wi.patch +Patch6587: backport-basic-fix-overflow-detection-in-sigbus_pop.patch +Patch6588: backport-busctl-avoid-asserting-on-NULL-message.patch +Patch6589: backport-resolve-don-t-add-sockets-to-the-graveyard-on-shutdo.patch +Patch6590: backport-sd-journal-check-sd-event-state-before-setting-up-po.patch +Patch6591: backport-shutdown-get-only-active-md-arrays.patch +Patch6592: backport-core-exec-do-not-crash-with-UtmpMode-user-without-Us.patch +Patch6593: backport-CVE-2023-50387.patch +Patch6594: backport-CVE-2023-50868.patch +Patch6595: backport-login-user-runtime-dir-properly-check-for-mount-poin.patch +Patch6596: backport-user-util-validate-the-right-field.patch Patch9001: update-rtc-with-system-clock-when-shutdown.patch Patch9002: udev-add-actions-while-rename-netif-failed.patch @@ -2144,6 +2145,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Thu May 30 2024 wangyuhang - 249-76 +- add backport-units-modprobe-.service-don-t-unescape-instance-name.patch + * Mon Apr 29 2024 huyubiao - 249-75 - add backport-login-user-runtime-dir-properly-check-for-mount-poin.patch backport-user-util-validate-the-right-field.patch -- Gitee