mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
curl: update + remove pregened files
This commit is contained in:
parent
04a4b8aba4
commit
2e18c35df8
10 changed files with 51 additions and 51 deletions
|
|
@ -37,8 +37,8 @@ fd65c11422588984bc3a440b1fd9d022307a200de182cfedfe3387a09cbece98 ca-certificate
|
|||
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
|
||||
0eaf75d94319db6fa7792ef55f5124c6ce230aadecf8f019b04f2217408043fd curl-8.12.1_1.tar.bz2
|
||||
912a256dd9a17deb6b48d1fe4c435313b242fa3bb63afef726e7c8ebe0b6a8ca curl-8.17.0_0.tar.bz2
|
||||
2bbaf310049e1f66198512f4722b6fdcf99735dcb19b16d40371942d24bd720e 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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -1 +0,0 @@
|
|||
f https://curl.se/download/curl-8.12.1.tar.xz 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202
|
||||
|
|
@ -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?!
|
||||
|
|
@ -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
|
||||
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
|
||||
autoreconf-2.71 -fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
31
steps/curl-8.17.0/patches/timeless-mk-ca-bundle.patch
Normal file
31
steps/curl-8.17.0/patches/timeless-mk-ca-bundle.patch
Normal file
|
|
@ -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;
|
||||
1
steps/curl-8.17.0/sources
Normal file
1
steps/curl-8.17.0/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
f https://curl.se/download/curl-8.17.0.tar.xz 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992
|
||||
|
|
@ -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 )
|
||||
|
|
@ -189,7 +189,7 @@ uninstall: perl-5.6.2 perl-5.8.9
|
|||
build: libarchive-3.5.2
|
||||
build: openssl-3.0.13
|
||||
build: ca-certificates-3.99
|
||||
build: curl-8.12.1
|
||||
build: curl-8.17.0
|
||||
build: patch-2.7.6
|
||||
build: gettext-0.21
|
||||
build: texinfo-6.7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue