mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
Merge pull request #1572 from flatcar-linux/tormath1/openssl
dev-libs/openssl: sync with the upstream
This commit is contained in:
Mathieu Tortuyaux
GitHub
commit
746b47fc24
1
sdk_container/src/third_party/coreos-overlay/changelog/security/2022-01-17-openssl301.md
vendored
Normal file
1
sdk_container/src/third_party/coreos-overlay/changelog/security/2022-01-17-openssl301.md
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
- openssl ([CVE-2021-4044](https://nvd.nist.gov/vuln/detail/CVE-2021-4044))
|
||||||
1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-17-openssl301.md
vendored
Normal file
1
sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-01-17-openssl301.md
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
- openssl ([3.0.1](https://www.openssl.org/news/changelog.html#openssl-30))
|
||||||
@ -1,7 +1 @@
|
|||||||
DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
|
DIST openssl-3.0.1.tar.gz 15011207 BLAKE2B ea1e560cbebbd3fdb560cbd7db518db2f95d1b7a8397435483829eda815e9f74a175693949c3d013205c43c936d703755ca14afba29077570361fca75164a719 SHA512 4eb29386a6c2c47bebc668e68b61872eed1d136e5620d6f8971393ae7dd8d0f640257278735c76adc0c9569a315fdb929c175a2931d52d3fcc4c527ad6a975ce
|
||||||
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.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
|
|
||||||
DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
|
|
||||||
DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
|
|
||||||
DIST openssl-3.0.0.tar.gz 14978663 BLAKE2B 64721ee958fc47d57a479dffff91be5692d80d10a6727d804f8a9da66fcaea799b67fda8987f9ecdfb2777ec42033c5e8a6a135e30784d6422eb3c65e676abe6 SHA512 1fdf769ef69631eb802671a9e0bb3a01883d58282f651986212983c2d7c9d3499dabe99a6dee0411e997e6fcfa6f682b121b7698596de0d6c78850c2200241b1
|
|
||||||
|
|||||||
@ -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;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
-}
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -1,310 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit flag-o-matic toolchain-funcs multilib-minimal
|
|
||||||
|
|
||||||
# openssl-1.0.2-patches-1.6 contain additional CVE patches
|
|
||||||
# which got fixed with this release.
|
|
||||||
# Please use 1.7 version number when rolling a new tarball!
|
|
||||||
PATCH_SET="openssl-1.0.2-patches-1.5"
|
|
||||||
|
|
||||||
MY_P=${P/_/-}
|
|
||||||
|
|
||||||
# This patch set is based on the following files from Fedora 25,
|
|
||||||
# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
|
|
||||||
# for more details:
|
|
||||||
# - hobble-openssl (SOURCE1)
|
|
||||||
# - ec_curve.c (SOURCE12) -- MODIFIED
|
|
||||||
# - ectest.c (SOURCE13)
|
|
||||||
# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
|
|
||||||
BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
|
|
||||||
|
|
||||||
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
|
|
||||||
bindist? (
|
|
||||||
mirror://gentoo/${BINDIST_PATCH_SET}
|
|
||||||
https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
|
|
||||||
)
|
|
||||||
!vanilla? (
|
|
||||||
mirror://gentoo/${PATCH_SET}.tar.xz
|
|
||||||
https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
|
|
||||||
https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
|
|
||||||
https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
|
|
||||||
)"
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
|
|
||||||
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test tls-compression +tls-heartbeat vanilla"
|
|
||||||
RESTRICT="!bindist? ( bindist )
|
|
||||||
!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND=">=app-misc/c_rehash-1.7-r1
|
|
||||||
gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
|
|
||||||
kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
|
|
||||||
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
|
|
||||||
)"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
usr/include/openssl/opensslconf.h
|
|
||||||
)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if use bindist; then
|
|
||||||
mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
|
|
||||||
bash "${WORKDIR}"/hobble-openssl || die
|
|
||||||
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
|
|
||||||
|
|
||||||
eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
|
|
||||||
|
|
||||||
# Also see the configure parts below:
|
|
||||||
# enable-ec \
|
|
||||||
# $(use_ssl !bindist ec2m) \
|
|
||||||
# $(use_ssl !bindist srp) \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
eapply "${WORKDIR}"/patch/*.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
eapply_user
|
|
||||||
|
|
||||||
# disable fips in the build
|
|
||||||
# make sure the man pages are suffixed #302165
|
|
||||||
# don't bother building man pages if they're disabled
|
|
||||||
sed -i \
|
|
||||||
-e '/DIRS/s: fips : :g' \
|
|
||||||
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
|
||||||
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
|
||||||
-e $(has noman FEATURES \
|
|
||||||
&& echo '/^install:/s:install_docs::' \
|
|
||||||
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
|
|
||||||
Makefile.org \
|
|
||||||
|| die
|
|
||||||
# show the actual commands in the log
|
|
||||||
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
|
|
||||||
|
|
||||||
# since we're forcing $(CC) as makedep anyway, just fix
|
|
||||||
# the conditional as always-on
|
|
||||||
# helps clang (#417795), and versioned gcc (#499818)
|
|
||||||
# this breaks build with 1.0.2p, not sure if it is needed anymore
|
|
||||||
#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || 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 (#417795 again)
|
|
||||||
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
|
|
||||||
|
|
||||||
# allow openssl to be cross-compiled
|
|
||||||
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
|
|
||||||
chmod a+rx gentoo.config || die
|
|
||||||
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
|
|
||||||
|
|
||||||
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
|
|
||||||
# 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() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR RANLIB RC
|
|
||||||
|
|
||||||
# Clean out patent-or-otherwise-encumbered code
|
|
||||||
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)
|
|
||||||
# IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
|
||||||
# EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
|
||||||
# MDC2: Expired https://en.wikipedia.org/wiki/MDC-2
|
|
||||||
# RC5: Expired https://en.wikipedia.org/wiki/RC5
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
|
||||||
# friendly and can use the nicely optimized code paths. #460790
|
|
||||||
local ec_nistp_64_gcc_128
|
|
||||||
# Disable it for now though #469976
|
|
||||||
#if ! use bindist ; then
|
|
||||||
# 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
|
|
||||||
#fi
|
|
||||||
|
|
||||||
# https://github.com/openssl/openssl/issues/2286
|
|
||||||
if use ia64 ; then
|
|
||||||
replace-flags -g3 -g2
|
|
||||||
replace-flags -ggdb3 -ggdb2
|
|
||||||
fi
|
|
||||||
|
|
||||||
local sslout=$(./gentoo.config)
|
|
||||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
|
||||||
local config="Configure"
|
|
||||||
[[ -z ${sslout} ]] && config="config"
|
|
||||||
|
|
||||||
# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
|
|
||||||
# Make sure user flags don't get added *yet* to avoid duplicated
|
|
||||||
# flags.
|
|
||||||
CFLAGS= LDFLAGS= echoit \
|
|
||||||
./${config} \
|
|
||||||
${sslout} \
|
|
||||||
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
|
|
||||||
enable-camellia \
|
|
||||||
enable-ec \
|
|
||||||
$(use_ssl !bindist ec2m) \
|
|
||||||
$(use_ssl !bindist srp) \
|
|
||||||
${ec_nistp_64_gcc_128} \
|
|
||||||
enable-idea \
|
|
||||||
enable-mdc2 \
|
|
||||||
enable-rc5 \
|
|
||||||
enable-tlsext \
|
|
||||||
$(use_ssl asm) \
|
|
||||||
$(use_ssl gmp gmp -lgmp) \
|
|
||||||
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
|
|
||||||
$(use_ssl rfc3779) \
|
|
||||||
$(use_ssl sctp) \
|
|
||||||
$(use_ssl sslv2 ssl2) \
|
|
||||||
$(use_ssl sslv3 ssl3) \
|
|
||||||
$(use_ssl tls-compression zlib) \
|
|
||||||
$(use_ssl tls-heartbeat heartbeats) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# Clean out hardcoded flags that openssl uses
|
|
||||||
local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
|
|
||||||
-e 's:^CFLAG=::' \
|
|
||||||
-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 "/^CFLAG/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 V=1 depend
|
|
||||||
emake all
|
|
||||||
# rehash is needed to prep the certs/ dir; do this
|
|
||||||
# separately to avoid parallel build issues.
|
|
||||||
emake rehash
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
emake -j1 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
|
|
||||||
|
|
||||||
emake INSTALL_PREFIX="${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
|
|
||||||
|
|
||||||
local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
|
|
||||||
einstalldocs
|
|
||||||
|
|
||||||
use rfc3779 && dodoc engines/ccgost/README.gost
|
|
||||||
|
|
||||||
# create the certs directory
|
|
||||||
dodir ${SSL_CNF_DIR}/certs
|
|
||||||
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
|
|
||||||
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
|
|
||||||
|
|
||||||
# Namespace openssl programs to prevent conflicts with other man pages
|
|
||||||
cd "${ED}"/usr/share/man
|
|
||||||
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}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
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}
|
|
||||||
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 :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
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 #333069"
|
|
||||||
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,328 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit flag-o-matic toolchain-funcs multilib-minimal
|
|
||||||
|
|
||||||
MY_P=${P/_/-}
|
|
||||||
|
|
||||||
# This patch set is based on the following files from Fedora 31,
|
|
||||||
# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
|
|
||||||
# for more details:
|
|
||||||
# - hobble-openssl (SOURCE1)
|
|
||||||
# - ec_curve.c (SOURCE12) -- MODIFIED
|
|
||||||
# - ectest.c (SOURCE13)
|
|
||||||
# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
|
|
||||||
BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
|
|
||||||
|
|
||||||
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
|
|
||||||
bindist? (
|
|
||||||
mirror://gentoo/${BINDIST_PATCH_SET}
|
|
||||||
https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
|
|
||||||
)"
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0/1.1" # .so version of libssl/libcrypto
|
|
||||||
[[ "${PV}" = *_pre* ]] || \
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
|
|
||||||
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
|
|
||||||
RESTRICT="!bindist? ( bindist )
|
|
||||||
!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
|
|
||||||
sys-process/procps
|
|
||||||
)"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
|
||||||
"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
# force upgrade to prevent broken login, bug 696950
|
|
||||||
RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
usr/include/openssl/opensslconf.h
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
[[ ${MERGE_TYPE} == binary ]] && return
|
|
||||||
|
|
||||||
# must check in pkg_setup; sysctl don'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_prepare() {
|
|
||||||
# allow openssl to be cross-compiled
|
|
||||||
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
|
|
||||||
chmod a+rx gentoo.config || die
|
|
||||||
|
|
||||||
if use bindist; then
|
|
||||||
mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
|
|
||||||
bash "${WORKDIR}"/hobble-openssl || die
|
|
||||||
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
|
|
||||||
|
|
||||||
eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
|
|
||||||
|
|
||||||
local known_failing_test
|
|
||||||
for known_failing_test in \
|
|
||||||
30-test_evp_extra.t \
|
|
||||||
80-test_ssl_new.t \
|
|
||||||
; do
|
|
||||||
ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
|
|
||||||
rm test/recipes/${known_failing_test} || die
|
|
||||||
eend $?
|
|
||||||
done
|
|
||||||
|
|
||||||
# Also see the configure parts below:
|
|
||||||
# enable-ec \
|
|
||||||
# $(use_ssl !bindist ec2m) \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
|
|
||||||
[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
eapply_user #332661
|
|
||||||
|
|
||||||
if use test && use sctp && has network-sandbox ${FEATURES}; then
|
|
||||||
ebegin "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
|
|
||||||
eend $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# make sure the man pages are suffixed #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 (#417795 again)
|
|
||||||
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
|
|
||||||
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
|
|
||||||
|
|
||||||
# Prefixify Configure shebang (#141906)
|
|
||||||
sed \
|
|
||||||
-e "1s,/usr/bin/env,${EPREFIX}&," \
|
|
||||||
-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
|
|
||||||
# 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() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR RANLIB RC
|
|
||||||
|
|
||||||
# Clean out patent-or-otherwise-encumbered code
|
|
||||||
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)
|
|
||||||
# IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
|
||||||
# EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
|
||||||
# MDC2: Expired https://en.wikipedia.org/wiki/MDC-2
|
|
||||||
# RC5: Expired https://en.wikipedia.org/wiki/RC5
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
|
||||||
# friendly and can use the nicely optimized code paths. #460790
|
|
||||||
local ec_nistp_64_gcc_128
|
|
||||||
# Disable it for now though #469976
|
|
||||||
#if ! use bindist ; then
|
|
||||||
# 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
|
|
||||||
#fi
|
|
||||||
|
|
||||||
local sslout=$(./gentoo.config)
|
|
||||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
|
||||||
local config="Configure"
|
|
||||||
[[ -z ${sslout} ]] && config="config"
|
|
||||||
|
|
||||||
# Fedora hobbled-EC needs 'no-ec2m'
|
|
||||||
# 'srp' was restricted until early 2017 as well.
|
|
||||||
# "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.
|
|
||||||
CFLAGS= LDFLAGS= echoit \
|
|
||||||
./${config} \
|
|
||||||
${sslout} \
|
|
||||||
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
|
|
||||||
enable-camellia \
|
|
||||||
enable-ec \
|
|
||||||
$(use_ssl !bindist ec2m) \
|
|
||||||
$(use_ssl !bindist 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_ssl tls-compression zlib) \
|
|
||||||
$(use_ssl tls-heartbeat heartbeats) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# 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 #665130
|
|
||||||
if [[ ! -d "${ED}/usr" ]]; then
|
|
||||||
# We can only create this directory once
|
|
||||||
mkdir "${ED}"/usr || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
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}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
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 :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
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 #333069"
|
|
||||||
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,279 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit flag-o-matic toolchain-funcs multilib-minimal
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0/1.1" # .so version of libssl/libcrypto
|
|
||||||
[[ "${PV}" = *_pre* ]] || \
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
|
|
||||||
IUSE="+asm elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
|
|
||||||
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
|
|
||||||
sys-process/procps
|
|
||||||
)"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
|
||||||
"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
# force upgrade to prevent broken login, bug 696950
|
|
||||||
RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
usr/include/openssl/opensslconf.h
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
[[ ${MERGE_TYPE} == binary ]] && return
|
|
||||||
|
|
||||||
# must check in pkg_setup; sysctl don'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_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
|
|
||||||
if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
|
|
||||||
[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
eapply_user #332661
|
|
||||||
|
|
||||||
if use test && use sctp && has network-sandbox ${FEATURES}; then
|
|
||||||
ebegin "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
|
|
||||||
eend $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# make sure the man pages are suffixed #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 (#417795 again)
|
|
||||||
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
|
|
||||||
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
|
|
||||||
|
|
||||||
# Prefixify Configure shebang (#141906)
|
|
||||||
sed \
|
|
||||||
-e "1s,/usr/bin/env,${EPREFIX}&," \
|
|
||||||
-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
|
|
||||||
# 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() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR 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")
|
|
||||||
|
|
||||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
|
||||||
# friendly and can use the nicely optimized code paths. #460790
|
|
||||||
local ec_nistp_64_gcc_128
|
|
||||||
# Disable it for now though #469976
|
|
||||||
# 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.
|
|
||||||
CFLAGS= LDFLAGS= echoit \
|
|
||||||
./${config} \
|
|
||||||
${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_ssl tls-compression zlib) \
|
|
||||||
$(use_ssl tls-heartbeat heartbeats) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# 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 #665130
|
|
||||||
if [[ ! -d "${ED}/usr" ]]; then
|
|
||||||
# We can only create this directory once
|
|
||||||
mkdir "${ED}"/usr || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
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}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
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 :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
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 #333069"
|
|
||||||
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,328 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit flag-o-matic toolchain-funcs multilib-minimal
|
|
||||||
|
|
||||||
MY_P=${P/_/-}
|
|
||||||
|
|
||||||
# This patch set is based on the following files from Fedora 31,
|
|
||||||
# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
|
|
||||||
# for more details:
|
|
||||||
# - hobble-openssl (SOURCE1)
|
|
||||||
# - ec_curve.c (SOURCE12) -- MODIFIED
|
|
||||||
# - ectest.c (SOURCE13)
|
|
||||||
# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
|
|
||||||
BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
|
|
||||||
|
|
||||||
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
|
|
||||||
bindist? (
|
|
||||||
mirror://gentoo/${BINDIST_PATCH_SET}
|
|
||||||
https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
|
|
||||||
)"
|
|
||||||
|
|
||||||
LICENSE="openssl"
|
|
||||||
SLOT="0/1.1" # .so version of libssl/libcrypto
|
|
||||||
[[ "${PV}" = *_pre* ]] || \
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
|
|
||||||
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
|
|
||||||
RESTRICT="!bindist? ( bindist )
|
|
||||||
!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
|
|
||||||
sys-process/procps
|
|
||||||
)"
|
|
||||||
PDEPEND="app-misc/ca-certificates"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
|
||||||
"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
# force upgrade to prevent broken login, bug 696950
|
|
||||||
RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
|
|
||||||
|
|
||||||
MULTILIB_WRAPPED_HEADERS=(
|
|
||||||
usr/include/openssl/opensslconf.h
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
[[ ${MERGE_TYPE} == binary ]] && return
|
|
||||||
|
|
||||||
# must check in pkg_setup; sysctl don'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_prepare() {
|
|
||||||
# allow openssl to be cross-compiled
|
|
||||||
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
|
|
||||||
chmod a+rx gentoo.config || die
|
|
||||||
|
|
||||||
if use bindist; then
|
|
||||||
mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
|
|
||||||
bash "${WORKDIR}"/hobble-openssl || die
|
|
||||||
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
|
|
||||||
cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
|
|
||||||
|
|
||||||
eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
|
|
||||||
|
|
||||||
local known_failing_test
|
|
||||||
for known_failing_test in \
|
|
||||||
30-test_evp_extra.t \
|
|
||||||
80-test_ssl_new.t \
|
|
||||||
; do
|
|
||||||
ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
|
|
||||||
rm test/recipes/${known_failing_test} || die
|
|
||||||
eend $?
|
|
||||||
done
|
|
||||||
|
|
||||||
# Also see the configure parts below:
|
|
||||||
# enable-ec \
|
|
||||||
# $(use_ssl !bindist ec2m) \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
|
|
||||||
[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
eapply_user #332661
|
|
||||||
|
|
||||||
if use test && use sctp && has network-sandbox ${FEATURES}; then
|
|
||||||
ebegin "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
|
|
||||||
eend $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# make sure the man pages are suffixed #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 (#417795 again)
|
|
||||||
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
|
|
||||||
|
|
||||||
append-flags -fno-strict-aliasing
|
|
||||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
|
||||||
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
|
|
||||||
|
|
||||||
# Prefixify Configure shebang (#141906)
|
|
||||||
sed \
|
|
||||||
-e "1s,/usr/bin/env,${EPREFIX}&," \
|
|
||||||
-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
|
|
||||||
# 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() {
|
|
||||||
unset APPS #197996
|
|
||||||
unset SCRIPTS #312551
|
|
||||||
unset CROSS_COMPILE #311473
|
|
||||||
|
|
||||||
tc-export CC AR RANLIB RC
|
|
||||||
|
|
||||||
# Clean out patent-or-otherwise-encumbered code
|
|
||||||
# Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)
|
|
||||||
# IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
|
||||||
# EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
|
||||||
# MDC2: Expired https://en.wikipedia.org/wiki/MDC-2
|
|
||||||
# RC5: Expired https://en.wikipedia.org/wiki/RC5
|
|
||||||
|
|
||||||
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")
|
|
||||||
|
|
||||||
# See if our toolchain supports __uint128_t. If so, it's 64bit
|
|
||||||
# friendly and can use the nicely optimized code paths. #460790
|
|
||||||
local ec_nistp_64_gcc_128
|
|
||||||
# Disable it for now though #469976
|
|
||||||
#if ! use bindist ; then
|
|
||||||
# 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
|
|
||||||
#fi
|
|
||||||
|
|
||||||
local sslout=$(./gentoo.config)
|
|
||||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
|
||||||
local config="Configure"
|
|
||||||
[[ -z ${sslout} ]] && config="config"
|
|
||||||
|
|
||||||
# Fedora hobbled-EC needs 'no-ec2m'
|
|
||||||
# 'srp' was restricted until early 2017 as well.
|
|
||||||
# "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.
|
|
||||||
CFLAGS= LDFLAGS= echoit \
|
|
||||||
./${config} \
|
|
||||||
${sslout} \
|
|
||||||
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
|
|
||||||
enable-camellia \
|
|
||||||
enable-ec \
|
|
||||||
$(use_ssl !bindist ec2m) \
|
|
||||||
$(use_ssl !bindist 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_ssl tls-compression zlib) \
|
|
||||||
$(use_ssl tls-heartbeat heartbeats) \
|
|
||||||
--prefix="${EPREFIX}"/usr \
|
|
||||||
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
|
|
||||||
--libdir=$(get_libdir) \
|
|
||||||
shared threads \
|
|
||||||
|| die
|
|
||||||
|
|
||||||
# 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 #665130
|
|
||||||
if [[ ! -d "${ED}/usr" ]]; then
|
|
||||||
# We can only create this directory once
|
|
||||||
mkdir "${ED}"/usr || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
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}
|
|
||||||
# fix up references to renamed man pages
|
|
||||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
|
||||||
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 :("
|
|
||||||
|
|
||||||
dodir /etc/sandbox.d #254521
|
|
||||||
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 #333069"
|
|
||||||
c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
# Copyright 1999-2022 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI="7"
|
EAPI="7"
|
||||||
@ -17,13 +17,13 @@ if [[ ${PV} == "9999" ]] ; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
else
|
else
|
||||||
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
|
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
|
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
LICENSE="Apache-2.0"
|
||||||
SLOT="0/3" # .so version of libssl/libcrypto
|
SLOT="0/3" # .so version of libssl/libcrypto
|
||||||
|
|
||||||
IUSE="+asm cpu_flags_x86_sse2 elibc_musl fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
|
IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
COMMON_DEPEND="
|
COMMON_DEPEND="
|
||||||
@ -12,9 +12,6 @@
|
|||||||
=dev-lang/rust-1.57.0-r1 ~amd64 ~arm64
|
=dev-lang/rust-1.57.0-r1 ~amd64 ~arm64
|
||||||
=virtual/rust-1.57.0 ~amd64 ~arm64
|
=virtual/rust-1.57.0 ~amd64 ~arm64
|
||||||
|
|
||||||
# dev-libs/openssl-3.0.0 is still in testing phase at this point
|
|
||||||
=dev-libs/openssl-3.0.0 ~amd64 ~arm64
|
|
||||||
|
|
||||||
# no version marked stable upstream
|
# no version marked stable upstream
|
||||||
dev-util/checkbashisms
|
dev-util/checkbashisms
|
||||||
|
|
||||||
|
|||||||
@ -12,3 +12,7 @@
|
|||||||
# libxcrypt -> glibc -> python), and also we need to update gcc to
|
# libxcrypt -> glibc -> python), and also we need to update gcc to
|
||||||
# version 10 or later.
|
# version 10 or later.
|
||||||
=virtual/libcrypt-1-r1
|
=virtual/libcrypt-1-r1
|
||||||
|
|
||||||
|
# Overwrite portage-stable mask. OpenSSL-3* is building fine on Flatcar
|
||||||
|
# and Flatcar's dependencies are building fine against it.
|
||||||
|
=dev-libs/openssl-3.0*
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user