commit:     0d5a819321682ff72e2c3524d8322fb008e069ea
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 16:56:33 2023 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 16:57:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5a8193

dev-libs/openssl: drop 1.1.1s, 1.1.1t-r2

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/openssl/Manifest                 |   2 -
 dev-libs/openssl/openssl-1.1.1s.ebuild    | 342 ------------------------------
 dev-libs/openssl/openssl-1.1.1t-r2.ebuild | 266 -----------------------
 3 files changed, 610 deletions(-)

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 46d864d06642..11ae27549ed5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,8 +1,6 @@
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 
6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24
 SHA512 
5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B 
b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4
 SHA512 
a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B 
b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57
 SHA512 
c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
-DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B 
ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb
 SHA512 
2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9
-DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B 
d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca
 SHA512 
aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
 DIST openssl-1.1.1t.tar.gz 9881866 BLAKE2B 
66d76ea0c05a4afc3104e22602cffc2373e857728625d31ab3244881cafa91c099a817a09def7746bce4133585bfc90b769f43527e77a81ed13e60a8c2fb4d8d
 SHA512 
628676c9c3bc1cf46083d64f61943079f97f0eefd0264042e40a85dbbd988f271bfe01cd1135d22cc3f67a298f1d078041f8f2e97b0da0d93fe172da573da18c
 DIST openssl-1.1.1t.tar.gz.asc 833 BLAKE2B 
fc5e7069268e987a20241dfc4f080529c6e95e217c198568b09c833e390e68b25a604a5d3ec29c6a64b9dee9d42199fd3647214e536ba2f7b8b4e57aa4cba680
 SHA512 
1232a94fce991d62f008ae6d3d9b6fe68cb6378fe07450feb17a58eb2417fb385ffcb7e6b74eb683134be9ff6ccf6efa183f37f4dd521614fd5aeaddf000b90b
 DIST openssl-3.0.8.tar.gz 15151328 BLAKE2B 
e163cc9b8b458f72405a2f1bde3811c8d0eb22e8b08ff5608ec64799975f1546dcdce31466b8a1d5ed29bc90d19aa6017d711987c81b71f4b20e279828cf753a
 SHA512 
8ce10be000d7d4092c8efc5b96b1d2f7da04c1c3a624d3a7923899c6b1de06f369016be957e36e8ab6d4c9102eaeec5d1973295d547f7893a7f11f132ae42b0d

diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild 
b/dev-libs/openssl/openssl-1.1.1s.ebuild
deleted file mode 100644
index ae35bd52b8b8..000000000000
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 linux-info
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL 
and TLS)"
-HOMEPAGE="https://www.openssl.org/";
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-       verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-       KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test 
tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-       tls-compression? ( 
>=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       >=dev-lang/perl-5
-       sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-       test? (
-               sys-apps/diffutils
-               sys-devel/bc
-               kernel_linux? ( sys-process/procps )
-       )
-       verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-       usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-       # General patches which are suitable to always apply
-       # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-       "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
-       "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-pkg_setup() {
-       [[ ${MERGE_TYPE} == binary ]] && return
-
-       # must check in pkg_setup; sysctl doesn't work with userpriv!
-       if use test && use sctp; then
-               # test_ssl_new will fail with "Ensure SCTP AUTH chunks are 
enabled in kernel"
-               # if sctp.auth_enable is not enabled.
-               local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 
2>/dev/null)
-               if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 
1 ]]; then
-                       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() {
-       # Can delete this once test fix patch is dropped
-       if use verify-sig ; then
-               # Needed for downloaded patch (which is unsigned, which is fine)
-               verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-       fi
-
-       default
-}
-
-src_prepare() {
-       # Allow openssl to be cross-compiled
-       cp "${FILESDIR}"/gentoo.config-1.0.2 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
-
-       if ! use vanilla ; then
-               PATCHES+=(
-                       # Add patches which are Gentoo-specific customisations 
here
-               )
-       fi
-
-       default
-
-       if use test && use sctp && has network-sandbox ${FEATURES}; then
-               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
-
-       # - Make sure the man pages are suffixed (bug #302165)
-       # - Don't bother building man pages if they're disabled
-       # - Make DOCDIR Gentoo compliant
-       sed -i \
-               -e '/^MANSUFFIX/s:=.*:=ssl:' \
-               -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-               -e $(has noman FEATURES \
-                       && echo '/^install:/s:install_docs::' \
-                       || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') 
\
-               -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-               Configurations/unix-Makefile.tmpl \
-               || die
-
-       # 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)
-
-       # Prefixify Configure shebang (bug #141906)
-       sed \
-               -e "1s,/usr/bin/env,${BROOT}&," \
-               -i Configure || die
-
-       # Remove test target when FEATURES=test isn't set
-       if ! use test ; then
-               sed \
-                       -e '/^$config{dirs}/s@ "test",@@' \
-                       -i Configure || die
-       fi
-
-       if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-               # use GNU ld full option, not to confuse it on Solaris
-               sed -i \
-                       -e 's/-Wl,-M,/-Wl,--version-script=/' \
-                       -e 's/-Wl,-h,/-Wl,--soname=/' \
-                       Configurations/10-main.conf || die
-
-               # fix building on Solaris 10
-               # https://github.com/openssl/openssl/issues/6333
-               sed -i \
-                       -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-                       Configurations/10-main.conf || die
-       fi
-
-       # 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
-       ./config --test-sanity || die "I AM NOT SANE"
-
-       multilib_copy_sources
-}
-
-multilib_src_configure() {
-       # bug #197996
-       unset APPS
-       # bug #312551
-       unset SCRIPTS
-       # bug #311473
-       unset CROSS_COMPILE
-
-       tc-export AR CC CXX RANLIB RC
-
-       use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-       local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo 
"Heimdal")
-
-       # See if our toolchain supports __uint128_t.  If so, it's 64bit
-       # friendly and can use the nicely optimized code paths, bug #460790.
-       #local ec_nistp_64_gcc_128
-       #
-       # Disable it for now though (bug #469976)
-       # Do NOT re-enable without substantial discussion first!
-       #
-       #echo "__uint128_t i;" > "${T}"/128.c
-       #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-       #       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-       #fi
-
-       local sslout=$(./gentoo.config)
-       einfo "Use configuration ${sslout:-(openssl knows best)}"
-       local config="Configure"
-       [[ -z ${sslout} ]] && config="config"
-
-       # "disable-deprecated" option breaks too many consumers.
-       # Don't set it without thorough revdeps testing.
-       # Make sure user flags don't get added *yet* to avoid duplicated
-       # flags.
-       local myeconfargs=(
-               ${sslout}
-
-               $(use cpu_flags_x86_sse2 || echo "no-sse2")
-               enable-camellia
-               enable-ec
-               enable-ec2m
-               enable-sm2
-               enable-srp
-               $(use elibc_musl && echo "no-async")
-               ${ec_nistp_64_gcc_128}
-               enable-idea
-               enable-mdc2
-               enable-rc5
-               $(use_ssl sslv3 ssl3)
-               $(use_ssl sslv3 ssl3-method)
-               $(use_ssl asm)
-               $(use_ssl rfc3779)
-               $(use_ssl sctp)
-               $(use test || echo "no-tests")
-               $(use_ssl tls-compression zlib)
-               $(use_ssl tls-heartbeat heartbeats)
-               $(use_ssl weak-ssl-ciphers)
-
-               --prefix="${EPREFIX}"/usr
-               --openssldir="${EPREFIX}"${SSL_CNF_DIR}
-               --libdir=$(get_libdir)
-
-               shared
-               threads
-       )
-
-       CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
-
-       # Clean out hardcoded flags that openssl uses
-       local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-               -e 's:^CFLAGS=::' \
-               -e 's:\(^\| \)-fomit-frame-pointer::g' \
-               -e 's:\(^\| \)-O[^ ]*::g' \
-               -e 's:\(^\| \)-march=[^ ]*::g' \
-               -e 's:\(^\| \)-mcpu=[^ ]*::g' \
-               -e 's:\(^\| \)-m[^ ]*::g' \
-               -e 's:^ *::' \
-               -e 's: *$::' \
-               -e 's: \+: :g' \
-               -e 's:\\:\\\\:g'
-       )
-
-       # Now insert clean default flags with user flags
-       sed -i \
-               -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-               -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-               Makefile || die
-}
-
-multilib_src_compile() {
-       # depend is needed to use $confopts; it also doesn't matter
-       # that it's -j1 as the code itself serializes subdirs
-       emake -j1 depend
-
-       emake all
-}
-
-multilib_src_test() {
-       emake -j1 test
-}
-
-multilib_src_install() {
-       # We need to create ${ED}/usr on our own to avoid a race condition (bug 
#665130)
-       dodir /usr
-
-       emake DESTDIR="${D}" install
-
-       # This is crappy in that the static archives are still built even
-       # when USE=static-libs. But this is due to a failing in the openssl
-       # build system: the static archives are built as PIC all the time.
-       # Only way around this would be to manually configure+compile openssl
-       # twice; once with shared lib support enabled and once without.
-       if ! use static-libs; then
-               rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-       fi
-}
-
-multilib_src_install_all() {
-       # openssl installs perl version of c_rehash by default, but
-       # we provide a shell version via app-misc/c_rehash
-       rm "${ED}"/usr/bin/c_rehash || die
-
-       dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-       # Create the certs directory
-       keepdir ${SSL_CNF_DIR}/certs
-
-       # Namespace openssl programs to prevent conflicts with other man pages
-       cd "${ED}"/usr/share/man || die
-       local m d s
-       for m in $(find . -type f | xargs grep -L '#include') ; do
-               d=${m%/*}
-               d=${d#./}
-               m=${m##*/}
-
-               [[ ${m} == openssl.1* ]] && continue
-
-               [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links 
already!"
-
-               mv ${d}/{,ssl-}${m} || die
-
-               # Fix up references to renamed man pages
-               sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' 
${d}/ssl-${m} || die
-               ln -s ssl-${m} ${d}/openssl-${m}
-
-               # Locate any symlinks that point to this man page
-               # We assume that any broken links are due to the above renaming
-               for s in $(find -L ${d} -type l) ; do
-                       s=${s##*/}
-
-                       rm -f ${d}/${s}
-
-                       # We don't want to "|| die" here
-                       ln -s ssl-${m} ${d}/ssl-${s}
-                       ln -s ssl-${s} ${d}/openssl-${s}
-               done
-       done
-       [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-       # bug #254521
-       dodir /etc/sandbox.d
-       echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-       diropts -m0700
-       keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-       ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild 
hashes (bug #333069)"
-       c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-       eend $?
-}

diff --git a/dev-libs/openssl/openssl-1.1.1t-r2.ebuild 
b/dev-libs/openssl/openssl-1.1.1t-r2.ebuild
deleted file mode 100644
index ed79949dc698..000000000000
--- a/dev-libs/openssl/openssl-1.1.1t-r2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL 
and TLS)"
-HOMEPAGE="https://www.openssl.org/";
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-       verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test 
tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       tls-compression? ( 
>=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       >=dev-lang/perl-5
-       sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-       test? (
-               sys-apps/diffutils
-               sys-devel/bc
-               kernel_linux? ( sys-process/procps )
-       )
-       verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-       usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-       # General patches which are suitable to always apply
-       # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-       "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
-       "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-       "${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-       "${FILESDIR}"/openssl-1.1.1t-CVE-2023-0464.patch
-)
-
-pkg_setup() {
-       [[ ${MERGE_TYPE} == binary ]] && return
-
-       # must check in pkg_setup; sysctl doesn't work with userpriv!
-       if use test && use sctp; then
-               # test_ssl_new will fail with "Ensure SCTP AUTH chunks are 
enabled in kernel"
-               # if sctp.auth_enable is not enabled.
-               local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 
2>/dev/null)
-               if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 
1 ]]; then
-                       die "FEATURES=test with USE=sctp requires 
net.sctp.auth_enable=1!"
-               fi
-       fi
-}
-
-src_unpack() {
-       # Can delete this once test fix patch is dropped
-       if use verify-sig ; then
-               # Needed for downloaded patch (which is unsigned, which is fine)
-               verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-       fi
-
-       default
-}
-
-src_prepare() {
-       # 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
-
-       if ! use vanilla ; then
-               PATCHES+=(
-                       # Add patches which are Gentoo-specific customisations 
here
-               )
-       fi
-
-       default
-
-       if use test && use sctp && has network-sandbox ${FEATURES}; then
-               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
-
-       # Remove test target when FEATURES=test isn't set
-       if ! use test ; then
-               sed \
-                       -e '/^$config{dirs}/s@ "test",@@' \
-                       -i Configure || die
-       fi
-
-       if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-               # use GNU ld full option, not to confuse it on Solaris
-               sed -i \
-                       -e 's/-Wl,-M,/-Wl,--version-script=/' \
-                       -e 's/-Wl,-h,/-Wl,--soname=/' \
-                       Configurations/10-main.conf || die
-
-               # fix building on Solaris 10
-               # https://github.com/openssl/openssl/issues/6333
-               sed -i \
-                       -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-                       Configurations/10-main.conf || die
-       fi
-
-       # 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
-}
-
-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
-       unset SCRIPTS
-       # bug #311473
-       unset CROSS_COMPILE
-
-       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")
-
-       # See if our toolchain supports __uint128_t.  If so, it's 64bit
-       # friendly and can use the nicely optimized code paths, bug #460790.
-       #local ec_nistp_64_gcc_128
-       #
-       # Disable it for now though (bug #469976)
-       # Do NOT re-enable without substantial discussion first!
-       #
-       #echo "__uint128_t i;" > "${T}"/128.c
-       #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-       #       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-       #fi
-
-       local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-       einfo "Use configuration ${sslout:-(openssl knows best)}"
-       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.
-       # Make sure user flags don't get added *yet* to avoid duplicated
-       # flags.
-       local myeconfargs=(
-               ${sslout}
-
-               $(use cpu_flags_x86_sse2 || echo "no-sse2")
-               enable-camellia
-               enable-ec
-               enable-ec2m
-               enable-sm2
-               enable-srp
-               $(use elibc_musl && echo "no-async")
-               ${ec_nistp_64_gcc_128}
-               enable-idea
-               enable-mdc2
-               enable-rc5
-               $(use_ssl sslv3 ssl3)
-               $(use_ssl sslv3 ssl3-method)
-               $(use_ssl asm)
-               $(use_ssl rfc3779)
-               $(use_ssl sctp)
-               $(use test || echo "no-tests")
-               $(use_ssl tls-compression zlib)
-               $(use_ssl tls-heartbeat heartbeats)
-               $(use_ssl weak-ssl-ciphers)
-
-               --prefix="${EPREFIX}"/usr
-               --openssldir="${EPREFIX}"${SSL_CNF_DIR}
-               --libdir=$(get_libdir)
-
-               shared
-               threads
-       )
-
-       edo "${config[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-       emake all
-}
-
-multilib_src_test() {
-       emake -j1 test
-}
-
-multilib_src_install() {
-       emake DESTDIR="${D}" install_sw
-
-       if multilib_is_native_abi; then
-               emake DESTDIR="${D}" install_ssldirs
-               emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} 
MANSUFFIX=ssl install_docs
-       fi
-
-       # This is crappy in that the static archives are still built even
-       # when USE=static-libs. But this is due to a failing in the openssl
-       # build system: the static archives are built as PIC all the time.
-       # Only way around this would be to manually configure+compile openssl
-       # twice; once with shared lib support enabled and once without.
-       if ! use static-libs; then
-               rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-       fi
-}
-
-multilib_src_install_all() {
-       # openssl installs perl version of c_rehash by default, but
-       # we provide a shell version via app-misc/c_rehash
-       rm "${ED}"/usr/bin/c_rehash || die
-
-       dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-       # Create the certs directory
-       keepdir ${SSL_CNF_DIR}/certs
-
-       # bug #254521
-       dodir /etc/sandbox.d
-       echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-       diropts -m0700
-       keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-       ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to 
rebuild hashes (bug #333069)"
-       openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-       eend $?
-}

Reply via email to