gentoo auto-resync : 08:11:2022 - 21:24:43

3 files changed, 40 insertions, 5 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 09709a560be9..fe00cbc16a2e 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -7,6 +7,6 @@ DIST libgcrypt-1.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0a
 DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1-r2.ebuild 5024 BLAKE2B 55699147fe7324476a95f85159d39c7441669bb42eadc75e9c1d40015591585ac58fdd057900632a197608c870e2c2cf2e2348509e8420afeb84f6884fe115ee SHA512 d7a0410acd1e4e122b7e7d7c1f486ae5ba25290ae225a633fb5e8b6b2f9378c51fa79d11475be7512585ead906a6cd9bbb815bcc4a227616c0419246925f4fb2
+EBUILD libgcrypt-1.10.1-r2.ebuild 5976 BLAKE2B ae3b608b57a946372cf9634c3672eeffa8f0b2f5b2c85e42ed49eaab1aec3ec45edf4a3470569e6f919d02ff152f2c8dcb0300d10dad24c2c27d7132e2b14bf3 SHA512 5ed73f726648ead960b9816248ce49dbb15ab8a5b983ef98b8fb1c78fa88b18cc3537c4ba59943df2f4d8a222b9be29afed9c868d971cc4d686acb0fd695b86b
 EBUILD libgcrypt-1.9.4-r2.ebuild 5021 BLAKE2B 28031c72d8ee46ff5ce9820339c3397d6300e07c0a7f6a88b91c2cea144546001cb3d5a2bf3a47d4018ae1d5ebfc565e2789f1b5255e581382a44b2b5949b4eb SHA512 c6cf36fac494c3e90dc1b4b5178a83676b55e5bb785644ba79af83febd431d123e1dca0f4092863e3638e476465f4fdb8e5ac0ff2418ab276e05c0761a56e908
-MISC metadata.xml 524 BLAKE2B ab417ec172246d92822cafcadf2ccb72d2b8e0c056d93f1575284afbfc30dae74086d5a3b2d0bc60ec03de0a9f02ac08dc8f961f1f38eb639d862708886141ee SHA512 52d663d33d8d76f5a4613d1fded0630a5597796b0c20ddfc5eecda92fbf28f4f3b8c976e2fdb418cebd9d743ca26b1c6329ad65e1655f6eae5c1d797df1d1f95
+MISC metadata.xml 618 BLAKE2B 021fa7dc0559fe3e168e7e01709648ac35b6e2be61982fddf411fff584c8460eb336f5cac35d996855e14b66d59fba5be38f9da2728ccf2b5d43348f192a689e SHA512 67fbf92bd1d8724958d1002ffedc639430d8b65f010842ca64f9d0e4da2cbd7278817259d181791775e7c85478ff6b63e25e82120839150553095179f488d641
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
index 2d7401c6a39f..5614f817ecb3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+inherit autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="https://www.gnupg.org/"
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
 # If changing this, update src_configure logic too.
@@ -30,7 +30,13 @@ REQUIRED_USE="
 	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 "
 
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
+	getentropy? (
+		kernel_linux? (
+			elibc_glibc? ( >=sys-libs/glibc-2.25 )
+			elibc_musl? ( >=sys-libs/musl-1.1.20 )
+		)
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( virtual/texi2dvi )
 	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
@@ -46,6 +52,27 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libgcrypt-config
 )
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+	if use kernel_linux && use getentropy; then
+		unset KV_FULL
+		get_running_version
+		if [[ -n ${KV_FULL} ]] && kernel_is -lt 3 17; then
+			eerror "The getentropy function requires the getrandom syscall."
+			eerror "This was introduced in Linux 3.17."
+			eerror "Your system is currently running Linux ${KV_FULL}."
+			eerror "Disable the 'getentropy' USE flag or upgrade your kernel."
+			die "Kernel is too old for getentropy"
+		fi
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -109,6 +136,13 @@ multilib_src_configure() {
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
 
+	if use kernel_linux; then
+		# --enable-random=getentropy requires getentropy/getrandom.
+		# --enable-random=linux enables legacy code that tries getrandom
+		# and falls back to reading /dev/random.
+		myeconfargs+=( --enable-random=$(usex getentropy getentropy linux) )
+	fi
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 }
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 5ec9f7d1803a..6fc509a00bd7 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -14,5 +14,6 @@
 	</upstream>
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
+		<flag name="getentropy">Use getentropy function to obtain randomness from the kernel</flag>
 	</use>
 </pkgmetadata>