diff options
| -rw-r--r-- | dev-libs/openssl/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch | 21 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch | 61 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-3.0.3-r1.ebuild (renamed from dev-libs/openssl/openssl-3.0.2-r1.ebuild) | 116 |
4 files changed, 69 insertions, 132 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 0147a30..0f681d0 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1 +1,2 @@ -DIST openssl-3.0.1.tar.gz 15011207 BLAKE2B ea1e560cbebbd3fdb560cbd7db518db2f95d1b7a8397435483829eda815e9f74a175693949c3d013205c43c936d703755ca14afba29077570361fca75164a719 SHA512 4eb29386a6c2c47bebc668e68b61872eed1d136e5620d6f8971393ae7dd8d0f640257278735c76adc0c9569a315fdb929c175a2931d52d3fcc4c527ad6a975ce +DIST openssl-3.0.3.tar.gz 15058905 BLAKE2B 8141d13dbea2f1febdd4e46aa404e9f3bac51e1fdc0c9b0df8bf3bf6852e18b09201a2a8cbee99f72e8d6de660834093449b7a14a3fbdda8511286ca3b6743e7 SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a +DIST openssl-3.0.3.tar.gz.asc 488 BLAKE2B 3f31e3a73706b69683220e05b1b4ddc75dc3e7e12652dca711e4aa0eb3c023ef736aee9ade15172d7f28e1e1af03e86d4854ec6c3d167cad42882f483c5e56d4 SHA512 04afe65c6af1ae43a9967462383a6a4f567f5acff19ec1952cd6fce2dc3c3d4dfb3cb54126562724c148f40dcb66668abf727282d35730bbf36f82b5c6bacace diff --git a/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch deleted file mode 100644 index c837e20..0000000 --- a/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/openssl/openssl/issues/7679 - ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -77,8 +77,14 @@ - # to. You're welcome. - sub dependmagic { - my $target = shift; -- -- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; -+ my $magic = <<"_____"; -+$target: build_generated depend -+ \$(MAKE) _$target -+_$target -+_____ -+ # Remove line ending -+ $magic =~ s|\R$||; -+ return $magic; - } - ''; - -} diff --git a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch deleted file mode 100644 index c94b032..0000000 --- a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 29 Aug 2019 13:56:21 -0700 -Subject: [PATCH] Add support for io_pgetevents_time64 syscall - -32-bit architectures that are y2038 safe don't include syscalls that use -32-bit time_t. Instead these architectures have suffixed syscalls that -always use a 64-bit time_t. In the case of the io_getevents syscall the -syscall has been replaced with the io_pgetevents_time64 syscall instead. - -This patch changes the io_getevents() function to use the correct -syscall based on the avaliable syscalls and the time_t size. We will -only use the new 64-bit time_t syscall if the architecture is using a -64-bit time_t. This is to avoid having to deal with 32/64-bit -conversions and relying on a 64-bit timespec struct on 32-bit time_t -platforms. As of Linux 5.3 there are no 32-bit time_t architectures -without __NR_io_getevents. In the future if a 32-bit time_t architecture -wants to use the 64-bit syscalls we can handle the conversion. - -This fixes build failures on 32-bit RISC-V. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> - -Reviewed-by: Richard Levitte <levitte@openssl.org> -Reviewed-by: Paul Dale <paul.dale@oracle.com> -(Merged from https://github.com/openssl/openssl/pull/9819) ---- - engines/e_afalg.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/engines/e_afalg.c b/engines/e_afalg.c -index dacbe358cb..99516cb1bb 100644 ---- a/engines/e_afalg.c -+++ b/engines/e_afalg.c -@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, - struct io_event *events, - struct timespec *timeout) - { -+#if defined(__NR_io_getevents) - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#elif defined(__NR_io_pgetevents_time64) -+ /* Let's only support the 64 suffix syscalls for 64-bit time_t. -+ * This simplifies the code for us as we don't need to use a 64-bit -+ * version of timespec with a 32-bit time_t and handle converting -+ * between 64-bit and 32-bit times and check for overflows. -+ */ -+ if (sizeof(timeout->tv_sec) == 8) -+ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); -+ else { -+ errno = ENOSYS; -+ return -1; -+ } -+#else -+# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." -+#endif - } - - static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, --- -2.26.2 - diff --git a/dev-libs/openssl/openssl-3.0.2-r1.ebuild b/dev-libs/openssl/openssl-3.0.3-r1.ebuild index 98282c5..86e51bf 100644 --- a/dev-libs/openssl/openssl-3.0.2-r1.ebuild +++ b/dev-libs/openssl/openssl-3.0.3-r1.ebuild @@ -3,27 +3,28 @@ EAPI="7" -inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig - -MY_P=${P/_/-} +inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" HOMEPAGE="https://www.openssl.org/" -if [[ ${PV} == "9999" ]] ; then +MY_P=${P/_/-} + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/openssl/openssl.git" inherit git-r3 else SRC_URI="mirror://openssl/source/${MY_P}.tar.gz verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" fi +S="${WORKDIR}"/${MY_P} + LICENSE="Apache-2.0" SLOT="0/3" # .so version of libssl/libcrypto - IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" RESTRICT="!test? ( test )" @@ -31,7 +32,6 @@ COMMON_DEPEND=" >=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " - BDEPEND=" >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) @@ -43,17 +43,18 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-openssl )" DEPEND="${COMMON_DEPEND}" - RDEPEND="${COMMON_DEPEND}" - PDEPEND="app-misc/ca-certificates" -S="${WORKDIR}/${MY_P}" - MULTILIB_WRAPPED_HEADERS=( /usr/include/openssl/configuration.h ) +PATCHES=( + # General patches which are suitable to always apply + # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare! +) + pkg_setup() { if use ktls ; then if kernel_is -lt 4 18 ; then @@ -69,7 +70,7 @@ pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return - # must check in pkg_setup; sysctl don't work with userpriv! + # 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. @@ -81,11 +82,11 @@ pkg_setup() { } src_prepare() { - # allow openssl to be cross-compiled + # 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 + # 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 @@ -93,21 +94,21 @@ src_prepare() { rm -f Makefile if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) fi - eapply_user + 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 #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant + # - 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):' \ @@ -118,17 +119,26 @@ src_prepare() { Configurations/unix-Makefile.tmpl \ || die - # quiet out unknown driver argument warnings since openssl + # 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 (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - + # 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 + # Don't remove the no strict aliasing bits below! + filter-flags -fstrict-aliasing append-flags -fno-strict-aliasing + append-flags $(test-flags-CC -Wa,--noexecstack) - # Prefixify Configure shebang (#141906) + # Prefixify Configure shebang (bug #141906) sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ + -e "1s,/usr/bin/env,${BROOT}&," \ -i Configure || die # Remove test target when FEATURES=test isn't set @@ -138,7 +148,7 @@ src_prepare() { -i Configure || die fi - # The config script does stupid stuff to prompt the user. Kill it. + # 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" @@ -146,24 +156,28 @@ src_prepare() { } multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 + # 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}" ; } - echoit() { echo "$@" ; "$@" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" + einfo "Using configuration: ${sslout:-(openssl knows best)}" local config="Configure" [[ -z ${sslout} ]] && config="config" + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features local myeconfargs=( ${sslout} + $(use cpu_flags_x86_sse2 || echo "no-sse2") enable-camellia enable-ec @@ -179,19 +193,21 @@ multilib_src_configure() { $(use_ssl ktls) $(use_ssl rfc3779) $(use_ssl sctp) + $(use test || echo "no-tests") $(use_ssl tls-compression zlib) $(use_ssl weak-ssl-ciphers) + --prefix="${EPREFIX}"/usr --openssldir="${EPREFIX}"${SSL_CNF_DIR} --libdir=$(get_libdir) + shared threads ) - CFLAGS= LDFLAGS= echoit \ + CFLAGS= LDFLAGS= edo \ ./${config} \ - "${myeconfargs[@]}" \ - || die + "${myeconfargs[@]}" # Clean out hardcoded flags that openssl uses local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ @@ -219,24 +235,24 @@ 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 + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test } multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]] ; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi + # 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 + # 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. @@ -252,7 +268,7 @@ multilib_src_install_all() { dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - # create the certs directory + # Create the certs directory keepdir ${SSL_CNF_DIR}/certs # Namespace openssl programs to prevent conflicts with other man pages @@ -267,15 +283,16 @@ multilib_src_install_all() { mv ${d}/{,ssl-}${m} || die - # fix up references to renamed man pages + # 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} || die - # locate any symlinks that point to this man page ... - # we assume that any broken links are due to the above renaming + # 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} @@ -283,7 +300,8 @@ multilib_src_install_all() { done [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - dodir /etc/sandbox.d #254521 + # bug #254521 + dodir /etc/sandbox.d echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl diropts -m0700 @@ -291,7 +309,7 @@ multilib_src_install_all() { } pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null eend $? } |