Skip to contentSkip to conversation

package/libcurl: bump to v7.72.0

PATCH New Titouan Christophe 2 participants 3 messages Aug 19, 2020 – Aug 28, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libcurl: bump to v7.72.0

This new version fixes, amongst many other things, CVE-2020-8231
(https://curl.haxx.se/docs/CVE-2020-8231.html). See the full changelog on https://curl.haxx.se/changes.html#7_72_0 .

Also drop the 4 patches, that have all been released upstream.

---
 ...ix-build-with-disabled-proxy-support.patch |  50 ------
 ...ix-build-with-disabled-proxy-support.patch | 159 ------------------
 ...nutls-Fetch-backend-when-using-proxy.patch |  29 ----
 ...ir-the-build-with-CURL_DISABLE_PROXY.patch | 125 --------------
 package/libcurl/libcurl.hash                  |   4 +-
 package/libcurl/libcurl.mk                    |   2 +-
 6 files changed, 3 insertions(+), 366 deletions(-)
 delete mode 100644 package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch
 delete mode 100644 package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch
 delete mode 100644 package/libcurl/0003-gnutls-Fetch-backend-when-using-proxy.patch
 delete mode 100644 package/libcurl/0004-gnutls-repair-the-build-with-CURL_DISABLE_PROXY.patch
package/libcurl/0001-bearssl-fix-build-with-disabled-proxy-support.patch deleted +0 -50
deleted file mode 100644
index b6d89859b9..0000000000
@@ -1,50 +0,0 @@
-From 3a46be47cad5a3498b5f6d6007b7d1fe5b8dff78 Mon Sep 17 00:00:00 2001
-Message-Id: <3a46be47cad5a3498b5f6d6007b7d1fe5b8dff78.1594274321.git.baruch@tkos.co.il>
-From: Baruch Siach <[email protected]>
-Date: Thu, 9 Jul 2020 08:14:49 +0300
-Subject: [PATCH] bearssl: fix build with disabled proxy support
-
-Avoid reference to fields that do not exist when CURL_DISABLE_PROXY is
-defined.
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://github.com/curl/curl/pull/5666
-
- lib/vtls/bearssl.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c
-index 628e16a124a9..44e7406e8e39 100644
---- a/lib/vtls/bearssl.c
-+++ b/lib/vtls/bearssl.c
-@@ -300,8 +300,12 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex)
-   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-   struct ssl_backend_data *backend = connssl->backend;
-   const char * const ssl_cafile = SSL_CONN_CONFIG(CAfile);
-+#ifndef CURL_DISABLE_PROXY
-   const char *hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name :
-     conn->host.name;
-+#else
-+  const char *hostname = conn->host.name;
-+#endif
-   const bool verifypeer = SSL_CONN_CONFIG(verifypeer);
-   const bool verifyhost = SSL_CONN_CONFIG(verifyhost);
-   CURLcode ret;
-@@ -386,8 +390,11 @@ static CURLcode bearssl_connect_step1(struct connectdata *conn, int sockindex)
-      */
- 
- #ifdef USE_NGHTTP2
--    if(data->set.httpversion >= CURL_HTTP_VERSION_2 &&
--       (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)) {
-+    if(data->set.httpversion >= CURL_HTTP_VERSION_2
-+#ifndef CURL_DISABLE_PROXY
-+      && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy)
-+#endif
-+      ) {
-       backend->protocols[cur++] = NGHTTP2_PROTO_VERSION_ID;
-       infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID);
-     }
--- 
-2.27.0
-
package/libcurl/0002-nss-fix-build-with-disabled-proxy-support.patch deleted +0 -159

159 lines not on this page · raw message

package/libcurl/0003-gnutls-Fetch-backend-when-using-proxy.patch deleted +0 -29
deleted file mode 100644
index 4e5ad25365..0000000000
@@ -1,29 +0,0 @@
-From 691df98d51955f7f24b34332ad867b6d69093ae0 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <[email protected]>
-Date: Fri, 26 Jun 2020 08:59:24 +0000
-Subject: [PATCH] gnutls: Fetch backend when using proxy
-
-Fixes: 89865c149 ("gnutls: remove the BACKEND define kludge")
-Signed-off-by: Alex Kiernan <[email protected]>
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: commit 691df98d51955f7f24b34332ad867b6d69093ae0
-
- lib/vtls/gtls.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
-index 9b4c3659acc5..02d0825e5ac7 100644
---- a/lib/vtls/gtls.c
-+++ b/lib/vtls/gtls.c
-@@ -1382,6 +1382,7 @@ static bool Curl_gtls_data_pending(const struct connectdata *conn,
-     res = TRUE;
- 
-   connssl = &conn->proxy_ssl[connindex];
-+  backend = connssl->backend;
-   if(backend->session &&
-      0 != gnutls_record_check_pending(backend->session))
-     res = TRUE;
--- 
-2.27.0
-
package/libcurl/0004-gnutls-repair-the-build-with-CURL_DISABLE_PROXY.patch deleted +0 -125

125 lines not on this page · raw message

package/libcurl/libcurl.hash +2 -2
index 46f72c1eaf..2bd1890caf 100644
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://curl.haxx.se/download/curl-7.71.1.tar.xz.asc
+# https://curl.haxx.se/download/curl-7.72.0.tar.xz.asc
 # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
-sha256  40f83eda27cdbeb25cd4da48cefb639af1b9395d6026d2da1825bf059239658c  curl-7.71.1.tar.xz
+sha256  0ded0808c4d85f2ee0db86980ae610cc9d165e9ca9da466196cc73c346513713  curl-7.72.0.tar.xz
 sha256  db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e  COPYING
package/libcurl/libcurl.mk +1 -1
index 6f053f00a8..ea7e06e27e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCURL_VERSION = 7.71.1
+LIBCURL_VERSION = 7.72.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
Signature · 1 line
2.25.3
#1 lore raw

PATCH 1/1 package/libcurl: bump to v7.72.0

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Titouan" == Titouan Christophe <[email protected]> writes:

This new version fixes, amongst many other things, CVE-2020-8231
(https://curl.haxx.se/docs/CVE-2020-8231.html). See the full changelog on https://curl.haxx.se/changes.html#7_72_0 .

Also drop the 4 patches, that have all been released upstream.

Committed after adjusting subject to mark this as a security fix, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/libcurl: bump to v7.72.0

In reply to Titouan Christophe
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Titouan" == Titouan Christophe <[email protected]> writes:

This new version fixes, amongst many other things, CVE-2020-8231
(https://curl.haxx.se/docs/CVE-2020-8231.html). See the full changelog on https://curl.haxx.se/changes.html#7_72_0 .

Also drop the 4 patches, that have all been released upstream.

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard