From 7bb078f26ce3cd66159de3c166060b7db9d35c83 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 22 May 2024 14:02:36 +0200 Subject: [PATCH 1/2] curl: drop backport of the chunked POST bugfix We backported this preemptively, to unbreak Git. Now that an official cURL version is out that has this fix (v8.8.0), the backport is not only no longer necessary, it would now prevent the build from succeeding... So let's back out that extra patch. This reverts commit e5725f2db (curl: backport chunked POST bugfix, 2024-04-10). Signed-off-by: Johannes Schindelin --- mingw-w64-curl/PKGBUILD | 3 --- 1 file changed, 3 deletions(-) diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD index dcfdf5eb4516a..d6879b679cc17 100644 --- a/mingw-w64-curl/PKGBUILD +++ b/mingw-w64-curl/PKGBUILD @@ -32,14 +32,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zstd") options=('staticlibs') source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//./_}/${_realname}-${pkgver}.tar.bz2"{,.asc} - "https://github.com/curl/curl/commit/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch" "pathtools.c" "pathtools.h" "0001-Make-cURL-relocatable.patch" "0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch") sha256sums=('05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76' 'SKIP' - '4fbd9dc2582f141f7c839a0b9080a85014ffac36c9fc9358cbab7b004fb57820' '08209cbf1633fa92eae7e5d28f95f8df9d6184cc20fa878c99aec4709bb257fd' '965d3921ec4fdeec94a2718bc2c85ce5e1a00ea0e499330a554074a7ae15dfc6' '64cbbea0a6b273b2008a08479ea8736fb4917225d434f3c08da2560318393de0' @@ -92,7 +90,6 @@ prepare() { cp -fHv "${srcdir}"/pathtools.[ch] lib/ apply_patch_with_msg \ - 721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ 0001-Make-cURL-relocatable.patch \ 0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch From af6208f9a80649739318e4c660a92d7f00b0deb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= Date: Wed, 22 May 2024 10:54:28 +0000 Subject: [PATCH 2/2] mingw-w64-curl: update to 8.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Aßhauer --- .../0001-Make-cURL-relocatable.patch | 36 ++++++++++--------- ...tion-work-inside-libexec-git-core-an.patch | 6 ++-- mingw-w64-curl/PKGBUILD | 8 ++--- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/mingw-w64-curl/0001-Make-cURL-relocatable.patch b/mingw-w64-curl/0001-Make-cURL-relocatable.patch index 1cc6af0be8c4f..3d8cbca89310c 100644 --- a/mingw-w64-curl/0001-Make-cURL-relocatable.patch +++ b/mingw-w64-curl/0001-Make-cURL-relocatable.patch @@ -1,4 +1,4 @@ -From fa3ce34b932e40f52b614409349be0bdef6fc197 Mon Sep 17 00:00:00 2001 +From 2b2ba58fedbded8de6879fa89719196480708661 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 @@ -25,14 +25,14 @@ Signed-off-by: Johannes Schindelin configure.ac | 1 + lib/Makefile.inc | 2 ++ lib/curl_config.h.in | 3 +++ - lib/url.c | 37 +++++++++++++++++++++++++++++++++++++ - 4 files changed, 43 insertions(+) + lib/url.c | 38 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 44 insertions(+) diff --git a/configure.ac b/configure.ac -index a889919fe..626684867 100644 +index a4ea9f72d..166f370f6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3457,6 +3457,7 @@ dnl default includes +@@ -3608,6 +3608,7 @@ dnl default includes ] ) @@ -41,10 +41,10 @@ index a889919fe..626684867 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/lib/Makefile.inc b/lib/Makefile.inc -index 663190a19..b7d597e80 100644 +index 66680f3ad..1772f7696 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc -@@ -186,6 +186,7 @@ LIB_CFILES = \ +@@ -197,6 +197,7 @@ LIB_CFILES = \ noproxy.c \ openldap.c \ parsedate.c \ @@ -52,7 +52,7 @@ index 663190a19..b7d597e80 100644 pingpong.c \ pop3.c \ progress.c \ -@@ -314,6 +315,7 @@ LIB_HFILES = \ +@@ -333,6 +334,7 @@ LIB_HFILES = \ nonblock.h \ noproxy.h \ parsedate.h \ @@ -61,10 +61,10 @@ index 663190a19..b7d597e80 100644 pop3.h \ progress.h \ diff --git a/lib/curl_config.h.in b/lib/curl_config.h.in -index 6d274171b..58647b5e7 100644 +index 50e075947..6c540bb25 100644 --- a/lib/curl_config.h.in +++ b/lib/curl_config.h.in -@@ -12,6 +12,9 @@ +@@ -15,6 +15,9 @@ /* Location of default ca path */ #undef CURL_CA_PATH @@ -75,7 +75,7 @@ index 6d274171b..58647b5e7 100644 #undef CURL_DEFAULT_SSL_BACKEND diff --git a/lib/url.c b/lib/url.c -index f7b4bbbe9..7e9cf8ae6 100644 +index 2814d31ad..e7175be03 100644 --- a/lib/url.c +++ b/lib/url.c @@ -119,6 +119,9 @@ @@ -88,9 +88,9 @@ index f7b4bbbe9..7e9cf8ae6 100644 /* The last 3 #include files should be in this order */ #include "curl_printf.h" -@@ -570,21 +573,55 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) - */ - if(Curl_ssl_backend() != CURLSSLBACKEND_SCHANNEL) { +@@ -436,22 +439,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__) + const size_t path_max = PATH_MAX; @@ -108,9 +108,10 @@ index f7b4bbbe9..7e9cf8ae6 100644 +#endif /* defined(__MINGW32__) */ if(result) return result; - + #ifndef CURL_DISABLE_PROXY +#if defined(__MINGW32__) -+ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], relocated_bundle); ++ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], ++ relocated_bundle); +#else result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], CURL_CA_BUNDLE); @@ -118,6 +119,7 @@ index f7b4bbbe9..7e9cf8ae6 100644 if(result) return result; #endif + #endif #if defined(CURL_CA_PATH) +#if defined(__MINGW32__) + const size_t path_max = PATH_MAX; @@ -135,7 +137,7 @@ index f7b4bbbe9..7e9cf8ae6 100644 +#endif /* defined(__MINGW32__) */ if(result) return result; - + #ifndef CURL_DISABLE_PROXY +#if defined(__MINGW32__) + result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], relocated_ca_path); +#else 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 a9acf4ce24b66..0821ceebbfae2 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 7aec1b021f6f42cdd7bbd5d2575c7d004921db4e Mon Sep 17 00:00:00 2001 +From 7a53608fcbab8de7f8a725c6ea99a58086b2f6c6 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 7e9cf8ae6..77fd09a4a 100644 +index e7175be03..d46adbaa8 100644 --- a/lib/url.c +++ b/lib/url.c -@@ -579,10 +579,29 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) +@@ -445,10 +445,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 d6879b679cc17..9ccb261e9d6c2 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.7.1 +pkgver=8.8.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=('05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76' +sha256sums=('40d3792d38cfa244d8f692974a567e9a5f3387c547579f1124e95ea2a1020d0d' 'SKIP' '08209cbf1633fa92eae7e5d28f95f8df9d6184cc20fa878c99aec4709bb257fd' '965d3921ec4fdeec94a2718bc2c85ce5e1a00ea0e499330a554074a7ae15dfc6' - '64cbbea0a6b273b2008a08479ea8736fb4917225d434f3c08da2560318393de0' - 'b5e23618ad6000c87b0200232578e74ef7a475e2b7e19f3949fec134d7837570') + 'd34c9474a0b54d36497e58b4792699ef37cc8b043a4cd5daf287e1e33f660207' + '418b5619b924d17ac71066323b5540d86d4e8055cabab925ece185770e9d1906') validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg if test -z "$WITHOUT_ALTERNATES"