[Libreoffice-commits] core.git: download.lst external/curl

[Caolán McNamara (via logerrit)]

 download.lst                              |    4 ++--
 external/curl/UnpackedTarball_curl.mk     |    1 -
 external/curl/curl-7.26.0_win-proxy.patch |   12 ++++++------
 external/curl/curl-debug.patch.1          |   11 -----------
 4 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit 40a84af1bdd7b3c414a8a78ca32b0951c03f9976
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 22 14:16:07 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 22 16:45:52 2022 +0100

    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 <caol...@redhat.com>

diff --git a/download.lst b/download.lst
index 18987fca4dc9..68bd2292aa13 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export CPPUNIT_SHA256SUM := 
89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707
 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689
-export CURL_TARBALL := curl-7.79.1.tar.xz
+export CURL_SHA256SUM := 
ac8e1087711084548d788ef18b9b732c8de887457b81f616fc681d1044b32f98
+export CURL_TARBALL := curl-7.81.0.tar.gz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4
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, &notBefore, &notAfter);
-   PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime);