From 1013bb04a30c552ec7ff5e3fe97074b0531a024d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Aug 2023 00:11:33 +0100 Subject: gentoo auto-resync : 14:08:2023 - 00:11:33 --- sys-apps/systemd/Manifest | 3 - 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 ---------- 4 files changed, 157 deletions(-) delete mode 100644 sys-apps/systemd/files/systemd-254-dt_relr.patch delete mode 100644 sys-apps/systemd/files/systemd-254-tmpfiles-udev.patch delete mode 100644 sys-apps/systemd/files/systemd-254-varlink-allocate-heap.patch (limited to 'sys-apps/systemd') diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 67d9a0edf436..a4139309a77a 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -4,9 +4,6 @@ AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da6 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b AUX systemd-253.5-services-stop.patch 1429 BLAKE2B 3e191d2f98173c4b75791b8ade557f250229021d50c84efb9010ed06bb9a4df6e0b084625d9c3c8dbb16b8378a7c62ddbb3be4cf17790169709c581c09802fea SHA512 74e3cab089d1d3ca1603b3180638dfe2a6a0dfc494b9b72920f1b0cbe659784582d9757ba1b3f75b0c6469ae88a782a26da89049b5571b0f1ec50e845092ab21 -AUX systemd-254-dt_relr.patch 1054 BLAKE2B 7d457d6577a425ac07e6009d0ed5ed6e7c1c192175427c32dabfbb703f41c80f48a30524c0bfb5d555e5b848faea114a02e956d26854486fbd0b4e4d672a25c1 SHA512 c9b25a466278ff2be5812ae144670e06d9381610c1259814e5135a186e54c61d6db9142b7b5f301e3ad63cfdf119d7559e46c6a7d9e1317ff42ab457dbdd52c2 -AUX systemd-254-tmpfiles-udev.patch 3307 BLAKE2B 880c87d453aac5158a72d9102d843509d3b6475b928947a13f251f2fd8d2ddd7cba15151101e18733f1ef2e58721ced1a3629fcd58ad49c48d11e8ff5b4955b5 SHA512 fdf2f24790782c19abd83058fc1c4a8c1753b03eaea5670d8fce81e48e75805c46861341d3537556a9a5923b45f363dd8b3e5a784251c116d52ea1ed87931a3b -AUX systemd-254-varlink-allocate-heap.patch 1589 BLAKE2B 49178b1290cc71803ee1ebd01ce41eb7c737e1886bfd1f902a21dc503d6182325965edc00c0b13d9b045359e867fad91b19489608b9f007f15ddb0ccd362c65b SHA512 895db3374b3db5e6aad37a73997280f3b07d8f096815fd5a1f91119c9898666605207d5b7037e22dafc9f0c8e1a20cf78e520bec969a238ab688dae9e6e33686 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 DIST systemd-stable-253.3.tar.gz 11996044 BLAKE2B fdbac11914ea4a3718dd48c19f0dc34db798e68f36e2e858536e4ef50e376380a250ad59dbbd1ccec4ed73e59efd198dcc0aa85faafa9d6f85d4b2e1de67ccfa SHA512 2c686d83b8b09efa09e09c82feb965f3cfceb6338e42b57d4133dc9ffe52592c67bce9bc9e294c69bc831294e3cbdcc391aba778f10d7b408cef90a85c0ab8aa DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1 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 -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 -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 -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 -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 -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; -- cgit v1.2.3