curl: Update to 8.17.0

0001-Make-cURL-relocatable.patch: refresh, changed
in eefd03c572
This commit is contained in:
Christoph Reiter
2025-11-05 19:22:25 +01:00
committed by Dirk Stolle
parent 9b34463568
commit 385fa7317c
2 changed files with 58 additions and 48 deletions

View File

@@ -47,64 +47,74 @@
pingpong.h \
pop3.h \
progress.h \
--- a/lib/url.c
+++ b/lib/url.c
@@ -125,6 +125,10 @@
#include "curl_memory.h"
#include "memdebug.h"
--- curl-8.17.0/lib/vtls/vtls.c.orig 2025-11-05 08:00:46.000000000 +0100
+++ curl-8.17.0/lib/vtls/vtls.c 2025-11-05 19:38:33.104185800 +0100
@@ -85,6 +85,9 @@
#include "../curl_memory.h"
#include "../memdebug.h"
+#if defined(__MINGW32__)
+#include "pathtools.h"
+#include "../pathtools.h"
+#endif
+
#ifdef USE_NGHTTP2
static void data_priority_cleanup(struct Curl_easy *data);
#else
@@ -430,22 +434,47 @@
if(Curl_ssl_backend() != CURLSSLBACKEND_SCHANNEL &&
Curl_ssl_backend() != CURLSSLBACKEND_SECURETRANSPORT) {
#ifdef CURL_CA_BUNDLE
+#if defined(__MINGW32__)
+ char *relocated_bundle = single_path_relocation_lib(CURL_BINDIR, CURL_CA_BUNDLE);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], relocated_bundle);
+ free(relocated_bundle);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], CURL_CA_BUNDLE);
+#endif /* defined(__MINGW32__) */
if(result)
return result;
#ifndef CURL_DISABLE_PROXY
+#if defined(__MINGW32__)
+ relocated_bundle = single_path_relocation_lib(CURL_BINDIR, CURL_CA_BUNDLE);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],
+ relocated_bundle);
+ free(relocated_bundle);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],
CURL_CA_BUNDLE);
+#endif
if(result)
return result;
#endif
#define CLONE_STRING(var) \
do { \
@@ -306,7 +309,13 @@
#endif
#ifdef CURL_CA_PATH
if(!sslc->custom_capath && !set->str[STRING_SSL_CAPATH]) {
+#if defined(__MINGW32__)
+ char *relocated_ca_path = single_path_relocation_lib(CURL_BINDIR, CURL_CA_PATH);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], relocated_ca_path);
+ free(relocated_ca_path);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], CURL_CA_PATH);
result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], CURL_CA_PATH);
+#endif /* defined(__MINGW32__) */
if(result)
return result;
#ifndef CURL_DISABLE_PROXY
if(result)
return result;
}
@@ -314,7 +323,13 @@
#endif
#ifdef CURL_CA_BUNDLE
if(!sslc->custom_cafile && !set->str[STRING_SSL_CAFILE]) {
+#if defined(__MINGW32__)
+ relocated_ca_path = single_path_relocation_lib(CURL_BINDIR, CURL_CA_PATH);
+ char *relocated_bundle = single_path_relocation_lib(CURL_BINDIR, CURL_CA_BUNDLE);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], relocated_bundle);
+ free(relocated_bundle);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], CURL_CA_BUNDLE);
+#endif /* defined(__MINGW32__) */
if(result)
return result;
}
@@ -353,8 +368,14 @@
#endif
#ifdef CURL_CA_PATH
if(!sslc->custom_capath && !set->str[STRING_SSL_CAPATH_PROXY]) {
+#if defined(__MINGW32__)
+ char *relocated_ca_path = single_path_relocation_lib(CURL_BINDIR, CURL_CA_PATH);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], relocated_ca_path);
+ free(relocated_ca_path);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], CURL_CA_PATH);
+#endif
if(result)
return result;
result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY],
CURL_CA_PATH);
+#endif /* defined(__MINGW32__) */
if(result)
return result;
}
@@ -362,8 +383,15 @@
#endif
#ifdef CURL_CA_BUNDLE
if(!sslc->custom_cafile && !set->str[STRING_SSL_CAFILE_PROXY]) {
+#if defined(__MINGW32__)
+ char *relocated_bundle = single_path_relocation_lib(CURL_BINDIR, CURL_CA_BUNDLE);
+ result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],
+ relocated_bundle);
+ free(relocated_bundle);
+#else
result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],
CURL_CA_BUNDLE);
+#endif
if(result)
return result;
}

View File

@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
$([[ ${CARCH} == i686 ]] || echo \
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls" \
"${MINGW_PACKAGE_PREFIX}-${_realname}-winssl"))
pkgver=8.16.0
pkgver=8.17.0
pkgrel=1
pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)"
arch=('any')
@@ -51,11 +51,11 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//.
"pathtools.h"
"0001-Make-cURL-relocatable.patch"
)
sha256sums=('40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d'
sha256sums=('955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992'
'SKIP'
'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
'1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
'6f3c28f789545d90e2ad0bd1dab96085b30c34140aef0c374032c0492c1fad24')
'7f1f41dc4b53b11688844def2c1af9c0ac286a35fed3d0319ee6d5d7b7bcab6c')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
apply_patch_with_msg() {