curl: update to 7.64.1.

closes #10312

srcpkgs/curl/patches/CVE-2018-16890.patch

@@ -1,40 +0,0 @@
-From b780b30d1377adb10bbe774835f49e9b237fb9bb Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Wed, 2 Jan 2019 20:33:08 +0100
-Subject: [PATCH] NTLM: fix size check condition for type2 received data
-
-Bug: https://curl.haxx.se/docs/CVE-2018-16890.html
-Reported-by: Wenxiang Qian
-CVE-2018-16890
----
- lib/vauth/ntlm.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
-index c3d55ed251..0ad4d972e3 100644
---- lib/vauth/ntlm.c
-+++ lib/vauth/ntlm.c
-@@ -5,7 +5,7 @@
-  *                            | (__| |_| |  _ <| |___
-  *                             \___|\___/|_| \_\_____|
-  *
-- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
-+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution. The terms
-@@ -182,10 +182,11 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data,
-     target_info_len = Curl_read16_le(&buffer[40]);
-     target_info_offset = Curl_read32_le(&buffer[44]);
-     if(target_info_len > 0) {
--      if(((target_info_offset + target_info_len) > size) ||
-+      if((target_info_offset >= size) ||
-+         ((target_info_offset + target_info_len) > size) ||
-          (target_info_offset < 48)) {
-         infof(data, "NTLM handshake failure (bad type-2 message). "
--                    "Target Info Offset Len is set incorrect by the peer\n");
-+              "Target Info Offset Len is set incorrect by the peer\n");
-         return CURLE_BAD_CONTENT_ENCODING;
-       }
- 
-

srcpkgs/curl/patches/CVE-2019-3822.patch

@@ -1,36 +0,0 @@
-From 50c9484278c63b958655a717844f0721263939cc Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 3 Jan 2019 12:59:28 +0100
-Subject: [PATCH] ntlm: fix *_type3_message size check to avoid buffer overflow
-
-Bug: https://curl.haxx.se/docs/CVE-2019-3822.html
-Reported-by: Wenxiang Qian
-CVE-2019-3822
----
- lib/vauth/ntlm.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
-index 0ad4d972e3..6a8fc5ab3d 100644
---- lib/vauth/ntlm.c
-+++ lib/vauth/ntlm.c
-@@ -779,11 +779,14 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
-   });
- 
- #ifdef USE_NTRESPONSES
--  if(size < (NTLM_BUFSIZE - ntresplen)) {
--    DEBUGASSERT(size == (size_t)ntrespoff);
--    memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);
--    size += ntresplen;
-+  /* ntresplen + size should not be risking an integer overflow here */
-+  if(ntresplen + size > sizeof(ntlmbuf)) {
-+    failf(data, "incoming NTLM message too big");
-+    return CURLE_OUT_OF_MEMORY;
-   }
-+  DEBUGASSERT(size == (size_t)ntrespoff);
-+  memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);
-+  size += ntresplen;
- 
-   DEBUG_OUT({
-     fprintf(stderr, "\n   ntresp=");
-

srcpkgs/curl/patches/CVE-2019-3823.patch

@@ -1,45 +0,0 @@
-From 39df4073e5413fcdbb5a38da0c1ce6f1c0ceb484 Mon Sep 17 00:00:00 2001
-From: Daniel Gustafsson <daniel@yesql.se>
-Date: Sat, 19 Jan 2019 00:42:47 +0100
-Subject: [PATCH] smtp: avoid risk of buffer overflow in strtol
-
-If the incoming len 5, but the buffer does not have a termination
-after 5 bytes, the strtol() call may keep reading through the line
-buffer until is exceeds its boundary. Fix by ensuring that we are
-using a bounded read with a temporary buffer on the stack.
-
-Bug: https://curl.haxx.se/docs/CVE-2019-3823.html
-Reported-by: Brian Carpenter (Geeknik Labs)
-CVE-2019-3823
----
- lib/smtp.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/smtp.c b/lib/smtp.c
-index 84fc68e418..d55647b12e 100644
---- lib/smtp.c
-+++ lib/smtp.c
-@@ -5,7 +5,7 @@
-  *                            | (__| |_| |  _ <| |___
-  *                             \___|\___/|_| \_\_____|
-  *
-- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
-+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
-  *
-  * This software is licensed as described in the file COPYING, which
-  * you should have received as part of this distribution. The terms
-@@ -207,8 +207,12 @@ static bool smtp_endofresp(struct connectdata *conn, char *line, size_t len,
-      Section 4. Examples of RFC-4954 but some e-mail servers ignore this and
-      only send the response code instead as per Section 4.2. */
-   if(line[3] == ' ' || len == 5) {
-+    char tmpline[6];
-+
-     result = TRUE;
--    *resp = curlx_sltosi(strtol(line, NULL, 10));
-+    memset(tmpline, '\0', sizeof(tmpline));
-+    memcpy(tmpline, line, (len == 5 ? 5 : 3));
-+    *resp = curlx_sltosi(strtol(tmpline, NULL, 10));
- 
-     /* Make sure real server never sends internal value */
-     if(*resp == 1)
-

srcpkgs/curl/template

@@ -1,8 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-reverts="7.64.0_1"
+version=7.64.1
-version=7.63.0
+revision=1
-revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnuts)
@@ -21,7 +20,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=9bab7ed4ecff77020a312d84cc5fb7eb02d58419d218f267477a724a17fd8dd8
+checksum=4cc7c738b35250d0680f29e93e0820c4cb40035f43514ea3ec8d60322d41a45d
 build_options="gnutls gssapi ldap rtmp ssh ssl"
 build_options_default="ssh ssl"
 vopt_conflict ssl gnutls
@@ -37,7 +36,7 @@ post_install() {
 }
 
 libcurl_package() {
-	short_desc="The multiprotocol file transfer library"
+	short_desc="Multiprotocol file transfer library"
 	shlib_provides="libcurl-gnutls.so.4"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
@@ -47,7 +46,7 @@ libcurl_package() {
 
 libcurl-devel_package() {
 	depends="${makedepends} libcurl>=${version}_${revision}"
-	short_desc="The multiprotocol file transfer library - development files"
+	short_desc="Multiprotocol file transfer library - development files"
 	pkg_install() {
 		vmove usr/bin/curl-config
 		vmove "usr/share/man/man1/curl-config*"