[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/

[Sam James]

commit:     c677b813ee160584b543a2f94802d544264cc41d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 11:34:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 11:41:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c677b813

dev-libs/libgcrypt: don't try to use mlock in tests

Two tests (t-secmem and t-sexp) fail if we try to use mlock in e.g. a
systemd-nspawn container which denies that privilege by default.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild | 8 ++++++++
 dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild | 8 ++++++++
 dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild    | 8 ++++++++
 dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild  | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild 
b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
index e966ec63af10..8e315d592a7f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
@@ -157,6 +157,14 @@ multilib_src_compile() {
        multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C 
doc gcrypt.pdf
 }
 
+multilib_src_test() {
+       # t-secmem and t-sexp need mlock which requires extra privileges; nspawn
+       # at least disallows that by default.
+       local -x GCRYPT_IN_ASAN_TEST=1
+
+       default
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
        multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf

diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild 
b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index f50e95fd6d3b..d2dccd75aed5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -160,6 +160,14 @@ multilib_src_compile() {
        multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C 
doc gcrypt.pdf
 }
 
+multilib_src_test() {
+       # t-secmem and t-sexp need mlock which requires extra privileges; nspawn
+       # at least disallows that by default.
+       local -x GCRYPT_IN_ASAN_TEST=1
+
+       default
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
        multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf

diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild 
b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index fb3af0f2b1e9..1f99ec03e9d3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -158,6 +158,14 @@ multilib_src_compile() {
        multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C 
doc gcrypt.pdf
 }
 
+multilib_src_test() {
+       # t-secmem and t-sexp need mlock which requires extra privileges; nspawn
+       # at least disallows that by default.
+       local -x GCRYPT_IN_ASAN_TEST=1
+
+       default
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
        multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf

diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild 
b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
index 30988830e25f..040fad866c53 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
@@ -123,6 +123,14 @@ multilib_src_compile() {
        multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C 
doc gcrypt.pdf
 }
 
+multilib_src_test() {
+       # t-secmem and t-sexp need mlock which requires extra privileges; nspawn
+       # at least disallows that by default.
+       local -x GCRYPT_IN_ASAN_TEST=1
+
+       default
+}
+
 multilib_src_install() {
        emake DESTDIR="${D}" install
        multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf