gentoo auto-resync : 25:04:2023 - 18:13:05

3 files changed, 23 insertions, 1 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6cef7ab16036..8ef26e8c18fc 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,6 +1,7 @@
 AUX libgcrypt-1.10-build-Allow-build-with-Oz.patch 1548 BLAKE2B 251e530bf2256492d95a91f2f4236344d0fced1e33ca419bd5c9ed2a7ad9f066f536f1a83c7fcaffa8c2a451611b28e2006218f091da67297bc2061bbdeea18c SHA512 124d5e3c74fd00af97219838233c3088f8d37a72ed2e086252696ab1a80e7a009414902aab49026dfd464347ef5ee979670ce65d2ea12b173328b1af83ac7a3b
 AUX libgcrypt-1.10.1-configure-clang16.patch 5972 BLAKE2B d0b45199e11cdfea1b26e8efd85b978e2d903712e10f4d5f8e9edcad91f3adc6314f4afe7ece897cb190bbfe59e8713ead45b857b8fdeb485428e3a41f73520e SHA512 b7e4565a58356859f4cb37b51cbdd859280c55c8797af893e622b75c4748b0509d2ea33c946a4c9bc3c9a1479b9edaa6e8884d2f221f7410f7bb8639aefc9cc7
 AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
+AUX libgcrypt-1.10.2-darwin.patch 566 BLAKE2B 26819835249672cb95500a7edf018642446e9f42d4fc11e7807a606cf9fe59790be6bc5d5355bee671a42d79f6f6d9b9d07cdd5eede7f872c68a4d90c74a21da SHA512 a1a4cb426b355f75ba22a09dcd6ab0dde29e2e8be3ef0ad7fb80c126820f490c381691c05812ecc0703490e55fca68f551002fb3bc0b33a7d987357b3bf59a0f
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
 AUX libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch 646 BLAKE2B a6a4b46dfa9a113446fb10e3c66ab64c08ea2cb768acfe0f5057e102c827ca6e3d676e1970f9234db5bec86ea6745b765a412c1b5cdc263bd7154b169960b136 SHA512 a49af765a1175dd8041a500d3c7213df27c00699bf8a5202b080539bf2909084214d008509039c81d6a28a0f4a3b9fe1f45f89aaa87742bce9a5dd8c8c469fbf
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
@@ -13,6 +14,6 @@ DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
 EBUILD libgcrypt-1.10.1-r2.ebuild 6237 BLAKE2B 0246702c6936eeb86f380b1e1757d7e98b25a88f0e287a68286d141fd085372b4b2b89a512be141db66edfc8117a918fb18d0e8958f91b7528a56e3db5487f45 SHA512 251f1389ffe471a63674bcc9329d6291dcf4cca5a0771a5b7748082efebd76f0247b433a460dae74630acb140a122708fc222e140c3d82e1d906ea5efb0849ea
 EBUILD libgcrypt-1.10.1-r3.ebuild 6355 BLAKE2B d481767c4dc662eaf221eaff7ae2d7f7bbcf724ec75ab3f9e67171522e20a6df124abc150d45cac99556afb371a28531520e166d36997b55f4df0e2a1ae89a53 SHA512 7a9cbdfef5eac7f3cb320e97e873e069cb36c423f557aa3936808068b1eeff9cc06cc7c097a41da52177e680f49e8e79bdd999cfb5042c52b628434dd78040fe
-EBUILD libgcrypt-1.10.2.ebuild 6197 BLAKE2B 67a10df2f9c2ae1dc3124aa911ab06d50bc00111e5c500896b0f4652609a101ed96d20e8e4a0a89d5af308764df96e9534180fa65d7d3b034100808399f304e3 SHA512 1eb72b73ca57d89fb00c0e32fbf4090003cfcffc18e533dfaaade88cb8d20ea2b45c737141308f5d1b3111b98db6a1cf4ade2c2ec7e9a178cd38c609591989a0
+EBUILD libgcrypt-1.10.2.ebuild 6248 BLAKE2B ea5f326ed859f152413ab6da37958c10b39c9b5d43f13dc4021ad557c206b8525c7ada09524d1f504cec0873ad08a24f5bedcd8df71bbadf0676a07a614bd7a9 SHA512 2933f0bb98badf7bd2eda9807301cebce5d12843c6a4c052a3ff5ad0b2c60e2211c4ae7c4df3c3c38c1c3b5a62f4c719c942f4a31955c515ba5f1eb48cb232eb
 EBUILD libgcrypt-1.9.4-r2.ebuild 5295 BLAKE2B 6684e3673496ecc786a73911d289842059c426d9e412c3a60a8a34e01ca6542bc1f7c16bd9445da65960ebfef15874d8cbe4c0a498145752aa4edbb21097e273 SHA512 bc8e76d703c7041a3dc59bddde9464f8078a762136b5fc6e2da60c10ab9ce960ce2324274f75e04e4bdc4114ac8b2a6181447fae9ba905ed57a45839a2b0b200
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.2-darwin.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.2-darwin.patch
new file mode 100644
index 000000000000..6153f1840b97
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.2-darwin.patch
@@ -0,0 +1,20 @@
+https://dev.gnupg.org/T6442
+
+Patch as suggested by Werned in https://dev.gnupg.org/T6442#169396
+
+--- a/random/rndgetentropy.c
++++ b/random/rndgetentropy.c
+@@ -94,8 +94,13 @@
+                * and might not be applicable on other FIPS modules not running
+                * RHEL kernel.
+                */
++#ifdef GRND_RANDOM
+               nbytes = length < 32 ? length : 32;
+               ret = getrandom (buffer, nbytes, GRND_RANDOM);
++#else
++              ret = -1;
++              gpg_err_set_errno (ENOSYS);
++#endif
+             }
+           else
+             {
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index 3bc1ef525b06..41cdeeafe307 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
 	"${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch
+	"${FILESDIR}"/${P}-darwin.patch  # upstream T6442
 )
 
 MULTILIB_CHOST_TOOLS=(