commit: 637fa823f01d8c26d4c3733a480cd163801016b1
parent 86e1a5e7f61ae29c66f6ea78c72717b4162bb0df
Author: Gábor Stefanik <netrolller.3d@gmail.com>
Date: Sat, 13 Apr 2024 23:43:41 +0200
Upgrade OpenSSL to 3.0.13
Fixes #451
Diffstat:
8 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -36,7 +36,7 @@ ca7403a7503e8f3bb55e6c5bd54571b8c061b11c96e50ee89e006df6011d1518 bzip2-1.0.8_0.
c95fd8c51c3bfbd4d08a4a50d0033ee85394e6efe4ff82703c050e4dbc4347bf coreutils-6.10_0.tar.bz2
9fa31a4aeaa5132205efb796c8f546c94c1cfef6b5c27e64f6ebe06ca0360e67 coreutils-9.4_0.tar.bz2
abd629e5675196c39dae00afbe23e2116bbd277be1d82214e2ec557a3b03994f curl-8.5.0_0.tar.bz2
-a4473a15de63a1d8ed0a9344f81b3926ce2b1324e48c2574b0042a91384aa5c7 curl-8.5.0_1.tar.bz2
+db8757b5fe77f56073caa034bfe9b3af6076d7299db966c4348e06f01a34415f curl-8.5.0_1.tar.bz2
9534d834b018343b8335d0ef0b5faff3ee18e4ecbecf43a2a80deb972283f5d6 dhcpcd-10.0.1_0.tar.bz2
abb9f6fe46c57ea809100b71497e04905deaad345d64485532bf6ef7f2a07f2c diffutils-2.7_0.tar.bz2
41e3129b974391fe4ace69914fdef9b0fe72c6f5d87d495750fb89bdd999fa01 diffutils-3.10_0.tar.bz2
@@ -91,7 +91,7 @@ d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079 musl-1.1.24_2.
6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936 musl-1.2.4_1.tar.bz2
820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449 musl-1.2.4_2.tar.bz2
a18c4b2e5de2bfe5bb3ee9d360484fcfebad3df042f1859d4aa333dd60f55e56 opendoas-6.8.2_0.tar.bz2
-b1acdc394c2dd42f01046480db07da6b0393bf76b198abf099c4877e5e3b869e openssl-1.1.1l_0.tar.bz2
+67b536b2f2a6c56e4673e462a3dbe2f42e8a4a5cb0b61b6bc1fdc14adea33f63 openssl-3.0.13_0.tar.bz2
71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7 patch-2.7.6_0.tar.bz2
5ae7fe43d62d1064c123d9813017015e5e8d5107d0e70f0199576141416ff81d perl-5.000_0.tar.bz2
4994c55e3832649600f190079bd4779c463478a092b167098b1d00eff3358fbe perl-5.003_0.tar.bz2
@@ -105,13 +105,13 @@ ae6c84e55c2d9bcd7b80bf780ae6921fe890608123c9ba904e1b7d90759ade3d perl5.004-05_0
b5d86ddc98cfbc684b03f1c84c786caaad810d5e4c7be38089f324eb3c276ad9 python-2.0.1_1.tar.bz2
396577cdd0cc61d76420a1771c64156e49e8f9d00430c82feb88ad933b341632 python-2.3.7_0.tar.bz2
2499cb7f10f292c3506fbf1b6a876195179ec98edfe7b8c357140137a1449492 python-2.3.7_1.tar.bz2
-2dd06364e281da421a16251fa2258df201efd180461718f5a000012c4b2bdfe5 python-2.5.6_0.tar.bz2
+80d8fcaf68c82238ddffb120b62fbc20d58bd9e2416cba080547a9f442e9e229 python-2.5.6_0.tar.bz2
3508248f299b73c50e3607c4c294d40face05170476a5026b0821aed69025863 python-3.1.5_0.tar.bz2
12b1ffc7ec98ba8f807160b93ba69a694d5395567c3bcac1e49e8f8d1d50de43 python-3.1.5_1.tar.bz2
-fde3a6af334434b35a8db0711d33c21a96762d09ff912e19638efbdf2dc363c5 python-3.11.1_0.tar.bz2
+d6a7d3a109f63cd5ed4feaa772c33e272e570e216346ee90f6ca365d3a951615 python-3.11.1_0.tar.bz2
60b93253a2078f849f81e7e1ed6233e30702f03b1893640eee95671d814f5514 python-3.3.7_0.tar.bz2
da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c python-3.4.10_0.tar.bz2
-4c5c08b237d1c8cfe91d6b8f36d1942bf1e8f114894a228b5969c810ea52b8c3 python-3.8.16_0.tar.bz2
+af7a8334045fed8bd610b19194c0b46aa670070fc4738c34449ba5e93e49db8a python-3.8.16_0.tar.bz2
34c51d3df85585a8aee7691b3500a5c3c7442b06a6f57231b76970bdd6e99bf9 sed-4.0.9_0.tar.bz2
e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4 sed-4.8_0.tar.bz2
ef2f2c791c1ae74f19c98ebcd7edae6ae28bc1d9367cc3a2cdb1ac302a156cb7 shadow-4.14.3_0.tar.bz2
diff --git a/steps/manifest b/steps/manifest
@@ -157,7 +157,7 @@ build: dist-3.5-236
build: perl-5.32.1
uninstall: perl-5.6.2 perl-5.10.1
build: libarchive-3.5.2
-build: openssl-1.1.1l
+build: openssl-3.0.13
build: ca-certificates-3.95
build: curl-8.5.0
build: zlib-1.2.13
diff --git a/steps/openssl-1.1.1l/pass1.sh b/steps/openssl-1.1.1l/pass1.sh
@@ -1,36 +0,0 @@
-# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
-#
-# 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 two useless manpages that code in hostname
- rm doc/man5/x509v3_config.pod doc/man5/config.pod
-
- # 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() {
- MACHINE=i386 ./config --prefix="${PREFIX}" \
- --libdir="${LIBDIR}" \
- no-shared
-}
-
-src_compile() {
- declare -x SOURCE_DATE_EPOCH=1638831119
- default
-}
-
-src_install() {
- default
-
- rm -r "${DESTDIR}${PREFIX}/share/doc/openssl/html/man"{1,3,7}
- rm -r "${DESTDIR}${PREFIX}/share/man/man"{1,3,7}
- rm -r "${DESTDIR}${PREFIX}/ssl/misc"
-}
diff --git a/steps/openssl-1.1.1l/sources b/steps/openssl-1.1.1l/sources
@@ -1 +0,0 @@
-http://mirror.math.princeton.edu/pub/openssl/source/old/1.1.1/openssl-1.1.1l.tar.gz 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
diff --git a/steps/openssl-3.0.13/pass1.sh b/steps/openssl-3.0.13/pass1.sh
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
+#
+# 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"
+}
diff --git a/steps/openssl-3.0.13/sources b/steps/openssl-3.0.13/sources
@@ -0,0 +1 @@
+http://ftp.openssl.org/source/openssl-3.0.13.tar.gz 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
diff --git a/steps/python-3.11.1/pass1.sh b/steps/python-3.11.1/pass1.sh
@@ -10,10 +10,10 @@ src_prepare() {
Misc/stable_abi.toml
# Regenerate ssl_data for ssl module
- rm Modules/_ssl_data_300.h Modules/_ssl_data.h
- python -B Tools/ssl/make_ssl_data.py ../openssl-1.1.1l Modules/_ssl_data_111.h
+ 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
sed -i 's#$(srcdir)/Modules/_ssl_data.h ##' Makefile.pre.in
- sed -i 's#$(srcdir)/Modules/_ssl_data_300.h ##' Makefile.pre.in
+ sed -i 's#$(srcdir)/Modules/_ssl_data_111.h ##' Makefile.pre.in
# Regenerate encodings
grep generated -r . -l | grep encodings | xargs rm
diff --git a/steps/python-3.11.1/sources b/steps/python-3.11.1/sources
@@ -21,4 +21,4 @@ http://ftp.unicode.org/Public/14.0.0/ucd/CaseFolding.txt a566cd48687b2cd897e0250
http://ftp.unicode.org/Public/14.0.0/ucd/Unihan.zip 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d Unihan-14.0.0.zip
http://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP437.TXT 6bad4dabcdf5940227c7d81fab130dcb18a77850b5d79de28b5dc4e047b0aaac
https://www.ietf.org/rfc/rfc3454.txt eb722fa698fb7e8823b835d9fd263e4cdb8f1c7b0d234edf7f0e3bd2ccbb2c79
-http://mirror.math.princeton.edu/pub/openssl/source/old/1.1.1/openssl-1.1.1l.tar.gz 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+http://ftp.openssl.org/source/openssl-3.0.13.tar.gz 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
