mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-05 17:32:09 +01:00
Cleanup files from build bot commit
The upstream patches were applied with a conflict. These extra files were not deleted when resolving.
This commit is contained in:
Kai Lüke
parent
42bf4024bb
commit
17e2dbc8c3
@ -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,19 +0,0 @@
|
||||
Test fuzz was forgotten when
|
||||
|
||||
Perl: Use our own globbing wrapper rather than File::Glob::glob
|
||||
|
||||
was backported to openssl-1.1.0 branch.
|
||||
|
||||
Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7
|
||||
|
||||
--- a/test/recipes/90-test_fuzz.t
|
||||
+++ b/test/recipes/90-test_fuzz.t
|
||||
@@ -9,7 +9,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use if $^O ne "VMS", 'File::Glob' => qw/glob/;
|
||||
+use OpenSSL::Glob;
|
||||
use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
use OpenSSL::Test::Utils;
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001
|
||||
From: Nicola Tuveri <nic.tuv@gmail.com>
|
||||
Date: Thu, 12 Sep 2019 01:57:47 +0300
|
||||
Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0)
|
||||
|
||||
I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and
|
||||
inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this
|
||||
fixes it.
|
||||
---
|
||||
crypto/ec/ec_curve.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
|
||||
index 2d28d7f70bb..6a58b3a23e0 100644
|
||||
--- a/crypto/ec/ec_curve.c
|
||||
+++ b/crypto/ec/ec_curve.c
|
||||
@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group,
|
||||
|
||||
#ifndef OPENSSL_NO_EC2M
|
||||
if (field_nid == NID_X9_62_characteristic_two_field) {
|
||||
- return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
|
||||
+ return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
|
||||
} else
|
||||
#endif /* !def(OPENSSL_NO_EC2M) */
|
||||
if (field_nid == NID_X9_62_prime_field) {
|
||||
- return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
|
||||
+ return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
|
||||
} else {
|
||||
/* this should never happen */
|
||||
return 0;
|
||||
@ -1,107 +0,0 @@
|
||||
From 515c728dbaa92211d2eafb0041ab9fcd258fdc41 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
|
||||
Date: Mon, 9 Sep 2019 19:12:25 +0200
|
||||
Subject: [PATCH] Fix potential memory leaks with BN_to_ASN1_INTEGER
|
||||
|
||||
Reviewed-by: Paul Dale <paul.dale@oracle.com>
|
||||
Reviewed-by: Matt Caswell <matt@openssl.org>
|
||||
(Merged from https://github.com/openssl/openssl/pull/9833)
|
||||
|
||||
(cherry picked from commit f28bc7d386b25fb75625d0c62c6b2e6d21de0d09)
|
||||
---
|
||||
crypto/ec/ec_asn1.c | 7 +++++--
|
||||
crypto/x509v3/v3_asid.c | 26 ++++++++++++++++++++------
|
||||
2 files changed, 25 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
|
||||
index 1ce1181fc10..7cbf8de9813 100644
|
||||
--- a/crypto/ec/ec_asn1.c
|
||||
+++ b/crypto/ec/ec_asn1.c
|
||||
@@ -446,6 +446,7 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
|
||||
unsigned char *buffer = NULL;
|
||||
const EC_POINT *point = NULL;
|
||||
point_conversion_form_t form;
|
||||
+ ASN1_INTEGER *orig;
|
||||
|
||||
if (params == NULL) {
|
||||
if ((ret = ECPARAMETERS_new()) == NULL) {
|
||||
@@ -496,8 +497,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
|
||||
ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
|
||||
goto err;
|
||||
}
|
||||
- ret->order = BN_to_ASN1_INTEGER(tmp, ret->order);
|
||||
+ ret->order = BN_to_ASN1_INTEGER(tmp, orig = ret->order);
|
||||
if (ret->order == NULL) {
|
||||
+ ret->order = orig;
|
||||
ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
|
||||
goto err;
|
||||
}
|
||||
@@ -505,8 +507,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
|
||||
/* set the cofactor (optional) */
|
||||
tmp = EC_GROUP_get0_cofactor(group);
|
||||
if (tmp != NULL) {
|
||||
- ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor);
|
||||
+ ret->cofactor = BN_to_ASN1_INTEGER(tmp, orig = ret->cofactor);
|
||||
if (ret->cofactor == NULL) {
|
||||
+ ret->cofactor = orig;
|
||||
ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
|
||||
goto err;
|
||||
}
|
||||
diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
|
||||
index 089f2ae29f0..ef2d64826fb 100644
|
||||
--- a/crypto/x509v3/v3_asid.c
|
||||
+++ b/crypto/x509v3/v3_asid.c
|
||||
@@ -256,6 +256,7 @@ static int extract_min_max(ASIdOrRange *aor,
|
||||
static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
|
||||
{
|
||||
ASN1_INTEGER *a_max_plus_one = NULL;
|
||||
+ ASN1_INTEGER *orig;
|
||||
BIGNUM *bn = NULL;
|
||||
int i, ret = 0;
|
||||
|
||||
@@ -298,9 +299,15 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
|
||||
*/
|
||||
if ((bn == NULL && (bn = BN_new()) == NULL) ||
|
||||
ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
|
||||
- !BN_add_word(bn, 1) ||
|
||||
- (a_max_plus_one =
|
||||
- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
|
||||
+ !BN_add_word(bn, 1)) {
|
||||
+ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
|
||||
+ ERR_R_MALLOC_FAILURE);
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ if ((a_max_plus_one =
|
||||
+ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
|
||||
+ a_max_plus_one = orig;
|
||||
X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto done;
|
||||
@@ -351,6 +358,7 @@ int X509v3_asid_is_canonical(ASIdentifiers *asid)
|
||||
static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
|
||||
{
|
||||
ASN1_INTEGER *a_max_plus_one = NULL;
|
||||
+ ASN1_INTEGER *orig;
|
||||
BIGNUM *bn = NULL;
|
||||
int i, ret = 0;
|
||||
|
||||
@@ -416,9 +424,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
|
||||
*/
|
||||
if ((bn == NULL && (bn = BN_new()) == NULL) ||
|
||||
ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
|
||||
- !BN_add_word(bn, 1) ||
|
||||
- (a_max_plus_one =
|
||||
- BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
|
||||
+ !BN_add_word(bn, 1)) {
|
||||
+ X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
|
||||
+ ERR_R_MALLOC_FAILURE);
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ if ((a_max_plus_one =
|
||||
+ BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
|
||||
+ a_max_plus_one = orig;
|
||||
X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
|
||||
ERR_R_MALLOC_FAILURE);
|
||||
goto done;
|
||||
@ -1,52 +0,0 @@
|
||||
From 86ed78676c660b553696cc10c682962522dfeb6c Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Mraz <tmraz@fedoraproject.org>
|
||||
Date: Thu, 12 Sep 2019 12:27:36 +0200
|
||||
Subject: [PATCH] BIO_f_zlib: Properly handle BIO_CTRL_PENDING and
|
||||
BIO_CTRL_WPENDING calls.
|
||||
|
||||
There can be data to write in output buffer and data to read that were
|
||||
not yet read in the input stream.
|
||||
|
||||
Fixes #9866
|
||||
|
||||
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
||||
(Merged from https://github.com/openssl/openssl/pull/9877)
|
||||
|
||||
(cherry picked from commit 6beb8b39ba8e4cb005c1fcd2586ba19e17f04b95)
|
||||
---
|
||||
crypto/comp/c_zlib.c | 22 ++++++++++++++++++++++
|
||||
1 file changed, 22 insertions(+)
|
||||
|
||||
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
|
||||
index d688deee5f2..7c1be358fd7 100644
|
||||
--- a/crypto/comp/c_zlib.c
|
||||
+++ b/crypto/comp/c_zlib.c
|
||||
@@ -598,6 +598,28 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
BIO_copy_next_retry(b);
|
||||
break;
|
||||
|
||||
+ case BIO_CTRL_WPENDING:
|
||||
+ if (ctx->obuf == NULL)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (ctx->odone) {
|
||||
+ ret = ctx->ocount;
|
||||
+ } else {
|
||||
+ ret = ctx->ocount;
|
||||
+ if (ret == 0)
|
||||
+ /* Unknown amount pending but we are not finished */
|
||||
+ ret = 1;
|
||||
+ }
|
||||
+ if (ret == 0)
|
||||
+ ret = BIO_ctrl(next, cmd, num, ptr);
|
||||
+ break;
|
||||
+
|
||||
+ case BIO_CTRL_PENDING:
|
||||
+ ret = ctx->zin.avail_in;
|
||||
+ if (ret == 0)
|
||||
+ ret = BIO_ctrl(next, cmd, num, ptr);
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
ret = BIO_ctrl(next, cmd, num, ptr);
|
||||
break;
|
||||
@ -1,305 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit flag-o-matic toolchain-funcs multilib multilib-minimal
|
||||
|
||||
MY_P=${P/_/-}
|
||||
|
||||
# This patch set is based on the following files from Fedora 28,
|
||||
# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec
|
||||
# for more details:
|
||||
# - hobble-openssl (SOURCE1)
|
||||
# - ec_curve.c (SOURCE12) -- MODIFIED
|
||||
# - ectest.c (SOURCE13)
|
||||
# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED
|
||||
BINDIST_PATCH_SET="openssl-1.1.0l-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
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
|
||||
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
|
||||
RESTRICT="!bindist? ( bindist )"
|
||||
|
||||
RDEPEND=">=app-misc/c_rehash-1.7-r1
|
||||
zlib? ( >=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"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
|
||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
||||
"${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
|
||||
)
|
||||
|
||||
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}"/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
|
||||
|
||||
use bindist || eapply "${FILESDIR}"/${PN}-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
|
||||
fi
|
||||
|
||||
eapply_user #332661
|
||||
|
||||
# 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
|
||||
|
||||
# show the actual commands in the log
|
||||
sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || 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
|
||||
|
||||
# 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) \
|
||||
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-heartbeat heartbeats) \
|
||||
$(use_ssl zlib) \
|
||||
--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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# 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.
|
||||
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
|
||||
|
||||
# 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,330 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit flag-o-matic toolchain-funcs multilib 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.1d-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 sh sparc x86 ~x86-linux"
|
||||
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
|
||||
RESTRICT="!bindist? ( bindist )"
|
||||
|
||||
RDEPEND=">=app-misc/c_rehash-1.7-r1
|
||||
zlib? ( >=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"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
|
||||
"${FILESDIR}"/${P}-fix-zlib.patch
|
||||
"${FILESDIR}"/${P}-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.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 has test ${FEATURES}; then
|
||||
if 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
|
||||
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 has test ${FEATURES}; then
|
||||
if use sctp; then
|
||||
if 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
|
||||
fi
|
||||
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) \
|
||||
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-heartbeat heartbeats) \
|
||||
$(use_ssl zlib) \
|
||||
--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
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# 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.
|
||||
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
|
||||
|
||||
# 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 $?
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user