From acd828725bb9f9619f09b0a854e9d3e4bad2289b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 2 Apr 2025 08:42:33 +0000 Subject: [PATCH] mingw-w64-curl: update to 8.13.0 Signed-off-by: Johannes Schindelin --- .../0001-Make-cURL-relocatable.patch | 38 +++++++++---------- ...tion-work-inside-libexec-git-core-an.patch | 6 +-- mingw-w64-curl/PKGBUILD | 8 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/mingw-w64-curl/0001-Make-cURL-relocatable.patch b/mingw-w64-curl/0001-Make-cURL-relocatable.patch index 3d8cbca89310c..76537bd6343bc 100644 --- a/mingw-w64-curl/0001-Make-cURL-relocatable.patch +++ b/mingw-w64-curl/0001-Make-cURL-relocatable.patch @@ -1,4 +1,4 @@ -From 2b2ba58fedbded8de6879fa89719196480708661 Mon Sep 17 00:00:00 2001 +From ff09ed1ebf7621d89007f56d472ec6390d8ed9ed Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 22 Feb 2017 11:03:04 +0100 Subject: [PATCH 1/2] Make cURL relocatable @@ -29,10 +29,10 @@ Signed-off-by: Johannes Schindelin 4 files changed, 44 insertions(+) diff --git a/configure.ac b/configure.ac -index a4ea9f72d..166f370f6 100644 +index 7f5a2bff5..51653a12b 100644 --- a/configure.ac +++ b/configure.ac -@@ -3608,6 +3608,7 @@ dnl default includes +@@ -3952,6 +3952,7 @@ dnl default includes ] ) @@ -41,10 +41,10 @@ index a4ea9f72d..166f370f6 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/lib/Makefile.inc b/lib/Makefile.inc -index 66680f3ad..1772f7696 100644 +index a8e4da1cf..147500bf6 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc -@@ -197,6 +197,7 @@ LIB_CFILES = \ +@@ -204,6 +204,7 @@ LIB_CFILES = \ noproxy.c \ openldap.c \ parsedate.c \ @@ -52,7 +52,7 @@ index 66680f3ad..1772f7696 100644 pingpong.c \ pop3.c \ progress.c \ -@@ -333,6 +334,7 @@ LIB_HFILES = \ +@@ -343,6 +344,7 @@ LIB_HFILES = \ nonblock.h \ noproxy.h \ parsedate.h \ @@ -61,12 +61,12 @@ index 66680f3ad..1772f7696 100644 pop3.h \ progress.h \ diff --git a/lib/curl_config.h.in b/lib/curl_config.h.in -index 50e075947..6c540bb25 100644 +index b4754f3e2..608903328 100644 --- a/lib/curl_config.h.in +++ b/lib/curl_config.h.in -@@ -15,6 +15,9 @@ - /* Location of default ca path */ - #undef CURL_CA_PATH +@@ -12,6 +12,9 @@ + /* If safe CA bundle search is enabled */ + #undef CURL_CA_SEARCH_SAFE +/* Location of executable */ +#undef CURL_BINDIR @@ -75,24 +75,24 @@ index 50e075947..6c540bb25 100644 #undef CURL_DEFAULT_SSL_BACKEND diff --git a/lib/url.c b/lib/url.c -index 2814d31ad..e7175be03 100644 +index 2125a97af..944f10e68 100644 --- a/lib/url.c +++ b/lib/url.c -@@ -119,6 +119,9 @@ - #include "altsvc.h" +@@ -120,6 +120,9 @@ #include "dynbuf.h" #include "headers.h" + #include "strparse.h" +#if defined(__MINGW32__) +#include "pathtools.h" +#endif - /* The last 3 #include files should be in this order */ #include "curl_printf.h" -@@ -436,22 +439,57 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) + #include "curl_memory.h" +@@ -430,22 +433,57 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) if(Curl_ssl_backend() != CURLSSLBACKEND_SCHANNEL && Curl_ssl_backend() != CURLSSLBACKEND_SECURETRANSPORT) { - #if defined(CURL_CA_BUNDLE) -+#if defined(__MINGW32__) + #ifdef CURL_CA_BUNDLE ++#ifdef __MINGW32__ + const size_t path_max = PATH_MAX; + char relocated_bundle[path_max]; + get_dll_path(relocated_bundle, path_max); @@ -120,8 +120,8 @@ index 2814d31ad..e7175be03 100644 return result; #endif #endif - #if defined(CURL_CA_PATH) -+#if defined(__MINGW32__) + #ifdef CURL_CA_PATH ++#ifdef __MINGW32__ + const size_t path_max = PATH_MAX; + char relocated_ca_path[path_max]; + get_dll_path(relocated_ca_path, path_max); diff --git a/mingw-w64-curl/0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch b/mingw-w64-curl/0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch index 0821ceebbfae2..fbb47a5a0dbe4 100644 --- a/mingw-w64-curl/0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch +++ b/mingw-w64-curl/0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch @@ -1,4 +1,4 @@ -From 7a53608fcbab8de7f8a725c6ea99a58086b2f6c6 Mon Sep 17 00:00:00 2001 +From d762df33fbdb126aea628485c95027d79f2cbb68 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 31 Oct 2018 10:52:59 +0100 Subject: [PATCH 2/2] Hack: make relocation work inside libexec/git-core/ and @@ -30,10 +30,10 @@ Signed-off-by: Johannes Schindelin 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/url.c b/lib/url.c -index e7175be03..d46adbaa8 100644 +index 944f10e68..8762e597b 100644 --- a/lib/url.c +++ b/lib/url.c -@@ -445,10 +445,29 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) +@@ -439,10 +439,29 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) get_dll_path(relocated_bundle, path_max); strip_n_suffix_folders(relocated_bundle, 1); strncat(relocated_bundle, "/", path_max - 1); diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD index e1925119871e9..527361d29e552 100644 --- a/mingw-w64-curl/PKGBUILD +++ b/mingw-w64-curl/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls" "${MINGW_PACKAGE_PREFIX}-${_realname}-winssl") -pkgver=8.12.1 +pkgver=8.13.0 pkgrel=1 pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)" arch=('any') @@ -36,12 +36,12 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//. "pathtools.h" "0001-Make-cURL-relocatable.patch" "0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch") -sha256sums=('18681d84e2791183e0e5e4650ccb2a080c1f3a4e57ed2fbc2457228579d68269' +sha256sums=('e0d20499260760f9865cb6308928223f4e5128910310c025112f592a168e1473' 'SKIP' '08209cbf1633fa92eae7e5d28f95f8df9d6184cc20fa878c99aec4709bb257fd' '965d3921ec4fdeec94a2718bc2c85ce5e1a00ea0e499330a554074a7ae15dfc6' - 'd34c9474a0b54d36497e58b4792699ef37cc8b043a4cd5daf287e1e33f660207' - '418b5619b924d17ac71066323b5540d86d4e8055cabab925ece185770e9d1906') + '40be5c358cc44684b27ed1d18fd0736e70ab10125f6355a54dec30f152a6e11c' + 'd0db1c981d1158872ff8681f0984da1ebbaa96be9538d808d0eed8abffe2d46c') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg if test -z "$WITHOUT_ALTERNATES"