commit: 5ea8dd313638bc1f0f548edecd8b956591df8b54 parent 558630c5598e038099bf0a94240cd92993bea105 Author: Andrius Štikonas <andrius@stikonas.eu> Date: Fri, 24 Mar 2023 00:29:52 +0000 Merge pull request #271 from eduardosm/update-curl Update curl to 7.88.1Diffstat:
21 files changed, 204 insertions(+), 272 deletions(-)diff --git a/parts.rst b/parts.rst@@ -625,12 +625,6 @@ make 3.82 GNU ``make`` is now rebuilt properly using the build system and GCC, which means that it does not randomly segfault while building the Linux kernel. -curl 7.83.0 -=========== - -``curl`` is used to download files using various protocols including HTTP and HTTPS. -However, this first build does not support encrypted HTTPS yet. - ed 1.4 ====== @@ -694,6 +688,12 @@ sysb is purely a transition to sysc, allowing binaries from sysa to get onto a disk (as sysa does not necessarily have hard disk support in the kernel). It populates device nodes, mounts sysc, copies over data, and executes sysc. +curl 7.88.1 +=========== + +``curl`` is used to download files using various protocols including HTTP and HTTPS. +However, this first build does not support encrypted HTTPS yet. + bash 5.2.15 =========== @@ -829,7 +829,7 @@ openssl 1.1.1l OpenSSL is a C library for secure communications/cryptography. -curl 7.83.0 +curl 7.88.1 =========== We rebuild curl with support for OpenSSL.diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs@@ -35,8 +35,8 @@ c511d571d24675a141258e0e198c5ed1bcfd4889ddd736ff8e25c0d97b44e2cf ca-certificate 0d02d37d02d6def11b5f12eab5d97f47dc1e4abd53627deb2d99994e1ab9c6a8 coreutils-5.0_0.tar.bz2 27d0d3e84794f080f01c7c22547a308d1d781d8ce85d5b3f682c379f17bbeb47 coreutils-6.10_0.tar.bz2 e41aba2caa7514704731d3b7a49f63ff8ffb2d22a64f14afdbaadbd0b24073f0 coreutils-8.32_0.tar.bz2 -ea4b7a5bc7b152731d2d17f355725f8b683341803e89044a78be73a140fe64db curl-7.83.0_0.tar.bz2 -c16709184a6ec2312746242379065f71fcbd7165749c9d58a9b0846f4bfc5dc0 curl-7.83.0_1.tar.bz2 +8df7fe3124243028cc9fd9a00fe8ab55c2143a9b7551426447867d2e1de436b6 curl-7.88.1_0.tar.bz2 +d7d0a5fc9117f9b3ebd287851a48716c96a3c11991365edb8890f0e203d3b810 curl-7.88.1_1.tar.bz2 0b832d3efef962c10b61559052373267e9c85bbff37572b736a6996823e2d5b2 dhcpcd-9.4.1_0.tar.bz2 f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534 diffutils-2.7_0.tar.bz2 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2diff --git a/sysa/curl-7.83.0/curl-7.83.0.sh b/sysa/curl-7.83.0/curl-7.83.0.sh@@ -1,34 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - # Regnerate src/tool_cb_prg.c - sed -i "53,74d" src/tool_cb_prg.c - sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c - - rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c - - # Rebuild libtool files - rm config.guess config.sub ltmain.sh - libtoolize - - AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.64 AUTOCONF=autoconf-2.64 autoreconf-2.64 -fi -} - -src_configure() { - LDFLAGS="-static" ./configure \ - --prefix="${PREFIX}" \ - --libdir="${LIBDIR}" \ - --build=i386-unknown-linux-gnu \ - --enable-ipv6 \ - --without-ssl \ - --disable-hsts -} - -src_install() { - default - install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle" -}diff --git a/sysa/curl-7.83.0/patches/help.patch b/sysa/curl-7.83.0/patches/help.patch@@ -1,62 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> -# -# SPDX-License-Identifier: curl - -Regenerating help is not trivial. Help is unnecessary. -Disable help. - -diff --color -ru src/Makefile.inc src/Makefile.inc ---- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000 -+++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000 -@@ -69,11 +69,9 @@ - tool_formparse.c \ - tool_getparam.c \ - tool_getpass.c \ -- tool_help.c \ - tool_helpers.c \ - tool_hugehelp.c \ - tool_libinfo.c \ -- tool_listhelp.c \ - tool_main.c \ - tool_msgs.c \ - tool_operate.c \ -@@ -111,7 +109,6 @@ - tool_formparse.h \ - tool_getparam.h \ - tool_getpass.h \ -- tool_help.h \ - tool_helpers.h \ - tool_hugehelp.h \ - tool_libinfo.h \ -diff --color -ru src/tool_operate.c src/tool_operate.c ---- src/tool_operate.c 2022-05-09 16:48:37.196347022 +1000 -+++ src/tool_operate.c 2022-05-09 16:54:00.696271863 +1000 -@@ -78,7 +78,6 @@ - #include "tool_writeout.h" - #include "tool_xattr.h" - #include "tool_vms.h" --#include "tool_help.h" - #include "tool_hugehelp.h" - #include "tool_progress.h" - #include "dynbuf.h" -@@ -2607,19 +2606,7 @@ - if(res) { - result = CURLE_OK; - -- /* Check if we were asked for the help */ -- if(res == PARAM_HELP_REQUESTED) -- tool_help(global->help_category); -- /* Check if we were asked for the manual */ -- else if(res == PARAM_MANUAL_REQUESTED) -- hugehelp(); -- /* Check if we were asked for the version information */ -- else if(res == PARAM_VERSION_INFO_REQUESTED) -- tool_version_info(); -- /* Check if we were asked to list the SSL engines */ -- else if(res == PARAM_ENGINES_REQUESTED) -- tool_list_engines(); -- else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) -+ if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) - result = CURLE_UNSUPPORTED_PROTOCOL; - else if(res == PARAM_READ_ERROR) - result = CURLE_READ_ERROR;diff --git a/sysa/curl-7.83.0/patches/timeless-mk-ca-bundle.patch b/sysa/curl-7.83.0/patches/timeless-mk-ca-bundle.patch@@ -1,56 +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 ---- scripts/mk-ca-bundle.pl -+++ scripts/mk-ca-bundle.pl -@@ -497,19 +497,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; -@@ -571,24 +559,6 @@ - if($timestamp[12] ne "Z") { - report "distrust date stamp is not using UTC"; - } -- # Example date: 200617000000Z -- # Means 2020-06-17 00:00:00 UTC -- my $distrustat = -- timegm($timestamp[10] . $timestamp[11], # second -- $timestamp[8] . $timestamp[9], # minute -- $timestamp[6] . $timestamp[7], # hour -- $timestamp[4] . $timestamp[5], # day -- ($timestamp[2] . $timestamp[3]) - 1, # month -- "20" . $timestamp[0] . $timestamp[1]); # year -- if(time >= $distrustat) { -- # not trusted anymore -- $skipnum++; -- report "Skipping: $main_block_name is not trusted anymore" if ($opt_v); -- $valid = 0; -- } -- else { -- # still trusted -- } - } - next; - }diff --git a/sysa/curl-7.83.0/sources b/sysa/curl-7.83.0/sources@@ -1 +0,0 @@ -https://curl.se/download/curl-7.83.0.tar.bz2 247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96diff --git a/sysa/curl-7.88.1/sources b/sysa/curl-7.88.1/sources@@ -0,0 +1 @@ +https://curl.se/download/curl-7.88.1.tar.bz2 8224b45cce12abde039c12dc0711b7ea85b104b9ad534d6e4c5b4e188a61c907diff --git a/sysa/run2.sh b/sysa/run2.sh@@ -69,12 +69,13 @@ build kbd-1.15 build make-3.82 -build curl-7.83.0 - build ed-1.4 build bc-1.07.1 +mkdir -p /sysc/distfiles +cp "${DISTFILES}"/curl-7.88.1.tar.bz2 /sysc/distfiles + # Clear up some RAM space grep --no-filename '^build' "${SOURCES}"/run*.sh | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do rm -rf "${SOURCES:?}/${p:?}"diff --git a/sysc/curl-7.83.0/curl-7.83.0.sh b/sysc/curl-7.83.0/curl-7.83.0.sh@@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - # Regnerate src/tool_cb_prg.c - sed -i "53,74d" src/tool_cb_prg.c - sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c - - rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c - - # Rebuild libtool files - rm config.guess config.sub ltmain.sh - libtoolize - - AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi -} - -src_configure() { - LDFLAGS="-static" ./configure \ - --prefix="${PREFIX}" \ - --libdir="${LIBDIR}" \ - --enable-ipv6 \ - --with-openssl \ - --with-ca-bundle=/etc/ssl/certs.pem \ - --build=i386-unknown-linux-musl -}diff --git a/sysc/curl-7.83.0/files/sinus.pl b/sysc/curl-7.83.0/files/sinus.pl@@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: 1998-2021 Daniel Stenberg <daniel@haxx.se> -# -# SPDX-License-Identifier: curl - -my $pi = 3.1415; -foreach my $i (1 .. 200) { - printf "%d, ", sin($i/200 * 2 * $pi) * 500000 + 500000; -}diff --git a/sysc/curl-7.83.0/patches/help.patch b/sysc/curl-7.83.0/patches/help.patch@@ -1,62 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> -# -# SPDX-License-Identifier: curl - -Regenerating help is not trivial. Help is unnecessary. -Disable help. - -diff --color -ru src/Makefile.inc src/Makefile.inc ---- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000 -+++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000 -@@ -69,11 +69,9 @@ - tool_formparse.c \ - tool_getparam.c \ - tool_getpass.c \ -- tool_help.c \ - tool_helpers.c \ - tool_hugehelp.c \ - tool_libinfo.c \ -- tool_listhelp.c \ - tool_main.c \ - tool_msgs.c \ - tool_operate.c \ -@@ -111,7 +109,6 @@ - tool_formparse.h \ - tool_getparam.h \ - tool_getpass.h \ -- tool_help.h \ - tool_helpers.h \ - tool_hugehelp.h \ - tool_libinfo.h \ -diff --color -ru src/tool_operate.c src/tool_operate.c ---- src/tool_operate.c 2022-05-09 16:48:37.196347022 +1000 -+++ src/tool_operate.c 2022-05-09 16:54:00.696271863 +1000 -@@ -78,7 +78,6 @@ - #include "tool_writeout.h" - #include "tool_xattr.h" - #include "tool_vms.h" --#include "tool_help.h" - #include "tool_hugehelp.h" - #include "tool_progress.h" - #include "dynbuf.h" -@@ -2607,19 +2606,7 @@ - if(res) { - result = CURLE_OK; - -- /* Check if we were asked for the help */ -- if(res == PARAM_HELP_REQUESTED) -- tool_help(global->help_category); -- /* Check if we were asked for the manual */ -- else if(res == PARAM_MANUAL_REQUESTED) -- hugehelp(); -- /* Check if we were asked for the version information */ -- else if(res == PARAM_VERSION_INFO_REQUESTED) -- tool_version_info(); -- /* Check if we were asked to list the SSL engines */ -- else if(res == PARAM_ENGINES_REQUESTED) -- tool_list_engines(); -- else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) -+ if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) - result = CURLE_UNSUPPORTED_PROTOCOL; - else if(res == PARAM_READ_ERROR) - result = CURLE_READ_ERROR;diff --git a/sysc/curl-7.83.0/sources b/sysc/curl-7.83.0/sources@@ -1 +0,0 @@ -http://curl.se/download/curl-7.83.0.tar.xz bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511adiff --git a/sysa/curl-7.83.0/files/sinus.pl b/sysc/curl-7.88.1/files/sinus.pldiff --git a/sysc/curl-7.88.1/pass1.sh b/sysc/curl-7.88.1/pass1.sh@@ -0,0 +1,34 @@ +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # Regnerate src/tool_cb_prg.c + sed -i "55,76d" src/tool_cb_prg.c + sed -i "55 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c + + rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c + + # Rebuild libtool files + rm config.guess config.sub ltmain.sh + libtoolize + + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi +} + +src_configure() { + LDFLAGS="-static" ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --build=i386-unknown-linux-gnu \ + --enable-ipv6 \ + --without-ssl \ + --disable-hsts +} + +src_install() { + default + install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle" +}diff --git a/sysc/curl-7.88.1/pass2.sh b/sysc/curl-7.88.1/pass2.sh@@ -0,0 +1,29 @@ +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # Regnerate src/tool_cb_prg.c + sed -i "55,76d" src/tool_cb_prg.c + sed -i "55 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c + + rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c + + # Rebuild libtool files + rm config.guess config.sub ltmain.sh + libtoolize + + AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi +} + +src_configure() { + LDFLAGS="-static" ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --build=i386-unknown-linux-musl \ + --enable-ipv6 \ + --with-openssl \ + --with-ca-bundle=/etc/ssl/certs.pem +}diff --git a/sysc/curl-7.88.1/patches/help.patch b/sysc/curl-7.88.1/patches/help.patch@@ -0,0 +1,62 @@ +# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space> +# +# SPDX-License-Identifier: curl + +Regenerating help is not trivial. Help is unnecessary. +Disable help. + +diff -ru src/Makefile.inc src/Makefile.inc +--- src/Makefile.inc ++++ src/Makefile.inc +@@ -70,11 +70,9 @@ + tool_formparse.c \ + tool_getparam.c \ + tool_getpass.c \ +- tool_help.c \ + tool_helpers.c \ + tool_hugehelp.c \ + tool_libinfo.c \ +- tool_listhelp.c \ + tool_main.c \ + tool_msgs.c \ + tool_operate.c \ +@@ -111,7 +109,6 @@ + tool_formparse.h \ + tool_getparam.h \ + tool_getpass.h \ +- tool_help.h \ + tool_helpers.h \ + tool_hugehelp.h \ + tool_libinfo.h \ +diff -ru src/tool_operate.c src/tool_operate.c +--- src/tool_operate.c ++++ src/tool_operate.c +@@ -80,7 +80,6 @@ + #include "tool_writeout.h" + #include "tool_xattr.h" + #include "tool_vms.h" +-#include "tool_help.h" + #include "tool_hugehelp.h" + #include "tool_progress.h" + #include "dynbuf.h" +@@ -2703,19 +2702,7 @@ + if(res) { + result = CURLE_OK; + +- /* Check if we were asked for the help */ +- if(res == PARAM_HELP_REQUESTED) +- tool_help(global->help_category); +- /* Check if we were asked for the manual */ +- else if(res == PARAM_MANUAL_REQUESTED) +- hugehelp(); +- /* Check if we were asked for the version information */ +- else if(res == PARAM_VERSION_INFO_REQUESTED) +- tool_version_info(); +- /* Check if we were asked to list the SSL engines */ +- else if(res == PARAM_ENGINES_REQUESTED) +- tool_list_engines(); +- else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) ++ if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL) + result = CURLE_UNSUPPORTED_PROTOCOL; + else if(res == PARAM_READ_ERROR) + result = CURLE_READ_ERROR;diff --git a/sysc/curl-7.88.1/patches/timeless-mk-ca-bundle.patch b/sysc/curl-7.88.1/patches/timeless-mk-ca-bundle.patch@@ -0,0 +1,56 @@ +# 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 +--- scripts/mk-ca-bundle.pl ++++ 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; +@@ -573,24 +561,6 @@ + if($timestamp[12] ne "Z") { + report "distrust date stamp is not using UTC"; + } +- # Example date: 200617000000Z +- # Means 2020-06-17 00:00:00 UTC +- my $distrustat = +- timegm($timestamp[10] . $timestamp[11], # second +- $timestamp[8] . $timestamp[9], # minute +- $timestamp[6] . $timestamp[7], # hour +- $timestamp[4] . $timestamp[5], # day +- ($timestamp[2] . $timestamp[3]) - 1, # month +- "20" . $timestamp[0] . $timestamp[1]); # year +- if(time >= $distrustat) { +- # not trusted anymore +- $skipnum++; +- report "Skipping: $main_block_name is not trusted anymore" if ($opt_v); +- $valid = 0; +- } +- else { +- # still trusted +- } + } + next; + }diff --git a/sysc/curl-7.88.1/sources b/sysc/curl-7.88.1/sources@@ -0,0 +1 @@ +https://curl.se/download/curl-7.88.1.tar.bz2 8224b45cce12abde039c12dc0711b7ea85b104b9ad534d6e4c5b4e188a61c907diff --git a/sysc/init b/sysc/init@@ -43,7 +43,6 @@ install_tar binutils-2.30 0 install_tar bzip2-1.0.8 0 install_tar bison-3.4.1 2 install_tar coreutils-6.10 0 -install_tar curl-7.83.0 0 install_tar dhcpcd-9.4.1 0 install_tar diffutils-2.7 0 install_tar findutils-4.2.33 0diff --git a/sysc/run.sh b/sysc/run.sh@@ -36,6 +36,14 @@ create_fhs populate_device_nodes +if [ -e "${SOURCES}/distfiles" ]; then + mv "${SOURCES}/distfiles" / +else + mkdir -p "${DISTFILES}" +fi + +build curl-7.88.1 pass1.sh + # Obtain network connection if [ "${CHROOT}" = "False" ]; then dhcpcd --waitip=4 @@ -52,12 +60,6 @@ if [ "${CHROOT}" = "False" ]; then done fi -if [ -e "${SOURCES}/distfiles" ]; then - mv "${SOURCES}/distfiles" / -else - mkdir -p "${DISTFILES}" -fi - build bash-5.2.15 exec env -i PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash run2.shdiff --git a/sysc/run2.sh b/sysc/run2.sh@@ -58,7 +58,7 @@ build openssl-1.1.1l build ca-certificates-3.88.1 -build curl-7.83.0 +build curl-7.88.1 pass2.sh build zlib-1.2.13