diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-11 18:08:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-11 18:08:11 +0000 |
commit | 23650861e24563ddcf10919ab5b1912676c3ff0c (patch) | |
tree | 0853606be5f409f8f1859eb33652d0c8c1e62623 /dev-libs/openssl | |
parent | 44a6f923079d51164af67c7bc3f3e0db24658088 (diff) |
gentoo auto-resync : 11:03:2023 - 18:08:11
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r-- | dev-libs/openssl/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/openssl/openssl-3.0.8-r1.ebuild (renamed from dev-libs/openssl/openssl-3.0.8.ebuild) | 41 |
2 files changed, 25 insertions, 18 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 2740c1ecb606..067d97c1c051 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -21,5 +21,5 @@ EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba154 EBUILD openssl-1.1.1t-r1.ebuild 8244 BLAKE2B a0076fd2d5b9e6e98d1dce27221f68a6fa161bc705c10575c1cf7de806861f6a56de2d941ca4a165cde395a1583d9c0717bb93f23969476df145be14b955e4b9 SHA512 bb584d23900992fc799ea243e38f77d52eb5a6d387697f4e854ee874c5b960dd804fa76740879c5fcc10562dae4ff8b6e075927eebfd30c07404e759615cf65b EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47 EBUILD openssl-3.0.7-r4.ebuild 7739 BLAKE2B aabf04d23c68b70693e73b6412b2d8fc80d088b3be0595add8aaa8e61d12c6a39f3d48c82a78cf1b99c34f49129ee429dbacf85d3ee155e5458b73c47200eb58 SHA512 ae15ae5faf181f746d6eabb7cef8e0ac7eb3ce1409e3c3b4671f8da99ac264f7c20be42eff36b0a06aed1c872ffce5a52d4bd90dbb4bf739f0851e66f3481e7a -EBUILD openssl-3.0.8.ebuild 7741 BLAKE2B d451e3fda3a10150b154062ec500f2189e3bdf80ee760c0ffc1dee1aa1b8d11df7e866b2d94ac1870530eb58ff0fe6ae082287b8def3a14489d604964d545680 SHA512 838c5bf2f7e7641f42d806d0f0ef521c447bbdd41cf408d47bcc0a2c9945e7617b51640226590cc198e7e0981b5fd496aafd80dcb213c2b5e1bf79fed0cec965 +EBUILD openssl-3.0.8-r1.ebuild 7900 BLAKE2B ca2a9ef23d88283673b5062229b10b9c1fe28575fb1e5e77f2713c683dce2752a0ef535521f78031c38dd8060389ee52e9dc81172942b1c5e4b178439ef17ded SHA512 6eeeac9f540ccb59d54bde2fc34d7995ae464a7eaddb00a7f169c06cc9e748c55b6b0d073fc3b3fb9966bd14d407b80810d84fc287063b4810f548995d860fe4 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-3.0.8.ebuild b/dev-libs/openssl/openssl-3.0.8-r1.ebuild index a5c46e57fff2..5dce04cf6b4f 100644 --- a/dev-libs/openssl/openssl-3.0.8.ebuild +++ b/dev-libs/openssl/openssl-3.0.8-r1.ebuild @@ -92,13 +92,6 @@ src_unpack() { } src_prepare() { - # Allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.4 gentoo.config || die - chmod a+rx gentoo.config || die - - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - # Make sure we only ever touch Makefile.org and avoid patching a file # that gets blown away anyways by the Configure script in src_configure rm -f Makefile @@ -115,6 +108,11 @@ src_prepare() { einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." rm test/recipes/80-test_ssl_new.t || die fi +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" # Quiet out unknown driver argument warnings since openssl # doesn't have well-split CFLAGS and we're making it even worse @@ -134,14 +132,6 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) - local sslout=$(./gentoo.config) - einfo "Using configuration: ${sslout:-(openssl knows best)}" - edo perl Configure ${sslout} --test-sanity - - multilib_copy_sources -} - -multilib_src_configure() { # bug #197996 unset APPS # bug #312551 @@ -151,6 +141,10 @@ multilib_src_configure() { tc-export AR CC CXX RANLIB RC + multilib-minimal_src_configure +} + +multilib_src_configure() { use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") @@ -167,7 +161,7 @@ multilib_src_configure() { # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" #fi - local sslout=$(./gentoo.config) + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") einfo "Using configuration: ${sslout:-(openssl knows best)}" # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features @@ -201,7 +195,7 @@ multilib_src_configure() { threads ) - edo perl Configure "${myeconfargs[@]}" + edo perl "${S}/Configure" "${myeconfargs[@]}" } multilib_src_compile() { @@ -222,6 +216,8 @@ multilib_src_install() { emake DESTDIR="${D}" install_sw if use fips; then emake DESTDIR="${D}" install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then @@ -257,6 +253,17 @@ multilib_src_install_all() { keepdir ${SSL_CNF_DIR}/private } +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + ebegin "Running openssl fipsinstall" + "${ED}/usr/bin/openssl" fipsinstall -quiet \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" + eend $? + fi +} + pkg_postinst() { ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" |