commit: 178b9f06d59faec27afc5d1f6332b576aebef882 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Aug 13 13:42:15 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 17:31:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178b9f06
sys-apps/systemd: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32297 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/systemd-254-dt_relr.patch | 26 ------- .../systemd/files/systemd-254-tmpfiles-udev.patch | 88 ---------------------- .../files/systemd-254-varlink-allocate-heap.patch | 40 ---------- 3 files changed, 154 deletions(-) diff --git a/sys-apps/systemd/files/systemd-254-dt_relr.patch b/sys-apps/systemd/files/systemd-254-dt_relr.patch deleted file mode 100644 index 9adfc11c1dd3..000000000000 --- a/sys-apps/systemd/files/systemd-254-dt_relr.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/910570 -https://github.com/systemd/systemd/issues/28520 -https://github.com/systemd/systemd/commit/eff91e2f3863f9e176b383e5c54741c64ca7a636 - -From eff91e2f3863f9e176b383e5c54741c64ca7a636 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi <[email protected]> -Date: Wed, 26 Jul 2023 11:29:57 +0100 -Subject: [PATCH] efi: link with -z nopack-relative-relocs - -elf2efi.py cannot handle DT_RELR relocations, so disable it -if we can - -Fixes https://github.com/systemd/systemd/issues/28520 ---- a/src/boot/efi/meson.build -+++ b/src/boot/efi/meson.build -@@ -174,6 +174,10 @@ efi_c_ld_args = [ - '-T' + elf2efi_lds, - ] - -+# On CentOS 8 the nopack-relative-relocs linker flag is not supported, and we get: -+# /usr/bin/ld.bfd: warning: -z nopack-relative-relocs ignored -+efi_c_ld_args += cc.get_supported_link_arguments('-Wl,-z,nopack-relative-relocs') -+ - # efi_c_args is explicitly passed to targets so that they can override distro-provided flags - # that should not be used for EFI binaries. - efi_disabled_c_args = cc.get_supported_arguments( diff --git a/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch b/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch deleted file mode 100644 index 04dd166310c8..000000000000 --- a/sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch +++ /dev/null @@ -1,88 +0,0 @@ -https://bugs.gentoo.org/911723 -https://github.com/systemd/systemd/issues/28588 -https://github.com/systemd/systemd/issues/28653 -https://github.com/systemd/systemd/pull/28681 - -(Skipped first commit as it was a revert of https://github.com/systemd/systemd/commit/a3d610998ad3b4c88224fe89a048a84dbceb652b.patc -which wasn't in 254.) - -From 31845ef554877525dc4ff4f25ad11ad805ebf81c Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <[email protected]> -Date: Sat, 5 Aug 2023 04:37:19 +0900 -Subject: [PATCH 2/4] unit: make udev rules take precesence over tmpfiles - -Without this change, there are no ordering between udevd and tmpfiles, -and if tmpfiles is invoked later it may discard the permission set by -udevd. - -Fixes an issue introduced by b42482af904ae0b94a6e4501ec595448f0ba1c06. - -Fixes #28588 and #28653. ---- a/units/systemd-udevd.service.in -+++ b/units/systemd-udevd.service.in -@@ -12,6 +12,7 @@ Description=Rule-based Manager for Device Events and Files - Documentation=man:systemd-udevd.service(8) man:udev(7) - DefaultDependencies=no - After=systemd-sysusers.service systemd-hwdb-update.service -+After=systemd-tmpfiles-setup-dev.service - Before=sysinit.target - ConditionPathIsReadWrite=/sys - - -From b768379e8b494b025f41946205944a6f3a1a553f Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <[email protected]> -Date: Sat, 5 Aug 2023 04:52:16 +0900 -Subject: [PATCH 3/4] test: add short test for device node permission - ---- /dev/null -+++ b/test/units/testsuite-17.00.sh -@@ -0,0 +1,18 @@ -+#!/usr/bin/env bash -+# SPDX-License-Identifier: LGPL-2.1-or-later -+set -ex -+set -o pipefail -+ -+# shellcheck source=test/units/util.sh -+. "$(dirname "$0")"/util.sh -+ -+# Tests for issue #28588 and #28653. -+ -+assert_in "systemd-tmpfiles-setup-dev.service" "$(systemctl show --property After --value systemd-udevd.service)" -+assert_in "systemd-udevd.service" "$(systemctl show --property Before --value systemd-tmpfiles-setup-dev.service)" -+ -+if [[ -f /dev/vfio/vfio ]]; then -+ assert_in "crw-rw-rw-" "$(stat --format=%A /dev/vfio/vfio)" -+fi -+ -+exit 0 - -From 23acdb8d0b04d46ecdc88a45594135c321dbfd5b Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <[email protected]> -Date: Sat, 5 Aug 2023 05:03:16 +0900 -Subject: [PATCH 4/4] test: shorten timeout for 'udevadm monitor' - -The command should never finish, it is not necessary to wait so long. ---- a/test/units/testsuite-17.10.sh -+++ b/test/units/testsuite-17.10.sh -@@ -79,13 +79,13 @@ udevadm info -w /sys/class/net/$netdev - udevadm info --wait-for-initialization=5 /sys/class/net/$netdev - udevadm info -h - --assert_rc 124 timeout 5 udevadm monitor --assert_rc 124 timeout 5 udevadm monitor -k --assert_rc 124 timeout 5 udevadm monitor -u --assert_rc 124 timeout 5 udevadm monitor -s net --assert_rc 124 timeout 5 udevadm monitor --subsystem-match net/$netdev --assert_rc 124 timeout 5 udevadm monitor -t systemd --assert_rc 124 timeout 5 udevadm monitor --tag-match hello -+assert_rc 124 timeout 1 udevadm monitor -+assert_rc 124 timeout 1 udevadm monitor -k -+assert_rc 124 timeout 1 udevadm monitor -u -+assert_rc 124 timeout 1 udevadm monitor -s net -+assert_rc 124 timeout 1 udevadm monitor --subsystem-match net/$netdev -+assert_rc 124 timeout 1 udevadm monitor -t systemd -+assert_rc 124 timeout 1 udevadm monitor --tag-match hello - udevadm monitor -h - - udevadm settle - diff --git a/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch b/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch deleted file mode 100644 index 85f306a175f3..000000000000 --- a/sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/911583 -https://github.com/systemd/systemd/issues/28635 -https://github.com/systemd/systemd/commit/b456f2266afd839f8817235475e57c38e9d76dc9 - -From b456f2266afd839f8817235475e57c38e9d76dc9 Mon Sep 17 00:00:00 2001 -From: Frantisek Sumsal <[email protected]> -Date: Wed, 2 Aug 2023 14:55:50 +0200 -Subject: [PATCH] varlink: allocate the buffer for varlink FDs on the heap - -Since it's ~16K, which might cause issues in environments with limited -stack space. - -Resolves: #28635 ---- a/src/shared/varlink.c -+++ b/src/shared/varlink.c -@@ -633,7 +633,7 @@ static int varlink_write(Varlink *v) { - #define VARLINK_FDS_MAX (16U*1024U) - - static int varlink_read(Varlink *v) { -- CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int) * VARLINK_FDS_MAX)) control; -+ _cleanup_free_ struct cmsghdr *cmsg_fds = NULL; - struct iovec iov; - struct msghdr mh; - size_t rs; -@@ -690,9 +690,13 @@ static int varlink_read(Varlink *v) { - mh = (struct msghdr) { - .msg_iov = &iov, - .msg_iovlen = 1, -- .msg_control = &control, -- .msg_controllen = sizeof(control), - }; -+ -+ mh.msg_controllen = CMSG_SPACE(sizeof(int) * VARLINK_FDS_MAX); -+ mh.msg_control = cmsg_fds = malloc(mh.msg_controllen); -+ if (!cmsg_fds) -+ return -ENOMEM; -+ - n = recvmsg_safe(v->fd, &mh, MSG_DONTWAIT|MSG_CMSG_CLOEXEC); - } else { - bool prefer_read = v->prefer_read_write;
