andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update curl to 7.88.1 

Patches have been regenerated to update hunk line numbers
This commit is contained in:
Eduardo Sánchez Muñoz 2023-03-19 18:58:52 +01:00
parent 558630c559
commit bc4ecd9ed4
16 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parts.rst
View File

@ -625,7 +625,7 @@ make 3.82
GNU ``make`` is now rebuilt properly using the build system and GCC, which means that 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. it does not randomly segfault while building the Linux kernel.
curl 7.83.0 curl 7.88.1
=========== ===========
``curl`` is used to download files using various protocols including HTTP and HTTPS. ``curl`` is used to download files using various protocols including HTTP and HTTPS.
@ -829,7 +829,7 @@ openssl 1.1.1l
OpenSSL is a C library for secure communications/cryptography. OpenSSL is a C library for secure communications/cryptography.
curl 7.83.0 curl 7.88.1
=========== ===========
We rebuild curl with support for OpenSSL. We rebuild curl with support for OpenSSL.

4
sysa/SHA256SUMS.pkgs
View File

@ -35,8 +35,8 @@ c511d571d24675a141258e0e198c5ed1bcfd4889ddd736ff8e25c0d97b44e2cf ca-certificate
0d02d37d02d6def11b5f12eab5d97f47dc1e4abd53627deb2d99994e1ab9c6a8 coreutils-5.0_0.tar.bz2 0d02d37d02d6def11b5f12eab5d97f47dc1e4abd53627deb2d99994e1ab9c6a8 coreutils-5.0_0.tar.bz2
27d0d3e84794f080f01c7c22547a308d1d781d8ce85d5b3f682c379f17bbeb47 coreutils-6.10_0.tar.bz2 27d0d3e84794f080f01c7c22547a308d1d781d8ce85d5b3f682c379f17bbeb47 coreutils-6.10_0.tar.bz2
e41aba2caa7514704731d3b7a49f63ff8ffb2d22a64f14afdbaadbd0b24073f0 coreutils-8.32_0.tar.bz2 e41aba2caa7514704731d3b7a49f63ff8ffb2d22a64f14afdbaadbd0b24073f0 coreutils-8.32_0.tar.bz2
ea4b7a5bc7b152731d2d17f355725f8b683341803e89044a78be73a140fe64db curl-7.83.0_0.tar.bz2 8df7fe3124243028cc9fd9a00fe8ab55c2143a9b7551426447867d2e1de436b6 curl-7.88.1_0.tar.bz2
c16709184a6ec2312746242379065f71fcbd7165749c9d58a9b0846f4bfc5dc0 curl-7.83.0_1.tar.bz2 8f8442bc11c2c70028da083a42f5bf819bb57a452c8f41e988d980e6b561dca2 curl-7.88.1_1.tar.bz2
0b832d3efef962c10b61559052373267e9c85bbff37572b736a6996823e2d5b2 dhcpcd-9.4.1_0.tar.bz2 0b832d3efef962c10b61559052373267e9c85bbff37572b736a6996823e2d5b2 dhcpcd-9.4.1_0.tar.bz2
f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534 diffutils-2.7_0.tar.bz2 f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534 diffutils-2.7_0.tar.bz2
bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2

1
sysa/curl-7.83.0/sources
View File

@ -1 +0,0 @@
https://curl.se/download/curl-7.83.0.tar.bz2 247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96

9
sysa/curl-7.83.0/curl-7.83.0.sh → sysa/curl-7.88.1/curl-7.88.1.sh
View File

@ -6,11 +6,16 @@ src_prepare() {
default default
# Regnerate src/tool_cb_prg.c # Regnerate src/tool_cb_prg.c
sed -i "53,74d" src/tool_cb_prg.c sed -i "55,76d" src/tool_cb_prg.c
sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" 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 rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c
# configure.ac uses the AM_COND_IF macro, which is not supported
# by automake 1.10. The place where it is used is only relevant
# for windows builds, so we can simply patch it away.
sed -i "659,662d" configure.ac
# Rebuild libtool files # Rebuild libtool files
rm config.guess config.sub ltmain.sh rm config.guess config.sub ltmain.sh
libtoolize libtoolize

0
sysa/curl-7.83.0/files/sinus.pl → sysa/curl-7.88.1/files/sinus.pl
View File

18
sysa/curl-7.83.0/patches/help.patch → sysa/curl-7.88.1/patches/help.patch
View File

@ -5,10 +5,10 @@
Regenerating help is not trivial. Help is unnecessary. Regenerating help is not trivial. Help is unnecessary.
Disable help. Disable help.
diff --color -ru src/Makefile.inc src/Makefile.inc diff -ru src/Makefile.inc src/Makefile.inc
--- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000 --- src/Makefile.inc
+++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000 +++ src/Makefile.inc
@@ -69,11 +69,9 @@ @@ -70,11 +70,9 @@
tool_formparse.c \ tool_formparse.c \
tool_getparam.c \ tool_getparam.c \
tool_getpass.c \ tool_getpass.c \
@ -28,10 +28,10 @@ diff --color -ru src/Makefile.inc src/Makefile.inc
tool_helpers.h \ tool_helpers.h \
tool_hugehelp.h \ tool_hugehelp.h \
tool_libinfo.h \ tool_libinfo.h \
diff --color -ru src/tool_operate.c src/tool_operate.c diff -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
+++ src/tool_operate.c 2022-05-09 16:54:00.696271863 +1000 +++ src/tool_operate.c
@@ -78,7 +78,6 @@ @@ -80,7 +80,6 @@
#include "tool_writeout.h" #include "tool_writeout.h"
#include "tool_xattr.h" #include "tool_xattr.h"
#include "tool_vms.h" #include "tool_vms.h"
@ -39,7 +39,7 @@ diff --color -ru src/tool_operate.c src/tool_operate.c
#include "tool_hugehelp.h" #include "tool_hugehelp.h"
#include "tool_progress.h" #include "tool_progress.h"
#include "dynbuf.h" #include "dynbuf.h"
@@ -2607,19 +2606,7 @@ @@ -2703,19 +2702,7 @@
if(res) { if(res) {
result = CURLE_OK; result = CURLE_OK;

4
sysa/curl-7.83.0/patches/timeless-mk-ca-bundle.patch → sysa/curl-7.88.1/patches/timeless-mk-ca-bundle.patch
View File

@ -8,7 +8,7 @@ reproducible bundles.
diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl
--- scripts/mk-ca-bundle.pl --- scripts/mk-ca-bundle.pl
+++ scripts/mk-ca-bundle.pl +++ scripts/mk-ca-bundle.pl
@@ -497,19 +497,7 @@ @@ -499,19 +499,7 @@
if($main_block) { if($main_block) {
push @precert, $_ if not /^#$/; push @precert, $_ if not /^#$/;
if(/^# Not Valid After : (.*)/) { if(/^# Not Valid After : (.*)/) {
@ -29,7 +29,7 @@ diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl
} }
} }
next; next;
@@ -571,24 +559,6 @@ @@ -573,24 +561,6 @@
if($timestamp[12] ne "Z") { if($timestamp[12] ne "Z") {
report "distrust date stamp is not using UTC"; report "distrust date stamp is not using UTC";
} }

1
sysa/curl-7.88.1/sources Normal file
View File

@ -0,0 +1 @@
https://curl.se/download/curl-7.88.1.tar.bz2 8224b45cce12abde039c12dc0711b7ea85b104b9ad534d6e4c5b4e188a61c907

2
sysa/run2.sh
View File

@ -69,7 +69,7 @@ build kbd-1.15
build make-3.82 build make-3.82
build curl-7.83.0 build curl-7.88.1
build ed-1.4 build ed-1.4

1
sysc/curl-7.83.0/sources
View File

@ -1 +0,0 @@
http://curl.se/download/curl-7.83.0.tar.xz bbff0e6b5047e773f3c3b084d80546cc1be4e354c09e419c2d0ef6116253511a

4
sysc/curl-7.83.0/curl-7.83.0.sh → sysc/curl-7.88.1/curl-7.88.1.sh
View File

@ -6,8 +6,8 @@ src_prepare() {
default default
# Regnerate src/tool_cb_prg.c # Regnerate src/tool_cb_prg.c
sed -i "53,74d" src/tool_cb_prg.c sed -i "55,76d" src/tool_cb_prg.c
sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" 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 rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c

0
sysc/curl-7.83.0/files/sinus.pl → sysc/curl-7.88.1/files/sinus.pl
View File

18
sysc/curl-7.83.0/patches/help.patch → sysc/curl-7.88.1/patches/help.patch
View File

@ -5,10 +5,10 @@
Regenerating help is not trivial. Help is unnecessary. Regenerating help is not trivial. Help is unnecessary.
Disable help. Disable help.
diff --color -ru src/Makefile.inc src/Makefile.inc diff -ru src/Makefile.inc src/Makefile.inc
--- src/Makefile.inc 2022-05-09 16:48:37.195346967 +1000 --- src/Makefile.inc
+++ src/Makefile.inc 2022-05-09 16:49:46.503187644 +1000 +++ src/Makefile.inc
@@ -69,11 +69,9 @@ @@ -70,11 +70,9 @@
tool_formparse.c \ tool_formparse.c \
tool_getparam.c \ tool_getparam.c \
tool_getpass.c \ tool_getpass.c \
@ -28,10 +28,10 @@ diff --color -ru src/Makefile.inc src/Makefile.inc
tool_helpers.h \ tool_helpers.h \
tool_hugehelp.h \ tool_hugehelp.h \
tool_libinfo.h \ tool_libinfo.h \
diff --color -ru src/tool_operate.c src/tool_operate.c diff -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
+++ src/tool_operate.c 2022-05-09 16:54:00.696271863 +1000 +++ src/tool_operate.c
@@ -78,7 +78,6 @@ @@ -80,7 +80,6 @@
#include "tool_writeout.h" #include "tool_writeout.h"
#include "tool_xattr.h" #include "tool_xattr.h"
#include "tool_vms.h" #include "tool_vms.h"
@ -39,7 +39,7 @@ diff --color -ru src/tool_operate.c src/tool_operate.c
#include "tool_hugehelp.h" #include "tool_hugehelp.h"
#include "tool_progress.h" #include "tool_progress.h"
#include "dynbuf.h" #include "dynbuf.h"
@@ -2607,19 +2606,7 @@ @@ -2703,19 +2702,7 @@
if(res) { if(res) {
result = CURLE_OK; result = CURLE_OK;

1
sysc/curl-7.88.1/sources Normal file
View File

@ -0,0 +1 @@
http://curl.se/download/curl-7.88.1.tar.xz 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f

2
sysc/init
View File

@ -43,7 +43,7 @@ install_tar binutils-2.30 0
install_tar bzip2-1.0.8 0 install_tar bzip2-1.0.8 0
install_tar bison-3.4.1 2 install_tar bison-3.4.1 2
install_tar coreutils-6.10 0 install_tar coreutils-6.10 0
install_tar curl-7.83.0 0 install_tar curl-7.88.1 0
install_tar dhcpcd-9.4.1 0 install_tar dhcpcd-9.4.1 0
install_tar diffutils-2.7 0 install_tar diffutils-2.7 0
install_tar findutils-4.2.33 0 install_tar findutils-4.2.33 0

2
sysc/run2.sh
View File

@ -58,7 +58,7 @@ build openssl-1.1.1l
build ca-certificates-3.88.1 build ca-certificates-3.88.1
build curl-7.83.0 build curl-7.88.1
build zlib-1.2.13 build zlib-1.2.13