mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-14 07:15:24 +01:00
Update curl to 7.88.1
Patches have been regenerated to update hunk line numbers
This commit is contained in:
parent
558630c559
commit
bc4ecd9ed4
16 changed files with 38 additions and 33 deletions
29
sysc/curl-7.88.1/curl-7.88.1.sh
Executable file
29
sysc/curl-7.88.1/curl-7.88.1.sh
Executable file
|
|
@ -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}" \
|
||||
--enable-ipv6 \
|
||||
--with-openssl \
|
||||
--with-ca-bundle=/etc/ssl/certs.pem \
|
||||
--build=i386-unknown-linux-musl
|
||||
}
|
||||
8
sysc/curl-7.88.1/files/sinus.pl
Normal file
8
sysc/curl-7.88.1/files/sinus.pl
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# 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;
|
||||
}
|
||||
62
sysc/curl-7.88.1/patches/help.patch
Normal file
62
sysc/curl-7.88.1/patches/help.patch
Normal file
|
|
@ -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;
|
||||
1
sysc/curl-7.88.1/sources
Normal file
1
sysc/curl-7.88.1/sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
http://curl.se/download/curl-7.88.1.tar.xz 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
|
||||
Loading…
Add table
Add a link
Reference in a new issue