Merge pull request #559 from fosslinux/curl-update

Curl+OpenSSL+ca-certificates update

LICENSES/Apache-2.0.txt

@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

parts.rst

@@ -902,8 +902,8 @@ musl 1.2.5
 At this point, it is guaranteed that we are running on Linux with thread support,
 so we rebuild musl with thread support.
 
-curl 8.5.0 and get_network
+curl 8.17.0 and get_network
-==========================
+===========================
 
 ``curl`` is used to download files using various protocols including HTTP and HTTPS.
 However, this first build does not support encrypted HTTPS yet. ``curl`` requires
@@ -1062,8 +1062,8 @@ ca-certificates 3.99
 Install TLS root certificates from nss. This will allows us to use HTTPS for downloads
 once curl is rebuilt against OpenSSL.
 
-curl 8.5.0
+curl 8.17.0
-==========
+===========
 
 We rebuild curl with support for OpenSSL.
 

steps/SHA256SUMS.pkgs

@@ -33,12 +33,12 @@ ffcd771ba0e4e38ff726cf8d819ac5c0281186ed99a72b5a9d69d5940438e942  bison-3.6.4_0.
 0cb9cb64b4baac6c3568bdf05047b37ff42c661fe3f1e7ab1be7de0f44c4c677  bison-3.7.6_0.tar.bz2
 a0156d06536936dee9e696cbf6fb41087eaa1ce5cbc5d6e0067d3fd952ba7060  bison-3.8.2_0.tar.bz2
 e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447  bzip2-1.0.8_0.tar.bz2
-fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98  ca-certificates-3.99_0.tar.bz2
+3ab45eca94432316ee120006686cc334a23187cbb795b550601d6288ccded111  ca-certificates-3.119.1_0.tar.bz2
 982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2  coreutils-5.0_0.tar.bz2
 27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0  coreutils-6.10_0.tar.bz2
 61f5a1654935fbfd5358116bf2267236676aace3370cc6aaf8ff4fb1b4d020b2  coreutils-9.4_0.tar.bz2
-d8ad6dd811872bfc4ac3f2101de85277de29e048f9e10debde1c284e3a62144b  curl-8.12.1_0.tar.bz2
+912a256dd9a17deb6b48d1fe4c435313b242fa3bb63afef726e7c8ebe0b6a8ca  curl-8.17.0_0.tar.bz2
-0eaf75d94319db6fa7792ef55f5124c6ce230aadecf8f019b04f2217408043fd  curl-8.12.1_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

steps/ca-certificates-3.119.1/pass1.sh

@@ -3,11 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_compile() {
-    cp -a nss/lib/ckfw/builtins/certdata.txt .
+    # Cannot be UNIX time 0 because mk-ca-bundle treats that as falsey
+    touch -t 197001010001.00 certdata.txt
     mk-ca-bundle -n -s ALL -m
 }
 
 src_install() {
     install -D -m 644 ca-bundle.crt "${DESTDIR}/etc/ssl/certs/ca-certificates.crt"
-    ln -s /etc/ssl/certs/ca-certificates.crt "${DESTDIR}/etc/ssl/certs.pem"
+    ln -s certs/ca-certificates.crt "${DESTDIR}/etc/ssl/certs.pem"
 }

steps/ca-certificates-3.119.1/sources

@@ -0,0 +1 @@
+f https://hg-edge.mozilla.org/projects/nss/raw-file/NSS_3_119_1_RTM/lib/ckfw/builtins/certdata.txt a903b3cd05231e39332515ef7ebe37e697262f39515a52015c23c62805b73cd0

steps/ca-certificates-3.99/sources

@@ -1 +0,0 @@
-f http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_99_RTM/src/nss-3.99.tar.gz 5cd5c2c8406a376686e6fa4b9c2de38aa280bea07bf927c0d521ba07c88b09bd

steps/curl-8.12.1/patches/timeless-mk-ca-bundle.patch

@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz <eduardosm-dev@e64.io>
-#
-# SPDX-License-Identifier: curl
-
-Disables checking current date in mk-ca-bundle script, so it produces
-reproducible bundles.
-
-diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl
---- curl-8.12.1/scripts/mk-ca-bundle.pl
-+++ curl-8.12.1/scripts/mk-ca-bundle.pl
-@@ -499,19 +499,7 @@
-     if($main_block) {
-       push @precert, $_ if not /^#$/;
-       if(/^# Not Valid After : (.*)/) {
--        my $stamp = $1;
--        use Time::Piece;
--        # Not Valid After : Thu Sep 30 14:01:15 2021
--        my $t = Time::Piece->strptime($stamp, "%a %b %d %H:%M:%S %Y");
--        my $delta = ($t->epoch - time()); # negative means no longer valid
--        if($delta < 0) {
--          $skipnum++;
--          report "Skipping: $main_block_name is not valid anymore" if ($opt_v);
--          $valid = 0;
--        }
--        else {
--          $valid = 1;
--        }
-+        $valid = 1;
-       }
-     }
-     next;

steps/curl-8.12.1/sources

@@ -1 +0,0 @@
-f https://curl.se/download/curl-8.12.1.tar.xz 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202

steps/curl-8.17.0/pass1.sh

@@ -5,17 +5,17 @@
 src_prepare() {
     default
 
+    # pregenerated files
+    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
+    rm docs/libcurl/libcurl-symbols.md
+    rm -r packages/vms/curlmsg.h packages/vms/curlmsg.sdl
+
     # Regnerate src/tool_cb_prg.c
     sed '/sinus/q' src/tool_cb_prg.c > src/tool_cb_prg.c.new
     perl sinus.pl | sed "s/, $//" >> src/tool_cb_prg.c.new
     sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
     mv src/tool_cb_prg.c.new src/tool_cb_prg.c
 
-    # pregenerated files
-    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
-    rm docs/libcurl/libcurl-symbols.md
-    rm tests/certs/*.der
-
     # Make scripts work with our perl
     sed -i "s/:crlf//" scripts/managen scripts/cd2nroff
     # sed rewrites permissions?!

steps/curl-8.17.0/pass2.sh

@@ -5,18 +5,18 @@
 src_prepare() {
     default
 
+    # pregenerated files
+    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
+    rm docs/libcurl/libcurl-symbols.md
+    rm -r packages/vms/curlmsg.{h,sdl}
+
     # Regnerate src/tool_cb_prg.c
     sed '/sinus/q' src/tool_cb_prg.c > src/tool_cb_prg.c.new
     perl sinus.pl | sed "s/, $//" >> src/tool_cb_prg.c.new
     sed '1,/^[0-9, ]*[0-9]$/d' src/tool_cb_prg.c >> src/tool_cb_prg.c.new
     mv src/tool_cb_prg.c.new src/tool_cb_prg.c
 
-    # pregenerated files
+    autoreconf-2.71 -fi
-    rm src/tool_listhelp.c src/tool_hugehelp.c lib/easyoptions.c
-    rm docs/libcurl/libcurl-symbols.md
-    rm tests/certs/*.der
-
-    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {

steps/curl-8.17.0/patches/timeless-mk-ca-bundle.patch

@@ -0,0 +1,31 @@
+SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz <eduardosm-dev@e64.io>
+
+SPDX-License-Identifier: curl
+
+Disables checking current date in mk-ca-bundle script, so it produces
+reproducible bundles.
+
+diff --color -ru curl-8.17.0/scripts/mk-ca-bundle.pl curl-8.17.0/scripts/mk-ca-bundle.pl
+--- curl-8.17.0/scripts/mk-ca-bundle.pl	2025-12-25 22:23:04.570441299 +1100
++++ curl-8.17.0/scripts/mk-ca-bundle.pl	2025-12-25 22:23:39.749439976 +1100
+@@ -495,19 +495,7 @@
+         if($main_block) {
+             push @precert, $_ if not /^#$/;
+             if(/^# Not Valid After : (.*)/) {
+-                my $stamp = $1;
+-                use Time::Piece;
+-                # Not Valid After : Thu Sep 30 14:01:15 2021
+-                my $t = Time::Piece->strptime($stamp, "%a %b %d %H:%M:%S %Y");
+-                my $delta = ($t->epoch - time()); # negative means no longer valid
+-                if($delta < 0) {
+-                    $skipnum++;
+-                    report "Skipping: $main_block_name is not valid anymore" if($opt_v);
+-                    $valid = 0;
+-                }
+-                else {
+-                    $valid = 1;
+-                }
++                $valid = 1;
+             }
+         }
+         next;

steps/curl-8.17.0/sources

@@ -0,0 +1 @@
+f https://curl.se/download/curl-8.17.0.tar.xz 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992

steps/helpers.sh

@@ -405,6 +405,10 @@ default_src_unpack() {
             fi
         done
     fi
+    if ! [ -e "${dirname}" ]; then
+        # there are no directories extracted
+        dirname=.
+    fi
     # shellcheck disable=SC2162
     tail -n +2 ../sources | while read line; do
         # shellcheck disable=SC2086

steps/manifest

@@ -137,7 +137,7 @@ improve: finalize_fhs
 improve: open_console ( CONSOLES == True )
 improve: swap ( SWAP_SIZE != 0 )
 build: musl-1.2.5
-build: curl-8.12.1
+build: curl-8.17.0
 improve: get_network ( CHROOT == False )
 build: bash-5.2.15
 improve: open_console ( CONSOLES == True )
@@ -187,9 +187,9 @@ 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: ca-certificates-3.119.1
-build: curl-8.12.1
+build: curl-8.17.0
 build: patch-2.7.6
 build: gettext-0.21
 build: texinfo-6.7

steps/openssl-3.0.13/pass1.sh

@@ -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"
-}

steps/openssl-3.0.13/sources

@@ -1 +0,0 @@
-f https://github.com/openssl/openssl/releases/download/openssl-3.0.13/openssl-3.0.13.tar.gz 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313

steps/openssl-3.6.0/pass1.sh

@@ -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"
+}

steps/openssl-3.6.0/patches/missing-files.patch

@@ -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

steps/openssl-3.6.0/sources

@@ -0,0 +1 @@
+f https://github.com/openssl/openssl/releases/download/openssl-3.6.0/openssl-3.6.0.tar.gz b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9

steps/python-3.11.1/pass1.sh

@@ -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
 

steps/python-3.11.1/sources

@@ -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