Skip to content

Commit 19323ec

Browse files
tormath1tormath1
committed
dev-libs/openssl: sync with Gentoo
Commit-Ref: gentoo/gentoo@33c809f Signed-off-by: Mathieu Tortuyaux <[email protected]>
1 parent f028bad commit 19323ec

27 files changed

+4293
-33
lines changed

‎sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/Manifest

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1-
DIST openssl-3.2.1.tar.gz 17733249 BLAKE2B 960222e0305166160e5ab000e29650b92063bf726551ee9ad46060166d99738d1e3a5b86fd28b14c8f4fb3a72f5aa70850defb87c02990acff3dbcbdac40b347 SHA512 bab2b2419319f1feffaba4692f03edbf13b44d1090c6e075a2d69dad67a2d51e64e6edbf83456a26c83900a726d20d2c4ee4ead9c94b322fd0b536f3b5a863c4
2-
DIST openssl-3.2.1.tar.gz.asc 833 BLAKE2B a1d25fe30bf1804d13a8b6b98edf56be5bf744d9e2706f4169455c24efe2e3a361487d00d0d4bac240c3f0170693d77a39dd0d4ee5c792d2247aa00c47e74ebf SHA512 de39516c7b77612f33cdc830a8d13ef6bcd91c03d24a6ed105480f140f9e1ad7049844e234c96a516d62e0e33ce90442ffd0f309ea674884c735f04d8562f372
1+
DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
2+
DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
3+
DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
4+
DIST openssl-1.1.1w.tar.gz 9893384 BLAKE2B 2fdba6ca0188928ab2f74e606136afca66cfa0467170fa6298ef160b64ac6fdcad1e81e5dd14013ce0e9921d0f7417edec531cd0beaf1196fec704c2c6d48395 SHA512 b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d
5+
DIST openssl-1.1.1w.tar.gz.asc 833 BLAKE2B d990be69ed913509d52b78e7473668429d4485adb29ef03e4612dd0cadbac4f04c7289d8e5baf6f397bcedeaac9f802f18fc719964d882ae0514ed1ca16ae277 SHA512 0f3d7aa48b1cabf8dd43e8108aeed10a4dffb4f5a244d4da9c86ea358b0c8b90c46da561d21e01c567c2f5035d824ed82ec104aad1776b7f33a1be85990e98ef
6+
DIST openssl-3.0.13.tar.gz 15294843 BLAKE2B 869aa5f70a8c1d0cac6027e9261530df70ab5a8b448c785f5f8ff3f206e742c5364424132d0e109a6449af9b4082c4c179c7103dccb16a4539f776ca834c8ccc SHA512 22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9
7+
DIST openssl-3.0.13.tar.gz.asc 833 BLAKE2B 519515b6faa505d68ff9acc30db9515fac494145086fa5ad9561c39385a6fabb39ad9de10fedd49c8fc716ec59ea1b13ec5e6b466e549ea9f29b8d0bb74ba7b3 SHA512 c52d97c93d16f3ca2a7026fb25890482b6d86c37b5ab686c56b0e08522743ec4ea3f84afa4deb64b0df0d9a16b557430c4d4139ab42ffcf97d769b61d1e6197c
8+
DIST openssl-3.0.14.tar.gz 15305497 BLAKE2B 7426aea63d5495775c4a0440658cc9c46c4aa31c31473cd5519c2b1ca158e122634e0bbc275237d3eb124fc8bed3d58808d8ac1d228f24f7281d2630ff7813e0 SHA512 1c59c01e60da902a20780d71f1fa5055d4037f38c4bc3fb27ed5b91f211b36a6018055409441ad4df58b5e9232b2528240d02067272c3c9ccb8c221449ca9ac0
9+
DIST openssl-3.0.14.tar.gz.asc 833 BLAKE2B 8a700452f6f698fbfa206469888fd72706f1798be212e712fd8a4c1ae87f0d98d54820974c64a3db3b5ac69d7beda665f462e83182337391212c0e72e1feb72e SHA512 003d17a2b71176517f5bfba6699c18b271111e5fec3effc275b965286140d1281fa6f5f5e6bcf63feca89dfa035ab776bda8d2af4b71ae921ca9e7a936581fb4
10+
DIST openssl-3.0.15.tar.gz 15318633 BLAKE2B f2900d0894b97e86c709079ca4336d5dc508d69e91d3a4de4420c8d9344cb54dada6ea2cdd408166e53db0c652b06654e670701166b67a0a40578676e1cea535 SHA512 acd80f2f7924d90c1416946a5c61eff461926ad60f4821bb6b08845ea18f8452fd5e88a2c2c5bd0d7590a792cb8341a3f3be042fd0a5b6c9c1b84a497c347bbf
11+
DIST openssl-3.0.15.tar.gz.asc 833 BLAKE2B 43088d6ae9e95aec8cfa08c0d338d76c2299ee89a1719a39c497b25c83a4c0c2d155fa00a62b47e15a7f2889680197741390c850d62a84ec5ce27ed1bbddcd28 SHA512 8b9471074130fd26b511820a1c2586792fd0105421515734c213ae18de27b5b026261e64d4cb8f5e7b568d1f4193484ebe0e99eda9d99df72474310a568ca3bf
12+
DIST openssl-3.1.7.tar.gz 15684836 BLAKE2B 1332f4b2454b6c9bf3ff2099aa343d6202bec98c6e44fba6377d5bb8efd9bf337df3a95549d874a2908f376056f6f333e6f65cbec7e27377d1ab8cbefddaa241 SHA512 bb4743c1a95148901d2d2bc51460c14cea3387c7dda9323524adbdb11334562f72aa3a873913c51ea1ffce606e675e22a74f78b3119b6a956da3f75c942cd0e2
13+
DIST openssl-3.1.7.tar.gz.asc 833 BLAKE2B 17220aa3274a5eda3df8c04f60f87a48fcf5c773167e746bf3f9feb6cc3c03b024a2e83b1c93122b6baa073b12417e2910230f270287be7b7f2c5300814b7fda SHA512 89b6f4b913aac8b2519aac586ba0c70a3df331eb70ea79c2aa45355bfd9430ba1af3c8ea0d31b171f55036a8cc332207787cabf58da871f400d666a5ae09ce2a
14+
DIST openssl-3.2.3.tar.gz 17762604 BLAKE2B 1445336aa92d0fd9df266ad570fe2bf5701279e462dd3fccd4cf662f328bfee923dc6c72c42c1921fd38bce43e1c60cacdec3f1c2963fe0ffda6a0e8e34ac6e4 SHA512 9e9f06ab630914e32e64bfb945dfa375ea3595b3db4eb8ef68288a58909baf753b34998439907c22ff2b8561cfd3f3f6b7fbf22981479e66a98c2e92fda172a2
15+
DIST openssl-3.2.3.tar.gz.asc 833 BLAKE2B 5a7289ed40534a058b9eb7686ce444b9d453a2973ab7ebda01c99f7245f6ba19197123f8bb3b16940d4bfbc5e313babc0249f280e55911190b47da3a47ed1e6a SHA512 e727adb88f84c48082ef0cae963bf999cce11619f7322014cc7f36c16e8375a60542f518c1b86319208cf8da33044e942b3d65208bc59fd4a5f522ab78ff1c23
16+
DIST openssl-3.3.2.tar.gz 18076531 BLAKE2B cc53d45418673bc2a406d6697b8bd17ff6c726463c4ccc87bb2fa5a6592d0d178dc8cfeb2fbb980ea354a5dc2c86f31c48453427c6937896c7221273e623c9b5 SHA512 5ae47bf1aed2740a33ba5df7dc7345a6738aa6bfa3c9c4de5e51742485e24b25192988d7a2c1b8201ef70056ad8abd0ca78b3d55abe24c0b0373d83b47ed9b74
17+
DIST openssl-3.3.2.tar.gz.asc 833 BLAKE2B c318e2dcef085b83ced77048dc136d9bc8438d49a7985f3c6ebd4ffd0e5e290ece47e8fd1074c6cc056e87b2bae2101dd58b8d70dbc0eb99aa134d776125439c SHA512 981f8438bbd541b97e745aca1bb77cde68900ce4b5ffefc9eccc2f18c675292203f6b4c7bffefde2256a442b7310d8438279b52fb21aac65921e9a529bc00067

‎sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.2

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env bash
2+
# Copyright 1999-2020 Gentoo Authors
3+
# Distributed under the terms of the GNU General Public License v2
4+
#
5+
# Openssl doesn't play along nicely with cross-compiling
6+
# like autotools based projects, so let's teach it new tricks.
7+
#
8+
# Review the bundled 'config' script to see why kind of targets
9+
# we can pass to the 'Configure' script.
10+
11+
12+
# Testing routines
13+
if [[ $1 == "test" ]] ; then
14+
for c in \
15+
"arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
16+
"armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
17+
"x86_64-pc-linux-gnu |linux-x86_64" \
18+
"alpha-linux-gnu |linux-alpha-gcc" \
19+
"alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
20+
"i686-pc-linux-gnu |linux-elf" \
21+
"whatever-gentoo-freebsdX.Y |BSD-generic32" \
22+
"i686-gentoo-freebsdX.Y |BSD-x86-elf" \
23+
"sparc64-alpha-freebsdX.Y |BSD-sparc64" \
24+
"ia64-gentoo-freebsd5.99234 |BSD-ia64" \
25+
"x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
26+
"hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
27+
"powerpc-gentOO-linux-uclibc |linux-ppc" \
28+
"powerpc64-unk-linux-gnu |linux-ppc64" \
29+
"powerpc64le-linux-gnu |linux-ppc64le" \
30+
"x86_64-apple-darwinX |darwin64-x86_64-cc" \
31+
"powerpc64-apple-darwinX |darwin64-ppc-cc" \
32+
"i686-apple-darwinX |darwin-i386-cc" \
33+
"i386-apple-darwinX |darwin-i386-cc" \
34+
"powerpc-apple-darwinX |darwin-ppc-cc" \
35+
"i586-pc-winnt |winnt-parity" \
36+
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
37+
"s390x-linux-gnu |linux64-s390x" \
38+
;do
39+
CHOST=${c/|*}
40+
ret_want=${c/*|}
41+
ret_got=$(CHOST=${CHOST} "$0")
42+
43+
if [[ ${ret_want} == "${ret_got}" ]] ; then
44+
echo "PASS: ${CHOST}"
45+
else
46+
echo "FAIL: ${CHOST}"
47+
echo -e "\twanted: ${ret_want}"
48+
echo -e "\twe got: ${ret_got}"
49+
fi
50+
done
51+
exit 0
52+
fi
53+
[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
54+
55+
56+
# Detect the operating system
57+
case ${CHOST} in
58+
*-aix*) system="aix";;
59+
*-darwin*) system="darwin";;
60+
*-freebsd*) system="BSD";;
61+
*-hpux*) system="hpux";;
62+
*-linux*) system="linux";;
63+
*-solaris*) system="solaris";;
64+
*-winnt*) system="winnt";;
65+
x86_64-*-mingw*) system="mingw64";;
66+
*mingw*) system="mingw";;
67+
*) exit 0;;
68+
esac
69+
70+
71+
# Compiler munging
72+
compiler="gcc"
73+
if [[ ${CC} == "ccc" ]] ; then
74+
compiler=${CC}
75+
fi
76+
77+
78+
# Detect target arch
79+
machine=""
80+
chost_machine=${CHOST%%-*}
81+
case ${system} in
82+
linux)
83+
case ${chost_machine}:${ABI} in
84+
aarch64*be*) machine="aarch64 -DB_ENDIAN";;
85+
aarch64*) machine="aarch64 -DL_ENDIAN";;
86+
alphaev56*|\
87+
alphaev[678]*)machine=alpha+bwx-${compiler};;
88+
alpha*) machine=alpha-${compiler};;
89+
armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
90+
armv[4-9]*) machine="armv4 -DL_ENDIAN";;
91+
arm*b*) machine="generic32 -DB_ENDIAN";;
92+
arm*) machine="generic32 -DL_ENDIAN";;
93+
avr*) machine="generic32 -DL_ENDIAN";;
94+
bfin*) machine="generic32 -DL_ENDIAN";;
95+
# hppa64*) machine=parisc64;;
96+
hppa*) machine="generic32 -DB_ENDIAN";;
97+
i[0-9]86*|\
98+
x86_64*:x86) machine=elf;;
99+
ia64*) machine=ia64;;
100+
loongarch64*) machine="generic64 -DL_ENDIAN";;
101+
m68*) machine="generic32 -DB_ENDIAN";;
102+
mips*el*) machine="generic32 -DL_ENDIAN";;
103+
mips*) machine="generic32 -DB_ENDIAN";;
104+
powerpc64*le*)machine=ppc64le;;
105+
powerpc64*) machine=ppc64;;
106+
powerpc*le*) machine="generic32 -DL_ENDIAN";;
107+
powerpc*) machine=ppc;;
108+
riscv32*) machine="generic32 -DL_ENDIAN";;
109+
riscv64*) machine="generic64 -DL_ENDIAN";;
110+
# sh64*) machine=elf;;
111+
sh*b*) machine="generic32 -DB_ENDIAN";;
112+
sh*) machine="generic32 -DL_ENDIAN";;
113+
# TODO: Might want to do -mcpu probing like glibc to determine a
114+
# better default for sparc-linux-gnu targets. This logic will
115+
# break v7 and older systems when they use it.
116+
sparc*v7*) machine="generic32 -DB_ENDIAN";;
117+
sparc64*) machine=sparcv9 system=linux64;;
118+
sparc*v9*) machine=sparcv9;;
119+
sparc*v8*) machine=sparcv8;;
120+
sparc*) machine=sparcv8;;
121+
s390x*) machine=s390x system=linux64;;
122+
s390*) machine="generic32 -DB_ENDIAN";;
123+
x86_64*:x32) machine=x32;;
124+
x86_64*) machine=x86_64;;
125+
esac
126+
;;
127+
BSD)
128+
case ${chost_machine} in
129+
alpha*) machine=generic64;;
130+
i[6-9]86*) machine=x86-elf;;
131+
ia64*) machine=ia64;;
132+
sparc64*) machine=sparc64;;
133+
x86_64*) machine=x86_64;;
134+
*) machine=generic32;;
135+
esac
136+
;;
137+
aix)
138+
machine=${compiler}
139+
;;
140+
darwin)
141+
case ${chost_machine} in
142+
powerpc64) machine=ppc-cc; system=${system}64;;
143+
powerpc) machine=ppc-cc;;
144+
i?86*) machine=i386-cc;;
145+
x86_64) machine=x86_64-cc; system=${system}64;;
146+
esac
147+
;;
148+
hpux)
149+
case ${chost_machine} in
150+
ia64) machine=ia64-${compiler} ;;
151+
esac
152+
;;
153+
solaris)
154+
case ${chost_machine} in
155+
i386) machine=x86-${compiler} ;;
156+
x86_64*) machine=x86_64-${compiler}; system=${system}64;;
157+
sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
158+
sparc*) machine=sparcv8-${compiler};;
159+
esac
160+
;;
161+
winnt)
162+
machine=parity
163+
;;
164+
mingw*)
165+
# special case ... no xxx-yyy style name
166+
echo ${system}
167+
;;
168+
esac
169+
170+
171+
# If we have something, show it
172+
[[ -n ${machine} ]] && echo ${system}-${machine}

‎sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/gentoo.config-1.0.4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ if [[ $1 == "test" ]] ; then
3232
"i686-apple-darwinX |darwin-i386-cc" \
3333
"i386-apple-darwinX |darwin-i386-cc" \
3434
"powerpc-apple-darwinX |darwin-ppc-cc" \
35+
"arm64-apple-darwinX |darwin-arm64-cc" \
3536
"i586-pc-winnt |winnt-parity" \
3637
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
3738
"s390x-linux-gnu |linux64-s390x" \
@@ -155,6 +156,7 @@ darwin)
155156
powerpc) machine=ppc-cc;;
156157
i?86*) machine=i386-cc;;
157158
x86_64) machine=x86_64-cc; system=${system}64;;
159+
arm64) machine=arm64-cc; system=${system}64;;
158160
esac
159161
;;
160162
hpux)

‎sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
https://github.com/openssl/openssl/issues/7679
2+
3+
--- a/Configurations/unix-Makefile.tmpl
4+
+++ b/Configurations/unix-Makefile.tmpl
5+
@@ -77,8 +77,14 @@
6+
# to. You're welcome.
7+
sub dependmagic {
8+
my $target = shift;
9+
-
10+
- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
11+
+ my $magic = <<"_____";
12+
+$target: build_generated depend
13+
+ \$(MAKE) _$target
14+
+_$target
15+
+_____
16+
+ # Remove line ending
17+
+ $magic =~ s|\R$||;
18+
+ return $magic;
19+
}
20+
'';
21+
-}

‎sdk_container/src/third_party/coreos-overlay/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001
2+
From: Alistair Francis <[email protected]>
3+
Date: Thu, 29 Aug 2019 13:56:21 -0700
4+
Subject: [PATCH] Add support for io_pgetevents_time64 syscall
5+
6+
32-bit architectures that are y2038 safe don't include syscalls that use
7+
32-bit time_t. Instead these architectures have suffixed syscalls that
8+
always use a 64-bit time_t. In the case of the io_getevents syscall the
9+
syscall has been replaced with the io_pgetevents_time64 syscall instead.
10+
11+
This patch changes the io_getevents() function to use the correct
12+
syscall based on the avaliable syscalls and the time_t size. We will
13+
only use the new 64-bit time_t syscall if the architecture is using a
14+
64-bit time_t. This is to avoid having to deal with 32/64-bit
15+
conversions and relying on a 64-bit timespec struct on 32-bit time_t
16+
platforms. As of Linux 5.3 there are no 32-bit time_t architectures
17+
without __NR_io_getevents. In the future if a 32-bit time_t architecture
18+
wants to use the 64-bit syscalls we can handle the conversion.
19+
20+
This fixes build failures on 32-bit RISC-V.
21+
22+
Signed-off-by: Alistair Francis <[email protected]>
23+
24+
Reviewed-by: Richard Levitte <[email protected]>
25+
Reviewed-by: Paul Dale <[email protected]>
26+
(Merged from https://github.com/openssl/openssl/pull/9819)
27+
---
28+
engines/e_afalg.c | 16 ++++++++++++++++
29+
1 file changed, 16 insertions(+)
30+
31+
diff --git a/engines/e_afalg.c b/engines/e_afalg.c
32+
index dacbe358cb..99516cb1bb 100644
33+
--- a/engines/e_afalg.c
34+
+++ b/engines/e_afalg.c
35+
@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
36+
struct io_event *events,
37+
struct timespec *timeout)
38+
{
39+
+#if defined(__NR_io_getevents)
40+
return syscall(__NR_io_getevents, ctx, min, max, events, timeout);
41+
+#elif defined(__NR_io_pgetevents_time64)
42+
+ /* Let's only support the 64 suffix syscalls for 64-bit time_t.
43+
+ * This simplifies the code for us as we don't need to use a 64-bit
44+
+ * version of timespec with a 32-bit time_t and handle converting
45+
+ * between 64-bit and 32-bit times and check for overflows.
46+
+ */
47+
+ if (sizeof(timeout->tv_sec) == 8)
48+
+ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL);
49+
+ else {
50+
+ errno = ENOSYS;
51+
+ return -1;
52+
+ }
53+
+#else
54+
+# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64."
55+
+#endif
56+
}
57+
58+
static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
59+
--
60+
2.26.2
61+

0 commit comments

Comments
 (0)