Skip to content

Commit

Permalink
bump curl
Browse files Browse the repository at this point in the history
  • Loading branch information
fda77 committed Nov 6, 2024
1 parent 2000c1a commit 2d0213f
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Latest changes
* BIND 9.11.37/9.20.3
* BusyBox 1.27.2/1.37.0
* CA-bundle 2024-09-24
* Curl 8.10.1
* Curl 8.11.0
* Dropbear 2024.86
* Git 2.47.0
* htpdate 2.0.0
Expand Down
2 changes: 1 addition & 1 deletion make/pkgs/curl/Config.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config FREETZ_PACKAGE_CURL
bool "Curl 8.10.1 (binary only)"
bool "Curl 8.11.0 (binary only)"
default n
select FREETZ_LIB_libcurl if ! FREETZ_PACKAGE_CURL_STATIC
help
Expand Down
4 changes: 2 additions & 2 deletions make/pkgs/curl/curl.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$(call PKG_INIT_BIN, 8.10.1)
$(call PKG_INIT_BIN, 8.11.0)
$(PKG)_LIB_VERSION:=4.8.0
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
$(PKG)_HASH:=73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee
$(PKG)_HASH:=db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
$(PKG)_SITE:=https://curl.se/download,https://curl.haxx.se/download
### WEBSITE:=https://curl.se/
### MANPAGE:=https://curl.se/docs/manpage.html
Expand Down
10 changes: 5 additions & 5 deletions make/pkgs/curl/patches/100-makefile_no_docs.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- Makefile.am
+++ Makefile.am
@@ -93,8 +93,8 @@
@@ -95,8 +95,8 @@

bin_SCRIPTS = curl-config

Expand All @@ -11,7 +11,7 @@

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
@@ -208,14 +208,11 @@
@@ -222,14 +222,11 @@
else
install-data-hook:
(cd include && $(MAKE) install)
Expand All @@ -28,9 +28,9 @@
@echo "generating a fresh ca-bundle.crt"
--- Makefile.in
+++ Makefile.in
@@ -630,8 +630,8 @@
$(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ)
@@ -635,8 +635,8 @@

DISTCLEANFILES = buildinfo.txt
bin_SCRIPTS = curl-config
-SUBDIRS = lib docs src scripts
-DIST_SUBDIRS = $(SUBDIRS) tests packages include docs
Expand All @@ -39,7 +39,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
LIB_VAUTH_CFILES = \
@@ -1768,13 +1768,10 @@
@@ -1786,13 +1786,10 @@
@BUILD_DOCS_TRUE@ (cd docs/libcurl && $(MAKE) install)
@BUILD_DOCS_FALSE@install-data-hook:
@BUILD_DOCS_FALSE@ (cd include && $(MAKE) install)
Expand Down
4 changes: 2 additions & 2 deletions make/pkgs/curl/patches/101-cross_compile_writable_argv.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--- configure
+++ configure
@@ -25169,7 +25169,9 @@
darwin*)
@@ -25306,7 +25306,9 @@
*-apple-*)
if test "$cross_compiling" = yes
then :
+ if test "${curl_cv_writable_argv+set}" != set; then :
Expand Down
2 changes: 1 addition & 1 deletion make/pkgs/curl/patches/102-binary_static.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/Makefile.in
+++ src/Makefile.in
@@ -239,7 +239,7 @@
@@ -251,7 +251,7 @@
libcurltool_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libcurltool_la_CFLAGS) $(CFLAGS) $(libcurltool_la_LDFLAGS) \
Expand Down
2 changes: 1 addition & 1 deletion make/pkgs/curl/patches/103-no_manual_compile_fix.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- src/tool_operate.c
+++ src/tool_operate.c
@@ -3187,9 +3187,11 @@
@@ -3175,9 +3175,11 @@
/* Check if we were asked for the help */
if(res == PARAM_HELP_REQUESTED)
tool_help(global->help_category);
Expand Down
2 changes: 1 addition & 1 deletion make/pkgs/curl/patches/110-gnu_source__reentrant.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- configure
+++ configure
@@ -3506,6 +3506,24 @@
@@ -3532,6 +3532,24 @@
## Main body of script. ##
## -------------------- ##

Expand Down
20 changes: 10 additions & 10 deletions make/pkgs/curl/patches/120-curl-config.patch
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
--- curl-config.in
+++ curl-config.in
@@ -29,6 +29,7 @@
# Used in @libdir@
# Used in 'libdir'
# shellcheck disable=SC2034
exec_prefix=@exec_prefix@
exec_prefix="@exec_prefix@"
+libdir=@libdir@
# shellcheck disable=SC2034
includedir=@includedir@
cppflag_curl_staticlib=@LIBCURL_PC_CFLAGS@
includedir="@includedir@"
cppflag_curl_staticlib='@LIBCURL_PC_CFLAGS@'
@@ -155,8 +156,8 @@
;;

--libs)
- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
- if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
- CURLLIBDIR="-L@libdir@ "
+ if test "X${libdir}" != "X/usr/lib" -a "X${libdir}" != "X/usr/lib64"; then
+ if test "X${libdir}" != 'X/usr/lib' -a "X${libdir}" != 'X/usr/lib64'; then
+ CURLLIBDIR="-L${libdir} "
else
CURLLIBDIR=""
CURLLIBDIR=''
fi
@@ -173,7 +174,7 @@

--static-libs)
if test "X@ENABLE_STATIC@" != "Xno" ; then
- echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
+ echo "${libdir}/libcurl.@libext@" @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@
if test 'X@ENABLE_STATIC@' != 'Xno'; then
- echo "@libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@"
+ echo "${libdir}/libcurl.@libext@ @LDFLAGS@ @LIBCURL_PC_LIBS_PRIVATE@"
else
echo 'curl was built with static libraries disabled' >&2
exit 1
4 changes: 2 additions & 2 deletions make/pkgs/curl/patches/130-CPPFLAGS_as_CFLAGS.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- configure
+++ configure
@@ -4356,13 +4356,16 @@
@@ -4382,13 +4382,16 @@
for xc_word in $CFLAGS; do
case "$xc_word" in
-D*)
Expand All @@ -20,7 +20,7 @@
;;
-rpath*)
xc_bad_var_cflags=yes
@@ -46907,13 +46910,16 @@
@@ -46501,13 +46504,16 @@
for xc_word in $CFLAGS; do
case "$xc_word" in
-D*)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- configure
+++ configure
@@ -18528,7 +18528,7 @@
@@ -18565,7 +18565,7 @@
GNU_C)
#
if test "$compiler_num" -ge "295"; then
Expand Down

1 comment on commit 2d0213f

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See for infos about curl and maybe a changelog link:
https://freetz-ng.github.io/freetz-ng/make/curl

Please sign in to comment.