mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-03-01 11:31:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/keyutils: Sync with Gentoo

Browse Source 
It's from Gentoo commit 2d25fad95cbaa525c8945d8e582c749d49524f49.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2026-01-12 07:16:50 +00:00 committed by Krzesimir Nowak
parent c81c86ade6
commit 95b85b8683
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sdk_container/src/third_party/portage-stable/sys-apps/keyutils/files/keyutils-1.6.3-EDQUOT-tests.patch vendored Normal file
View File

@ -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 <mattst88@gmail.com>
To: David Howells <dhowells@redhat.com>
Cc: keyrings@vger.kernel.org,
Matt Turner <mattst88@gmail.com>
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: <keyrings.vger.kernel.org>
List-Subscribe: <mailto:keyrings+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:keyrings+unsubscribe@vger.kernel.org>
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 <mattst88@gmail.com>
---
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

3
sdk_container/src/third_party/portage-stable/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild vendored
View File

@ -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() {