diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index 12741306e..03ef4f895 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -31,12 +31,12 @@ f7437edc081071cc3ecd3384abf4c63f33183858b8cae6b4ac3105c66f88b3b6 bison-3.4.1_1. 8064a96c8ccfbab1245554ac30e68fcc73da24a3dd02f8450658fdb106c7f405 bison-3.4.1_2.tar.bz2 f4df527ee598ebc64d5c93639307a8d325b93dad510001cccd2df02692a26cdf bison-3.4.2_0.tar.bz2 e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447 bzip2-1.0.8_0.tar.bz2 -96b6b91e1d3c5f48da471f10dd22415fa05baacaafe964cc86285493d0ca27ce ca-certificates-3.99_0.tar.bz2 +fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98 ca-certificates-3.99_0.tar.bz2 982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2 coreutils-5.0_0.tar.bz2 27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2 22d4dcf97bc9caf36f2abc4fbfc2f40d13a0be2db2efce913b09a00461db7a06 coreutils-9.4_0.tar.bz2 -aef1f09e2abd39cca760f186569a0e71bc11a20a79f06ee5802f788dd6a3ff58 curl-8.5.0_0.tar.bz2 -6e0d69e6bfbaf9520036b9ee362764ab791a0526df7a6639d9cc9de32d0becea curl-8.5.0_1.tar.bz2 +c0ab68a12ff82cb2b65b9c480281b70441ee14ef9bfe93605d1d5852379dbbaf curl-8.12.1_0.tar.bz2 +ea841c92382860d3618368b86510514ed7d717c64625740e70baba2508e182c4 curl-8.12.1_1.tar.bz2 fedf6ffbd37b14e9a0c94cd3063c6ac5d38f13be8a3399093ec112f9cd9d0816 dhcpcd-10.0.1_0.tar.bz2 0462b6a04899a98d60c33f9d16fa00e2e6b7c21cc80ccebc8358fc08105467a2 diffutils-2.7_0.tar.bz2 fc850c6f141717ccece106592f6a8edc0cae0d5e9f0968f111455d00072541b6 diffutils-3.10_0.tar.bz2 diff --git a/steps/curl-8.5.0/files/sinus.pl b/steps/curl-8.12.1/files/sinus.pl similarity index 100% rename from steps/curl-8.5.0/files/sinus.pl rename to steps/curl-8.12.1/files/sinus.pl diff --git a/steps/curl-8.12.1/pass1.sh b/steps/curl-8.12.1/pass1.sh new file mode 100755 index 000000000..e6f2942e9 --- /dev/null +++ b/steps/curl-8.12.1/pass1.sh @@ -0,0 +1,58 @@ +# SPDX-FileCopyrightText: 2022,2025 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # 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?! + chmod 755 scripts/managen scripts/cd2nroff + + # This one doesn't compile properly + touch docs/libcurl/libcurl-symbols.md docs/libcurl/libcurl-symbols.3 + + 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 \ + --without-libpsl \ + --disable-hsts +} + +src_compile() { + # Recreate tool_help.h + sed '/bitmask output/{n; n; n; n; q}' src/tool_help.h > src/tool_help.h.new + make -s -C docs/cmdline-opts listcats >> src/tool_help.h.new + sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new + mv src/tool_help.h.new src/tool_help.h + + # tool_listhelp.c & easyoptions.c + make -C src listhelp + make -C lib optiontable + + default +} + +src_install() { + default + install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle" +} diff --git a/steps/curl-8.12.1/pass2.sh b/steps/curl-8.12.1/pass2.sh new file mode 100755 index 000000000..22e305194 --- /dev/null +++ b/steps/curl-8.12.1/pass2.sh @@ -0,0 +1,45 @@ +# SPDX-FileCopyrightText: 2022 fosslinux +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + # 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 + + 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 \ + --without-libpsl \ + --with-ca-bundle=/etc/ssl/certs.pem +} + +src_compile() { + # Recreate tool_help.h + sed '/bitmask output/{n; n; n; n; q}' src/tool_help.h > src/tool_help.h.new + make -s -C docs/cmdline-opts listcats >> src/tool_help.h.new + sed '1,/CURLHELP_VERBOSE/d' src/tool_help.h >> src/tool_help.h.new + mv src/tool_help.h.new src/tool_help.h + + # tool_listhelp.c and easyoptions.c + make -C src listhelp + make -C lib optiontable + + default +} diff --git a/steps/curl-8.12.1/patches/timeless-mk-ca-bundle.patch b/steps/curl-8.12.1/patches/timeless-mk-ca-bundle.patch new file mode 100644 index 000000000..234367410 --- /dev/null +++ b/steps/curl-8.12.1/patches/timeless-mk-ca-bundle.patch @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz +# +# 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; diff --git a/steps/curl-8.12.1/sources b/steps/curl-8.12.1/sources new file mode 100644 index 000000000..391fa52fc --- /dev/null +++ b/steps/curl-8.12.1/sources @@ -0,0 +1 @@ +https://curl.se/download/curl-8.12.1.tar.xz 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202 diff --git a/steps/curl-8.5.0/pass1.sh b/steps/curl-8.5.0/pass1.sh deleted file mode 100755 index 0590d1fe0..000000000 --- a/steps/curl-8.5.0/pass1.sh +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - # Regnerate src/tool_cb_prg.c - sed -i "57,78d" src/tool_cb_prg.c - sed -i "57 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/steps/curl-8.5.0/pass2.sh b/steps/curl-8.5.0/pass2.sh deleted file mode 100755 index efc3339c2..000000000 --- a/steps/curl-8.5.0/pass2.sh +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - # Regnerate src/tool_cb_prg.c - sed -i "57,78d" src/tool_cb_prg.c - sed -i "57 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/steps/curl-8.5.0/patches/help.patch b/steps/curl-8.5.0/patches/help.patch deleted file mode 100644 index 87119258d..000000000 --- a/steps/curl-8.5.0/patches/help.patch +++ /dev/null @@ -1,63 +0,0 @@ -# SPDX-FileCopyrightText: 2022 fosslinux -# -# SPDX-License-Identifier: curl - -Regenerating help is not trivial. Help is unnecessary. -Disable help. - -diff -ru src/Makefile.inc src/Makefile.inc ---- curl-8.5.0/src/Makefile.inc -+++ curl-8.5.0/src/Makefile.inc -@@ -76,12 +76,10 @@ - tool_formparse.c \ - tool_getparam.c \ - tool_getpass.c \ -- tool_help.c \ - tool_helpers.c \ - tool_hugehelp.c \ - tool_ipfs.c \ - tool_libinfo.c \ -- tool_listhelp.c \ - tool_main.c \ - tool_msgs.c \ - tool_operate.c \ -@@ -120,7 +118,6 @@ - tool_formparse.h \ - tool_getparam.h \ - tool_getpass.h \ -- tool_help.h \ - tool_helpers.h \ - tool_hugehelp.h \ - tool_ipfs.h \ -diff -ru src/tool_operate.c src/tool_operate.c ---- curl-8.5.0/src/tool_operate.c -+++ curl-8.5.0/src/tool_operate.c -@@ -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 "tool_ipfs.h" -@@ -2746,19 +2745,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/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch b/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch deleted file mode 100644 index 0dd1c11ab..000000000 --- a/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch +++ /dev/null @@ -1,56 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Eduardo Sánchez Muñoz -# -# 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.5.0/scripts/mk-ca-bundle.pl -+++ curl-8.5.0/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/steps/curl-8.5.0/sources b/steps/curl-8.5.0/sources deleted file mode 100644 index 0f78089c6..000000000 --- a/steps/curl-8.5.0/sources +++ /dev/null @@ -1 +0,0 @@ -https://curl.se/download/curl-8.5.0.tar.xz 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb diff --git a/steps/manifest b/steps/manifest index a233d83f6..6858cc0b8 100644 --- a/steps/manifest +++ b/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.5.0 +build: curl-8.12.1 improve: get_network ( CHROOT == False ) build: bash-5.2.15 improve: open_console ( CONSOLES == True ) @@ -162,7 +162,7 @@ uninstall: perl-5.6.2 perl-5.10.1 build: libarchive-3.5.2 build: openssl-3.0.13 build: ca-certificates-3.99 -build: curl-8.5.0 +build: curl-8.12.1 build: zlib-1.2.13 build: automake-1.16.3 build: autoconf-2.71