commit: d3d2a89edd792d5be7669bd1be0075bd94872934 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 00:49:46 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 25 00:49:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d2a89e
sys-apps/keyutils: fix EDQUOT failures in tests Bug: https://bugs.gentoo.org/789837 Bug: https://bugs.gentoo.org/938132 Thanks-to: Matt Turner <mattst88 <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/keyutils-1.6.3-EDQUOT-tests.patch | 58 ++++++++++++++++++++++ sys-apps/keyutils/keyutils-1.6.3-r1.ebuild | 1 + 2 files changed, 59 insertions(+) diff --git a/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch b/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch new file mode 100644 index 000000000000..abaed8b79f09 --- /dev/null +++ b/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch @@ -0,0 +1,58 @@ +https://lore.kernel.org/keyrings/[email protected]/ +https://bugs.gentoo.org/789837#c9 +https://bugs.gentoo.org/938132 + +From: Matt Turner <[email protected]> +To: David Howells <[email protected]> +Cc: [email protected], + Matt Turner <[email protected]> +Subject: [PATCH] test: Handle EDQUOT in act_keyctl_test_limits +Date: Sun, 10 Aug 2025 18:40:41 -0400 +Message-ID: <[email protected]> +X-Mailer: git-send-email 2.49.1 +Precedence: bulk +X-Mailing-List: [email protected] +List-Id: <keyrings.vger.kernel.org> +List-Subscribe: <mailto:[email protected]> +List-Unsubscribe: <mailto:[email protected]> +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 <[email protected]> +--- + 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/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild index 0d80522c7de3..eba340191f3f 100644 --- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild +++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild @@ -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() {
