mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
openssl: update to 3.6.0 + remove pregenerated files
There are a fairly significant number. The previous check was actually wrong (all GENERATE files are generated in the build process :\). Change Python accordingly.
This commit is contained in:
Samuel Tyler
parent
2e18c35df8
commit
af23ad1607
10 changed files with 187 additions and 41 deletions
|
|
@ -38,7 +38,7 @@ fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98 ca-certificate
|
|||
27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2
|
||||
61f5a1654935fbfd5358116bf2267236676aace3370cc6aaf8ff4fb1b4d020b2 coreutils-9.4_0.tar.bz2
|
||||
912a256dd9a17deb6b48d1fe4c435313b242fa3bb63afef726e7c8ebe0b6a8ca curl-8.17.0_0.tar.bz2
|
||||
2bbaf310049e1f66198512f4722b6fdcf99735dcb19b16d40371942d24bd720e curl-8.17.0_1.tar.bz2
|
||||
e3946f9e209845e09fbb7cd80573e8b82f240b818e3199f02dbff1b93332dc65 curl-8.17.0_1.tar.bz2
|
||||
0ee8251b7251bf1c4a5634554c92c79339bd562b893b7c8fb1619c3ae6084bda dhcpcd-10.0.1_0.tar.bz2
|
||||
0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2 diffutils-2.7_0.tar.bz2
|
||||
4cbe1fce51122f1a421e2c8bbb896b10f4a0be849916bdb67819f6f0e754c4a5 diffutils-3.10_0.tar.bz2
|
||||
|
|
@ -95,7 +95,7 @@ ded6ecc93cc194f5b22be26c6547c63a4b84959785212fded100440f71da1802 musl-1.1.24_2.
|
|||
f25c410403bef549d4ba37e500970480eaa649b582db9de9e21616257f9ecbcf musl-1.2.5_1.tar.bz2
|
||||
3755dc16bfa1ff39a1c9309c2c03bb0e5dfc215ae4b1c242f3818fe07c1014e4 musl-1.2.5_2.tar.bz2
|
||||
62d3091f09315ef0c01865d15068ee14e19a04bdb40c23f5490a01aa23dd5565 opendoas-6.8.2_0.tar.bz2
|
||||
693806e3bccbea1f836893763128f6c3a6157c5e984a7cbc99d002b421161011 openssl-3.0.13_0.tar.bz2
|
||||
c23cc2088428586f594888159486800e7028b09e9f61d4a0d5ddf5d8f8fbab66 openssl-3.6.0_0.tar.bz2
|
||||
a69d77242ba2bfa97a40e633656703ecedbcd797de5ad29eb62bf93831ee6f25 patch-2.7.6_0.tar.bz2
|
||||
44456a0635dc56351d34bf9701487e562c2c903393db2cc99f5c3a6d2ecf52d4 perl-5.000_0.tar.bz2
|
||||
0b7ded1733433323c2056b1005828aaabb8aaca9505839333a8e80f12669f203 perl-5.003_0.tar.bz2
|
||||
|
|
@ -132,12 +132,12 @@ dfd2e494cc1c13ac241668d7489895984100bd14848281d2a4881d15436525fc pkg-config-0.2
|
|||
c6c183bcb738bc8f9c1b25d9abc440fc53aee3e710b83f369aafd67ae282db56 python-2.3.7_0.tar.bz2
|
||||
2914530a437c138d125d9d167e3b1615e46e4d85195a9a1f9998c267deb76b3f python-2.3.7_1.tar.bz2
|
||||
a5ff679811e9a8666ecacf1874aa1287daa890e5cac76510d362342db05dd4ba python-2.5.6_0.tar.bz2
|
||||
aed7b124bef7121d80bcc58028b2fdf4648aa2d495a2698058a9bc57654a00fc python-3.11.1_0.tar.bz2
|
||||
97dd86de328d1cacd1a8628bb78773153980edf933aafff70b3b3201c54fefee python-3.11.1_0.tar.bz2
|
||||
d35083e11bd40ee360ac0648e7ac5f2492d5a177c70f92ff3ed32772cd594c54 python-3.1.5_0.tar.bz2
|
||||
c040926b75186c69914713973cf5c198813a51808663666fd3fca32f989ebbff python-3.1.5_1.tar.bz2
|
||||
34cc357b7a70245af11428ed0ceec618e6fbcbc6eb2f1c45afe0aadef6331987 python-3.3.7_0.tar.bz2
|
||||
cbb181be22b304f76a286300e3324f7e03e0316bf5662e0d6e416d68fb6514e4 python-3.4.10_0.tar.bz2
|
||||
1c3951a330392a5e5f4ef22539b9dd54f5db2affebc37845cc781051cbd54e69 python-3.8.16_0.tar.bz2
|
||||
59fc4a344f0ee270b72a9cf21e9a03087520c2b1563be8b42470cf723941ef64 python-3.8.16_0.tar.bz2
|
||||
18d517fa1195aa82e3e0eb7f261eb3addb9a43492040b16be04571639781577e sed-4.0.9_0.tar.bz2
|
||||
3e7c9ab6da24fa44e115af66e077b5692f5293ffb7bc82c54fb91663900867d3 sed-4.8_0.tar.bz2
|
||||
fe8bbc246d82e99c482337f1443c5313268823667dccebca6cd004e6cf6b4a7c shadow-4.14.3_0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ build: perl-Devel-Tokenizer-C-0.11
|
|||
build: perl-5.42.0
|
||||
uninstall: perl-5.6.2 perl-5.8.9
|
||||
build: libarchive-3.5.2
|
||||
build: openssl-3.0.13
|
||||
build: openssl-3.6.0
|
||||
build: ca-certificates-3.99
|
||||
build: curl-8.17.0
|
||||
build: patch-2.7.6
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2021-22 Samuel Tyler <samuel@samuelt.me>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# XXX: If you change the version of this, you must update the corresponding
|
||||
# tarball in Python 3.11.
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove a bunch of pregenerated files
|
||||
# thanks for making these easy to find :)
|
||||
find . -name build.info -exec grep 'GENERATE\[' {} \; | sed 's/.*\[//' | sed 's/\].*$//' | xargs -I{} find . -name {} -delete
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./config --prefix="${PREFIX}" \
|
||||
--libdir="${LIBDIR}" \
|
||||
no-shared linux-generic32
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
declare -x SOURCE_DATE_EPOCH=1638831119
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
rm -r "${DESTDIR}${PREFIX}/share/doc/openssl/html/man"{1,3,5,7}
|
||||
rm -r "${DESTDIR}${PREFIX}/share/man/man"{1,3,5,7}
|
||||
rm -r "${DESTDIR}${PREFIX}/ssl/misc"
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
f https://github.com/openssl/openssl/releases/download/openssl-3.0.13/openssl-3.0.13.tar.gz 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
|
||||
92
steps/openssl-3.6.0/pass1.sh
Executable file
92
steps/openssl-3.6.0/pass1.sh
Executable file
|
|
@ -0,0 +1,92 @@
|
|||
# SPDX-FileCopyrightText: 2021-22 Samuel Tyler <samuel@samuelt.me>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# XXX: If you change the version of this, you must update the corresponding
|
||||
# tarball in Python 3.11.
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove a bunch of pregenerated files
|
||||
rm apps/*.{pem,crt}
|
||||
find demos -name "*.pem" -delete
|
||||
rm crypto/asn1/charmap.h \
|
||||
crypto/bn/bn_prime.h \
|
||||
crypto/conf/conf_def.h \
|
||||
crypto/ec/ecp_sm2p256_table.c \
|
||||
crypto/ec/ecp_nistz256_table.c \
|
||||
crypto/objects/obj_dat.h \
|
||||
crypto/objects/obj_xref.h
|
||||
# This file, while supposedly being generated by util/mkerr.pl, is just
|
||||
# a stub and not regenerated by util/mkerr.pl
|
||||
mv crypto/kdf/kdf_err{,.bak}.c
|
||||
rm crypto/*/?*err.c \
|
||||
crypto/*err.c \
|
||||
crypto/sslerr.h \
|
||||
engines/*_err.{c,h} \
|
||||
include/{openssl,internal,crypto}/?*err.h \
|
||||
providers/common/include/prov/proverr.h \
|
||||
providers/common/provider_err.c
|
||||
mv crypto/kdf/kdf_err{.bak,}.c
|
||||
rm external/perl/Text-Template-1.56/Makefile.PL \
|
||||
external/perl/Text-Template-1.56/MANIFEST \
|
||||
external/perl/Text-Template-1.56/t/author-signature.t \
|
||||
external/perl/Text-Template-1.56/t/author-pod-syntax.t
|
||||
rm fuzz/oids.txt
|
||||
|
||||
# Test pregenerated files
|
||||
# This may be more than necessary, but it is easy to delete tests
|
||||
find test \( -name "*.pem" \
|
||||
-o -name "*.tlssct" \
|
||||
-o -name "*.csr" \
|
||||
-o -name "*.key" \
|
||||
-o -name "*.p12" \
|
||||
-o -name "*.der" \
|
||||
-o -name "*.dat" \
|
||||
-o -name "*.crt" \
|
||||
-o -name "*.cms" \) -delete
|
||||
rm test/recipes/25-test_pkcs7_data/grfc.out \
|
||||
test/recipes/30-test_evp_data/evpmac_siphash.txt \
|
||||
test/recipes/80-test_cmp_http_data/test_connection.csv \
|
||||
test/recipes/80-test_tsa_data/all-zero.tsq \
|
||||
test/recipes/80-test_tsa_data/sectigo-all-zero.tsr \
|
||||
test/recipes/90-test_store_data/testrsa.msb \
|
||||
test/recipes/90-test_threads_data/store/8489a545.0 \
|
||||
test/recipes/90-test_store.t \
|
||||
test/shibboleth.pfx
|
||||
rm test/bn_rand_range.h \
|
||||
test/*.bin \
|
||||
test/evp_extra_test2.c \
|
||||
test/evp_pkey_provided_test.c
|
||||
|
||||
# And some unverifiable files
|
||||
rm doc/designs/quic-design/images/quic-overview.odg \
|
||||
doc/life-cycles/lifecycles.ods
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./Configure --prefix="${PREFIX}" \
|
||||
--libdir="${LIBDIR}" \
|
||||
no-shared no-tests no-docs linux-generic32
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
make generate
|
||||
perl util/mkerr.pl -internal -rebuild
|
||||
for conf in engines/*.ec; do
|
||||
local c_file
|
||||
c_file="$(basename "$conf" .ec).c"
|
||||
perl util/mkerr.pl -conf "$conf" -rebuild "engines/$c_file"
|
||||
done
|
||||
mv ./*_err.{c,h} engines/
|
||||
|
||||
declare -x SOURCE_DATE_EPOCH=1638831119
|
||||
default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
rm -r "${DESTDIR}${PREFIX}/ssl/misc"
|
||||
}
|
||||
14
steps/openssl-3.6.0/patches/missing-files.patch
Normal file
14
steps/openssl-3.6.0/patches/missing-files.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
SPDX-FileCopyrightText: 2025 Samuel Tyler <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
--- openssl-3.6.0/Configure 2025-10-01 22:11:48.000000000 +1000
|
||||
+++ openssl-3.6.0/Configure 2025-12-26 12:04:24.790872245 +1100
|
||||
@@ -2729,7 +2729,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- die "There are files missing\n" if $missing > 0;
|
||||
|
||||
# Go through the sources of all libraries and check that the same basename
|
||||
# doesn't appear more than once. Some static library archivers depend on
|
||||
1
steps/openssl-3.6.0/sources
Normal file
1
steps/openssl-3.6.0/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
f https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9
|
||||
|
|
@ -11,7 +11,7 @@ src_prepare() {
|
|||
|
||||
# Regenerate ssl_data for ssl module
|
||||
rm Modules/_ssl_data_111.h Modules/_ssl_data.h
|
||||
python -B Tools/ssl/make_ssl_data.py ../openssl-3.0.13 Modules/_ssl_data_300.h
|
||||
python -B Tools/ssl/make_ssl_data.py ../openssl-3.6.0 Modules/_ssl_data_300.h
|
||||
sed -i 's#$(srcdir)/Modules/_ssl_data.h ##' Makefile.pre.in
|
||||
sed -i 's#$(srcdir)/Modules/_ssl_data_111.h ##' Makefile.pre.in
|
||||
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ f http://ftp.unicode.org/Public/14.0.0/ucd/CaseFolding.txt a566cd48687b2cd897e02
|
|||
f http://ftp.unicode.org/Public/14.0.0/ucd/Unihan.zip 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d Unihan-14.0.0.zip
|
||||
f http://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP437.TXT 6bad4dabcdf5940227c7d81fab130dcb18a77850b5d79de28b5dc4e047b0aaac
|
||||
f https://www.ietf.org/rfc/rfc3454.txt eb722fa698fb7e8823b835d9fd263e4cdb8f1c7b0d234edf7f0e3bd2ccbb2c79
|
||||
f https://github.com/openssl/openssl/releases/download/openssl-3.0.13/openssl-3.0.13.tar.gz 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
|
||||
f https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue