gentoo auto-resync : 28:12:2024 - 06:30:54

3 files changed, 42 insertions, 1 deletions

diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 60b290d79686..8432ad436531 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,5 +1,6 @@
+AUX libjcat-0.2.2-tests.patch 1126 BLAKE2B 6225f6e351df1201338084eb22799e608a9e7705954cc25be0bfb1361f78914691c5af336437e88ea450dc6738219107214360faa2047139542ea541414331e8 SHA512 c2fa91714901aeba6bbd2c4a0e8aee4b3edaa7893471d2dacc95e19f33d8fc633840b7bc70ab5b229168aca61f095471a5e27a9f17dcbd9771d1e09ee53c3bd7
 DIST libjcat-0.2.1.tar.gz 76698 BLAKE2B 62f77c993e47843dddacc9a67b9daac9bd29bef7363ce62125ecd22f9649b8a5ce2de07d74ea6900e9a45feb141caa19761bcffd337530d86a31b6ed94cab164 SHA512 e29fdaae38ade2960ffa7ac3cd41224ccab5fdb351d2ae420ffe0cf0ddb948bba37e9e040cc3046c8593be4622bf018779dfa80f173873b79582061f12c02373
 DIST libjcat-0.2.2.tar.xz 66128 BLAKE2B 30e855ec626616adf8326832dbb6e5c9266ffd41d14d1ef2a230f72e0a339d4c8ed83adacd0253faf242b065736dca7f25bd4ce04d30605998d39cacf01beac0 SHA512 91d4d9761e7de3ae312d9ef7b92fbbb82be262cdc4259ee9dad7abef8912abb047b2db51886b3d323565cb2d9a3175a56161b4879d27b36d4d318ad4419ab594
 EBUILD libjcat-0.2.1.ebuild 1782 BLAKE2B f0d05298374a5d1f55bb12781ce7188ed5a0aa5a76b37d9a82efb110f351923acb4512ecd71a2cdb001921c49e8fb5ed0ee508f4216e831da6099145b05ef10d SHA512 1d963e63011c464e88e8193a9331bf6261dad2113b718e5495ed56147898719cc715f80830cb905687beb0403955ad57170639b4355555a3fcdd4d3cd2c15df7
-EBUILD libjcat-0.2.2.ebuild 1770 BLAKE2B b524989ba3b2c924e400aba6babf6cedf18b7ab70af5dedda64b031131c45b73926385b20dd18e808ba53a1a9fd550c6f356ed7b6600237e2ed213a09d876322 SHA512 42729ec6196d5430fd40b7d4b9a83c333e1539bebcc0721364d7f43947d5c3e26ae1da22916d4feb6f63ee00c226017809d4dbc0371fde0cb69670377bdacf5b
+EBUILD libjcat-0.2.2.ebuild 1815 BLAKE2B d774309179df261aa90e25d7477a90c988baa7583c91c0e6e4bc2648c57aef7de0b1b7a9559066f6f97aed2f81f67e6939c54270cc32289b0286082cf21da411 SHA512 211d8f218e8e8c893e41c688980ed15df705a995134d89e74d30b7c362d7a9b3526f58250c742225dda909807e835ed1a01a9a59a1596c639a843caa1d0932ae
 MISC metadata.xml 878 BLAKE2B fb0d039464ebdfffe6de1bc524d22a0e7f674cf060ff696e145dbd5817b1704f32a960c809eeaaf312daf03b051b839bd8b6c9f9025f005c76a7fbae0c634f94 SHA512 d2d13760163ab41ed1fcdd6185c6b1486bf6652cae881bcba9336a73f8299baff48d6f045dbdd6d55f321994f51805530bc8924f43ecc35c626a97e5ca062881
diff --git a/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch b/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch
new file mode 100644
index 000000000000..82f1b6a38286
--- /dev/null
+++ b/dev-libs/libjcat/files/libjcat-0.2.2-tests.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/946985
+https://github.com/hughsie/libjcat/commit/130179f55a4eba1e885ca4ea1b4b2aa0a8d24605
+
+From 130179f55a4eba1e885ca4ea1b4b2aa0a8d24605 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Sat, 2 Nov 2024 15:06:31 +0100
+Subject: [PATCH] Skip ed25519 part of a test with -Ded25519=false
+
+Otherwise it fails with "jcat-self-test.c:1147:jcat_bt_common_func:
+assertion failed (error == NULL): Jcat engine kind 'ed25519' not
+supported (g-io-error-quark, 1)"
+---
+ libjcat/jcat-self-test.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libjcat/jcat-self-test.c b/libjcat/jcat-self-test.c
+index 68e1273..cc92e12 100644
+--- a/libjcat/jcat-self-test.c
++++ b/libjcat/jcat-self-test.c
+@@ -1142,6 +1142,7 @@ jcat_bt_common_func(void)
+ 	g_assert_no_error(error);
+ 	g_assert_nonnull(btcheckpoint);
+ 
++#ifdef ENABLE_ED25519
+ 	/* get engine */
+ 	engine = jcat_context_get_engine(context, JCAT_BLOB_KIND_ED25519, &error);
+ 	g_assert_no_error(error);
+@@ -1162,6 +1163,7 @@ jcat_bt_common_func(void)
+ 					   &error);
+ 	g_assert_no_error(error);
+ 	g_assert_nonnull(result);
++#endif
+ }
+ 
+ int
+
diff --git a/dev-libs/libjcat/libjcat-0.2.2.ebuild b/dev-libs/libjcat/libjcat-0.2.2.ebuild
index f584d650c90e..56480d506397 100644
--- a/dev-libs/libjcat/libjcat-0.2.2.ebuild
+++ b/dev-libs/libjcat/libjcat-0.2.2.ebuild
@@ -44,6 +44,10 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
 python_check_deps() {
 	python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
 }