diff options
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.1t-r1.ebuild | 71 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-3.0.8-r1.ebuild | 1 |
3 files changed, 34 insertions, 42 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 067d97c1c051..caeb56aa101b 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -18,8 +18,8 @@ DIST openssl-3.0.8.tar.gz 15151328 BLAKE2B e163cc9b8b458f72405a2f1bde3811c8d0eb2 DIST openssl-3.0.8.tar.gz.asc 833 BLAKE2B 1949801150e254e9be648f33014a4a16f803b42ca5a302c3942d377013e983e0ea0cca8aed594e3f9ecde26c6e31d222581e991af5fae6cd451d7ee83541f4bb SHA512 e1c04f1179aded228b39005fd9e9f6f75aedafb938b77ac58c97a00973eb412d93b92ad1c447332a5d96850b62b01093502928e6c190bdd0234a94c4e815d2a6 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9 EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3 -EBUILD openssl-1.1.1t-r1.ebuild 8244 BLAKE2B a0076fd2d5b9e6e98d1dce27221f68a6fa161bc705c10575c1cf7de806861f6a56de2d941ca4a165cde395a1583d9c0717bb93f23969476df145be14b955e4b9 SHA512 bb584d23900992fc799ea243e38f77d52eb5a6d387697f4e854ee874c5b960dd804fa76740879c5fcc10562dae4ff8b6e075927eebfd30c07404e759615cf65b +EBUILD openssl-1.1.1t-r1.ebuild 7978 BLAKE2B 1ffab9cd72ecf752fbc8e73ebee706fcf74de891b201c6a6d6f3d1f86accc9185720a4e2199c9637db358610a5a210edbf26fada2b5fa119cfa17e262c74adc2 SHA512 382d7898ab00585fad84360ec70bad6611a2688d5af3a3adb1dca54b6c4ca874183a3cf024f6fa69a5a6eda779c22d0a9b93423e383eda0ceb3f454dca30938a 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-r1.ebuild 7900 BLAKE2B ca2a9ef23d88283673b5062229b10b9c1fe28575fb1e5e77f2713c683dce2752a0ef535521f78031c38dd8060389ee52e9dc81172942b1c5e4b178439ef17ded SHA512 6eeeac9f540ccb59d54bde2fc34d7995ae464a7eaddb00a7f169c06cc9e748c55b6b0d073fc3b3fb9966bd14d407b80810d84fc287063b4810f548995d860fe4 +EBUILD openssl-3.0.8-r1.ebuild 7789 BLAKE2B a5a3eed08b0c4196e38849abd2f37c90f177f7c350f83064632934c379038e977e7519da2aadb62b7d15dc634cf26c8cf5bdae9aab0a4ddb6f4d1f0dbd693025 SHA512 b5e20150d2b93214303d70f73f7593f098bda3876e21d46e49c72000bd7161a29c3166908ae9f0e8af8efb4e127801dc0c7c962391499f9d46e74370ead17d2a MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-1.1.1t-r1.ebuild b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild index a724839c80c5..e7fb7976c194 100644 --- a/dev-libs/openssl/openssl-1.1.1t-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.1t-r1.ebuild @@ -75,13 +75,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 @@ -99,25 +92,6 @@ src_prepare() { rm test/recipes/80-test_ssl_new.t || die fi - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - append-flags $(test-flags-CC -Wa,--noexecstack) # Remove test target when FEATURES=test isn't set if ! use test ; then @@ -140,19 +114,34 @@ src_prepare() { Configurations/10-main.conf || die fi - local sslout=$(./gentoo.config) - einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="perl Configure" - [[ -z ${sslout} ]] && config="sh config -v" - # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - edo ${config} ${sslout} --test-sanity - - multilib_copy_sources } -multilib_src_configure() { +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 + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/18225 + # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing + append-flags -fno-strict-aliasing + + append-cppflags -DOPENSSL_NO_BUF_FREELISTS + + append-flags $(test-flags-CC -Wa,--noexecstack) + # bug #197996 unset APPS # bug #312551 @@ -162,6 +151,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") @@ -178,10 +171,10 @@ 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 "Use configuration ${sslout:-(openssl knows best)}" - local config="perl Configure" - [[ -z ${sslout} ]] && config="sh config -v" + local config=( perl "${S}/Configure" ) + [[ -z ${sslout} ]] && config=( sh "${S}/config" -v ) # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. @@ -219,7 +212,7 @@ multilib_src_configure() { threads ) - edo ${config} "${myeconfargs[@]}" + edo "${config[@]}" "${myeconfargs[@]}" } multilib_src_compile() { diff --git a/dev-libs/openssl/openssl-3.0.8-r1.ebuild b/dev-libs/openssl/openssl-3.0.8-r1.ebuild index 5dce04cf6b4f..ea11e22eb155 100644 --- a/dev-libs/openssl/openssl-3.0.8-r1.ebuild +++ b/dev-libs/openssl/openssl-3.0.8-r1.ebuild @@ -18,7 +18,6 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="mirror://openssl/source/${MY_P}.tar.gz verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi |