webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 10:35:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

curl: Update to version 7.86.0

Browse Source 
- Update from version 7.84.0 to 7.86.0
- Update of rootfile
- curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch removed as this
   is now built into the source tarball version
- Changelog - is too large to inclkude here. The details can be found in the RELEASE_NOTES
   file in the source tarballs.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2022-11-25 09:51:25 +01:00
committed by Peter Müller
parent f07ddd9393
commit 8cb2214c3a
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/rootfiles/common/curl
View File

@@ -12,6 +12,7 @@ usr/bin/curl
#usr/include/curl/system.h
#usr/include/curl/typecheck-gcc.h
#usr/include/curl/urlapi.h
#usr/include/curl/websockets.h
#usr/lib/libcurl.la
#usr/lib/libcurl.so
usr/lib/libcurl.so.4
@@ -173,7 +174,6 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3
#usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3
#usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3
#usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3
#usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3
#usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3
#usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3
@@ -264,6 +264,7 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/CURLOPT_PROGRESSDATA.3
#usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3
#usr/share/man/man3/CURLOPT_PROTOCOLS.3
#usr/share/man/man3/CURLOPT_PROTOCOLS_STR.3
#usr/share/man/man3/CURLOPT_PROXY.3
#usr/share/man/man3/CURLOPT_PROXYAUTH.3
#usr/share/man/man3/CURLOPT_PROXYHEADER.3
@@ -304,6 +305,7 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/CURLOPT_READDATA.3
#usr/share/man/man3/CURLOPT_READFUNCTION.3
#usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3
#usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS_STR.3
#usr/share/man/man3/CURLOPT_REFERER.3
#usr/share/man/man3/CURLOPT_REQUEST_TARGET.3
#usr/share/man/man3/CURLOPT_RESOLVE.3
@@ -321,6 +323,7 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/CURLOPT_SASL_IR.3
#usr/share/man/man3/CURLOPT_SEEKDATA.3
#usr/share/man/man3/CURLOPT_SEEKFUNCTION.3
#usr/share/man/man3/CURLOPT_SERVER_RESPONSE_TIMEOUT.3
#usr/share/man/man3/CURLOPT_SERVICE_NAME.3
#usr/share/man/man3/CURLOPT_SHARE.3
#usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
@@ -398,6 +401,7 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/CURLOPT_WILDCARDMATCH.3
#usr/share/man/man3/CURLOPT_WRITEDATA.3
#usr/share/man/man3/CURLOPT_WRITEFUNCTION.3
#usr/share/man/man3/CURLOPT_WS_OPTIONS.3
#usr/share/man/man3/CURLOPT_XFERINFODATA.3
#usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3
#usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3
@@ -483,6 +487,9 @@ usr/lib/libcurl.so.4.8.0
#usr/share/man/man3/curl_url_strerror.3
#usr/share/man/man3/curl_version.3
#usr/share/man/man3/curl_version_info.3
#usr/share/man/man3/curl_ws_meta.3
#usr/share/man/man3/curl_ws_recv.3
#usr/share/man/man3/curl_ws_send.3
#usr/share/man/man3/libcurl-easy.3
#usr/share/man/man3/libcurl-env.3
#usr/share/man/man3/libcurl-errors.3

8
lfs/curl
View File

@@ -24,7 +24,7 @@
include Config
VER = 7.84.0
VER = 7.86.0
THISAPP = curl-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_BLAKE2 = 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1
$(DL_FILE)_BLAKE2 = a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce
install : $(TARGET)
@@ -70,10 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Incorporate upstream patch to fix build on armv6l
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--disable-ipv6 \

24
src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch
View File

@@ -1,24 +0,0 @@
commit e2e7f54b7bea521fa8373095d0f43261a720cda0
Author: Daniel Stenberg <daniel@haxx.se>
Date: Mon Jun 27 08:46:21 2022 +0200
easy_lock.h: include sched.h if available to fix build
Patched-by: Harry Sintonen
Closes #9054
diff --git a/lib/easy_lock.h b/lib/easy_lock.h
index 819f50ce8..1f54289ce 100644
--- a/lib/easy_lock.h
+++ b/lib/easy_lock.h
@@ -36,6 +36,9 @@
#elif defined (HAVE_ATOMIC)
#include <stdatomic.h>
+#if defined(HAVE_SCHED_YIELD)
+#include <sched.h>
+#endif
#define curl_simple_lock atomic_bool
#define CURL_SIMPLE_LOCK_INIT false