diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-01-22 14:16:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-22 16:45:52 +0100 |
| commit | 40a84af1bdd7b3c414a8a78ca32b0951c03f9976 (patch) | |
| tree | d4c5026405103471be01ca8ccf204e1e5dd1a0a0 /external | |
| parent | 5190b933ef6d3c5faa23d8165b2109c4ea21df42 (diff) | |
upgrade to curl-7.81.0
Change-Id: I0a34239bfb16bf19e25bf374c7f36c4cdf1776c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128783
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 12 | ||||
| -rw-r--r-- | external/curl/curl-debug.patch.1 | 11 |
3 files changed, 6 insertions, 18 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 3dada60eac8e..b89b000228c9 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -25,7 +25,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc-disable-protocols.patch.1 \ external/curl/curl-7.26.0_win-proxy.patch \ external/curl/zlib.patch.0 \ - external/curl/curl-debug.patch.1 \ external/curl/configurable-z-option.patch.0 \ )) diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 46cdcc739d80..1c5469a35479 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -31,7 +31,7 @@ +{ + int bufSize; + char *out = NULL; -+ if(wStr != NULL) { ++ if(wStr) { + bufSize = WideCharToMultiByte( + CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); + out = (char *)malloc(bufSize * sizeof(char)); @@ -63,10 +63,10 @@ + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); + + /* Convert the ieNoProxy into a proper no_proxy value */ -+ if(NULL != ieNoProxy) { ++ if(ieNoProxy) { + no_proxy = strdup(ieNoProxy); + pos = strpbrk(no_proxy, "; "); -+ while(NULL != pos) { ++ while(pos) { + no_proxy[pos-no_proxy] = ','; + pos = strpbrk(no_proxy, "; "); + } @@ -77,9 +77,9 @@ + char *tok; + char *saveptr; + -+ if(NULL != ieProxy) { ++ if(ieProxy) { + tok = strtok_s(ieProxy, ";", &saveptr); -+ if(strchr(tok, '=') == NULL) { ++ if(!strchr(tok, '=')) { + proxy = strdup(ieProxy); + } + else { @@ -90,7 +90,7 @@ + } + tok = strtok_s(NULL, ";", &saveptr); + } -+ while(NULL != tok); ++ while(tok); + } + } + } diff --git a/external/curl/curl-debug.patch.1 b/external/curl/curl-debug.patch.1 deleted file mode 100644 index a000913ed335..000000000000 --- a/external/curl/curl-debug.patch.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- curl/lib/vtls/nss.c.orig 2021-10-01 17:34:59.302663021 +0200 -+++ curl/lib/vtls/nss.c 2021-10-01 17:35:55.376666010 +0200 -@@ -955,7 +955,7 @@ - subject = CERT_NameToAscii(&cert->subject); - issuer = CERT_NameToAscii(&cert->issuer); - common_name = CERT_GetCommonName(&cert->subject); -- infof(data, "subject: %s\n", subject); -+ infof(data, "subject: %s", subject); - - CERT_GetCertTimes(cert, ¬Before, ¬After); - PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime); |