commit: 133c05426c2133c60bdb0b42c1dda64b3bc6bb7d
parent 43df581f689b137430bfb1773c162f91d90707f3
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Mon, 1 Jan 2024 21:41:39 +0000
Merge pull request #384 from eduardosm/update-curl
Update curl to 8.5.0
Diffstat:
14 files changed, 136 insertions(+), 135 deletions(-)
diff --git a/parts.rst b/parts.rst
@@ -785,8 +785,8 @@ musl 1.2.4
At this point, it is guaranteed that we are running on Linux with thread support,
so we rebuild musl with thread support.
-curl 7.88.1
-===========
+curl 8.5.0
+==========
``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
@@ -927,8 +927,8 @@ openssl 1.1.1l
OpenSSL is a C library for secure communications/cryptography.
-curl 7.88.1
-===========
+curl 8.5.0
+==========
We rebuild curl with support for OpenSSL.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -35,8 +35,8 @@ e196396a3073992ca4d8ce1606831e3a6e06fd22753f89b778eec01eed549a92 bzip2-1.0.8_0.
692ec3f83fdd94a3687c764e6246f608e4600bc8f9fec953a0b23617ad24d08d coreutils-5.0_0.tar.bz2
09092e187588c5d33c023ac41671b367aef9f7ee967d2c7c03430b33cc03f251 coreutils-6.10_0.tar.bz2
f49900486ae7f0c8107d729b71ede155ee44544cdf8d562b50fbea4095bd05b2 coreutils-8.32_0.tar.bz2
-a133ec4b2c1c913821743a97bbb6e6842d67999c12c09dc821014c4e0661c365 curl-7.88.1_0.tar.bz2
-2afc7d5f899a43807003f743ba2f173bbc14de836bd14f89d3991c73b56b37d8 curl-7.88.1_1.tar.bz2
+6a10f5258650ae75e92eb7aa1a5e6107b72c8b6419a4f64272262a1545c43161 curl-8.5.0_0.tar.bz2
+f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e curl-8.5.0_1.tar.bz2
1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627 dhcpcd-10.0.1_0.tar.bz2
c4008ae6b168aee4120b0f3624a1875f9e413d8f0c637708b8b04a1fb5be173c diffutils-2.7_0.tar.bz2
bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1 dist-3.5-236_0.tar.bz2
diff --git a/steps/curl-7.88.1/pass1.sh b/steps/curl-7.88.1/pass1.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 "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/steps/curl-7.88.1/pass2.sh b/steps/curl-7.88.1/pass2.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 "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/steps/curl-7.88.1/patches/help.patch b/steps/curl-7.88.1/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 -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/steps/curl-7.88.1/sources b/steps/curl-7.88.1/sources
@@ -1 +0,0 @@
-https://curl.se/download/curl-7.88.1.tar.bz2 8224b45cce12abde039c12dc0711b7ea85b104b9ad534d6e4c5b4e188a61c907
diff --git a/steps/curl-7.88.1/files/sinus.pl b/steps/curl-8.5.0/files/sinus.pl
diff --git a/steps/curl-8.5.0/pass1.sh b/steps/curl-8.5.0/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 "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
@@ -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 "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
@@ -0,0 +1,63 @@
+# 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
+@@ -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
+--- src/tool_operate.c
++++ 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-7.88.1/patches/timeless-mk-ca-bundle.patch b/steps/curl-8.5.0/patches/timeless-mk-ca-bundle.patch
diff --git a/steps/curl-8.5.0/sources b/steps/curl-8.5.0/sources
@@ -0,0 +1 @@
+https://curl.se/download/curl-8.5.0.tar.bz2 ce4b6a6655431147624aaf582632a36fe1ade262d5fab385c60f78942dd8d87b
diff --git a/steps/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt b/steps/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt
@@ -174,4 +174,4 @@
/external/distfiles/v2.0.22.tar.gz
/external/distfiles/linux-4.9.10.tar.gz
/external/distfiles/deblob-4.9
-/external/distfiles/curl-7.88.1.tar.bz2
+/external/distfiles/curl-8.5.0.tar.bz2
diff --git a/steps/manifest b/steps/manifest
@@ -120,7 +120,7 @@ jump: break ( INTERNAL_CI == pass1 )
jump: linux ( CHROOT == False )
improve: finalize_fhs
build: musl-1.2.4
-build: curl-7.88.1
+build: curl-8.5.0
improve: populate_device_nodes
jump: move_disk ( KERNEL_BOOTSTRAP == True )
improve: get_network ( CHROOT == False )
@@ -145,7 +145,7 @@ build: perl-5.32.1
build: libarchive-3.5.2
build: openssl-1.1.1l
build: ca-certificates-3.95
-build: curl-7.88.1
+build: curl-8.5.0
build: zlib-1.2.13
build: automake-1.16.3
build: autoconf-2.71
