From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45F5B1580FD for ; Mon, 23 Dec 2024 20:01:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDB09E07AE; Mon, 23 Dec 2024 20:01:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79181E07AE for ; Mon, 23 Dec 2024 20:01:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41ECE34069F for ; Mon, 23 Dec 2024 20:01:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 610CD1946 for ; Mon, 23 Dec 2024 20:01:12 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1734983424.d1ef1d87ce648932160043a32d6c1aed93ab6ee0.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch X-VCS-Directories: sys-apps/util-linux/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: d1ef1d87ce648932160043a32d6c1aed93ab6ee0 X-VCS-Branch: master Date: Mon, 23 Dec 2024 20:01:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2768481-6400-46ad-859a-1af702d0df92 X-Archives-Hash: 5df8c66add0f434a4d4e2d12bb304820 commit: d1ef1d87ce648932160043a32d6c1aed93ab6ee0 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Dec 18 16:23:40 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Dec 23 19:50:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ef1d87 sys-apps/util-linux: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/39771 Signed-off-by: Conrad Kostecki gentoo.org> .../files/util-linux-2.39.2-backport-pr2251.patch | 268 --------------------- .../files/util-linux-2.39.3-CVE-2024-28085.patch | 25 -- .../files/util-linux-2.39.3-libblkid-luks.patch | 40 --- 3 files changed, 333 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch deleted file mode 100644 index b16519bb5142..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch +++ /dev/null @@ -1,268 +0,0 @@ -https://bugs.gentoo.org/914791 -https://github.com/util-linux/util-linux/issues/2249 -https://github.com/util-linux/util-linux/pull/2251 - -From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:42:14 +0200 -Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test - values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 7c7eee5dc2..86c0d5b0a3 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4k -+BS=4096 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" -@@ -41,22 +41,22 @@ create_file() { - echo - - create_file -- echo "offset: 8192" -- "$TS_CMD_FADVISE" -o 8192 "$FILE" -+ echo "offset: $(( 2 * $BS ))" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "length: 16384" -- "$TS_CMD_FADVISE" -l 16384 "$FILE" -+ echo "length: $(( 4 * $BS ))" -+ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "offset: 8192, length: 16384 fd: 42" -- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" -+ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - -From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:43:38 +0200 -Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will make it easier to pass argument later. - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 86c0d5b0a3..8869b7da4d 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -28,37 +28,41 @@ create_file() { - dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null - } - -+do_fincore() { -+ "$TS_CMD_FINCORE" "$FILE" -+} -+ - { - create_file -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "whole file" - "$TS_CMD_FADVISE" "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS ))" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "length: $(( 4 * $BS ))" - "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - rm "$FILE" - -From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:44:20 +0200 -Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These depend on the machines pagesize and are therefore not a good -comparision. - -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 20 ++++++++++---------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index f2360b56fb..25f23e050a 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES PAGES SIZE FILE -- 32K 8 32K ddtest -+ RES SIZE FILE -+ 32K 32K ddtest - - whole file - status: 0 --RES PAGES SIZE FILE -- 0B 0 32K ddtest -+RES SIZE FILE -+ 0B 32K ddtest - - offset: 8192 - status: 0 --RES PAGES SIZE FILE -- 8K 2 32K ddtest -+RES SIZE FILE -+ 8K 32K ddtest - - length: 16384 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - - offset: 8192, length: 16384 fd: 42 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 8869b7da4d..6c4298e872 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -29,7 +29,7 @@ create_file() { - } - - do_fincore() { -- "$TS_CMD_FINCORE" "$FILE" -+ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" - } - - { - -From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:45:10 +0200 -Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will allow the tests to also pass on systems with 64k pagesizes. - -Closes #2249 -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 26 +++++++++++++------------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index 25f23e050a..e7bb26b6e2 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES SIZE FILE -- 32K 32K ddtest -+ RES SIZE FILE -+ 512K 512K ddtest - - whole file - status: 0 --RES SIZE FILE -- 0B 32K ddtest -+RES SIZE FILE -+ 0B 512K ddtest - --offset: 8192 -+offset: 131072 - status: 0 --RES SIZE FILE -- 8K 32K ddtest -+ RES SIZE FILE -+ 128K 512K ddtest - --length: 16384 -+length: 262144 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - --offset: 8192, length: 16384 fd: 42 -+offset: 131072, length: 262144 fd: 42 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 6c4298e872..45dcb9110b 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4096 -+BS=65536 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch b/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch deleted file mode 100644 index 99092c05aa7e..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/927980 -https://people.rit.edu/sjf5462/6831711781/wall_2_27_2024.txt -https://github.com/util-linux/util-linux/commit/404b0781f52f7c045ca811b2dceec526408ac253 - -From 404b0781f52f7c045ca811b2dceec526408ac253 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 21 Mar 2024 11:16:20 +0100 -Subject: [PATCH] wall: fix escape sequence Injection [CVE-2024-28085] - -Let's use for all cases the same output function. - -Reported-by: Skyler Ferrante -Signed-off-by: Karel Zak ---- a/term-utils/wall.c -+++ b/term-utils/wall.c -@@ -368,7 +368,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, - int i; - - for (i = 0; i < mvecsz; i++) { -- fputs(mvec[i], fs); -+ fputs_careful(mvec[i], fs, '^', true, TERM_WIDTH); - if (i < mvecsz - 1) - fputc(' ', fs); - } - diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch deleted file mode 100644 index 222243426d5e..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/926950 -https://gitlab.com/lvmteam/lvm2/-/issues/11 -https://bugzilla.opensuse.org/show_bug.cgi?id=1213227 -https://github.com/util-linux/util-linux/pull/2373 -https://github.com/util-linux/util-linux/commit/93ba7961779789217a1f814ce3110ff8c040c8c3 - -From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 12 Jul 2023 15:48:27 +0200 -Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing" - -mdadm superblocks before 1.1 are placed at the end of the device, which -means that the data contained inside the array starts at offset 0. For -LUKS inside MD, blkid falsely detects this as plain LUKS instead of a -linux_raid_member. This causes e.g. dracut to not assemble the array -during boot and system startup fails. - -This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa. ---- a/libblkid/src/superblocks/superblocks.c -+++ b/libblkid/src/superblocks/superblocks.c -@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage); - */ - static const struct blkid_idinfo *idinfos[] = - { -- /* In case the volume is locked with OPAL we are going to get -- * an I/O error when reading past the LUKS header, so try it -- * first. */ -- &luks_idinfo, -- - /* RAIDs */ - &linuxraid_idinfo, - &ddfraid_idinfo, -@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] = - &snapcow_idinfo, - &verity_hash_idinfo, - &integrity_idinfo, -+ &luks_idinfo, - &vmfs_volume_idinfo, - &ubi_idinfo, - &vdo_idinfo,