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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 184B9158089 for ; Wed, 15 Nov 2023 10:39:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42FAC2BC021; Wed, 15 Nov 2023 10:39:05 +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 255742BC021 for ; Wed, 15 Nov 2023 10:39:05 +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 3CCFD335D72 for ; Wed, 15 Nov 2023 10:39:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D95BA1393 for ; Wed, 15 Nov 2023 10:39:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1700044660.13688d9b6994558d6e78d6f9a80da685d8bd299b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch sys-apps/util-linux/util-linux-2.39.2.ebuild X-VCS-Directories: sys-apps/util-linux/files/ sys-apps/util-linux/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 13688d9b6994558d6e78d6f9a80da685d8bd299b X-VCS-Branch: master Date: Wed, 15 Nov 2023 10:39:00 +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: 3ab27368-2b62-4fb8-8927-6fb6fe4d90cc X-Archives-Hash: a8755917e0ea5e8bdc3b9ab2b3d10aee commit: 13688d9b6994558d6e78d6f9a80da685d8bd299b Author: Sam James gentoo org> AuthorDate: Wed Nov 15 10:37:40 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 15 10:37:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13688d9b sys-apps/util-linux: backport sparc test fix Test-only fix. Thanks to glaubitz for the heads-up! Closes: https://bugs.gentoo.org/627532 Signed-off-by: Sam James gentoo.org> .../files/util-linux-2.39.2-fincore-test.patch | 23 ++++++++++++++++++++++ sys-apps/util-linux/util-linux-2.39.2.ebuild | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch new file mode 100644 index 000000000000..f69876fe0a18 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/627532 +https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e + +From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Mon, 13 Nov 2023 21:05:59 +0100 +Subject: [PATCH] fincore: (tests) also use nosize error file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/ +Signed-off-by: Thomas Weißschuh +--- a/tests/ts/fincore/count ++++ b/tests/ts/fincore/count +@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then + OUT_COLUMNS="PAGES,SIZE,FILE" + else + TS_EXPECTED+=".nosize" ++ TS_EXPECTED_ERR+=".nosize" + OUT_COLUMNS="PAGES,FILE" + fi + diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild index 94d37237dd40..6655149f15a6 100644 --- a/sys-apps/util-linux/util-linux-2.39.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild @@ -95,6 +95,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.39.2-fincore-test.patch +) + pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)"