From 95b85b8683c7e672a34aa969ecdb0f6b2ea59baa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:16:50 +0000 Subject: [PATCH] sys-apps/keyutils: Sync with Gentoo It's from Gentoo commit 2d25fad95cbaa525c8945d8e582c749d49524f49. Signed-off-by: Flatcar Buildbot --- .../files/keyutils-1.6.3-EDQUOT-tests.patch | 58 +++++++++++++++++++ .../keyutils/keyutils-1.6.3-r1.ebuild | 3 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch new file mode 100644 index 0000000000..abaed8b79f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch @@ -0,0 +1,58 @@ +https://lore.kernel.org/keyrings/20250810224041.3025756-1-mattst88@gmail.com/ +https://bugs.gentoo.org/789837#c9 +https://bugs.gentoo.org/938132 + +From: Matt Turner +To: David Howells +Cc: keyrings@vger.kernel.org, + Matt Turner +Subject: [PATCH] test: Handle EDQUOT in act_keyctl_test_limits +Date: Sun, 10 Aug 2025 18:40:41 -0400 +Message-ID: <20250810224041.3025756-1-mattst88@gmail.com> +X-Mailer: git-send-email 2.49.1 +Precedence: bulk +X-Mailing-List: keyrings@vger.kernel.org +List-Id: +List-Subscribe: +List-Unsubscribe: +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit + +This matches the behavior in `act_keyctl_test_limits2` and avoids a test +failure [1] on some platforms: + +``` +TEST SIZE 192._._._._._._ +197 desc wrong error: Disk quota exceeded +._ +198 desc wrong error: Disk quota exceeded +._ +199 desc wrong error: Disk quota exceeded +._ +200 desc wrong error: Disk quota exceeded +``` + +[1] https://bugs.gentoo.org/789837#c9 + +Signed-off-by: Matt Turner +--- + keyctl_testing.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git ./keyctl_testing.c ./keyctl_testing.c +index 3161467..588fa83 100644 +--- ./keyctl_testing.c ++++ ./keyctl_testing.c +@@ -126,6 +126,10 @@ static void act_keyctl_test_limits(int argc, char *argv[]) + fprintf(stderr, "%d desc failed: %m\n", i); + nr_fail++; + } ++ } else if (errno == EDQUOT) { ++ /* This might happen due to us creating keys ++ * really fast. ++ */ + } else { + putchar('\n'); + fprintf(stderr, "%d desc wrong error: %m\n", i); +-- +2.49.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild index 75bb89c4c0..6990abd1f2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s LICENSE="GPL-2 LGPL-2.1" SLOT="0/1.9" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="static static-libs test" RESTRICT="!test? ( test )" @@ -25,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch "${FILESDIR}"/${PN}-1.6.3-symbols.patch "${FILESDIR}"/${P}-tests.patch + "${FILESDIR}"/${PN}-1.6.3-EDQUOT-tests.patch ) pkg_setup() {