commit: fd766f586e8f65f29b7bf1eb0626990053e7a190 Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Fri Dec 23 02:01:29 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 23 03:21:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd766f58
dev-libs/openssl: check for CONFIG_CRYPTO_USER_API_SKCIPHER test/recipes/30-test_afalg.t requires this kernel option to be enabled. Builtin or module is fine. Bug: https://bugs.gentoo.org/864793 Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild | 5 ++++- dev-libs/openssl/openssl-1.1.1s.ebuild | 5 ++++- dev-libs/openssl/openssl-3.0.7-r2.ebuild | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild index 7f129274d627..e95f60fc6006 100644 --- a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild +++ b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig +inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info MY_P=openssl-${PV/_/-} DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)" @@ -54,6 +54,9 @@ pkg_setup() { die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" fi fi + + use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER" + linux-info_pkg_setup } src_unpack() { diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild index 3bfa37a91882..a47367ffab4c 100644 --- a/dev-libs/openssl/openssl-1.1.1s.ebuild +++ b/dev-libs/openssl/openssl-1.1.1s.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig +inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info MY_P=${P/_/-} DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)" @@ -61,6 +61,9 @@ pkg_setup() { die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" fi fi + + use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER" + linux-info_pkg_setup } src_unpack() { diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild index 17ccd678b293..3ce576abc93d 100644 --- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild +++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild @@ -63,6 +63,7 @@ pkg_setup() { CONFIG_CHECK="~TLS ~TLS_DEVICE" ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" linux-info_pkg_setup fi
