curl: update to 7.73.0
This commit is contained in:
parent
5b799ae53c
commit
5550d3c377
@ -6,14 +6,15 @@
|
|||||||
###########################################################
|
###########################################################
|
||||||
# Check the following 4 variables before running the script
|
# Check the following 4 variables before running the script
|
||||||
topdir=curl
|
topdir=curl
|
||||||
version=7.69.1
|
version=7.73.0
|
||||||
pkgver=1
|
pkgver=1
|
||||||
source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
|
source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2
|
||||||
# https://curl.haxx.se/docs/caextract.html
|
# https://curl.haxx.se/docs/caextract.html
|
||||||
certdate=2020-01-01
|
certdate=2020-10-14
|
||||||
source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem
|
source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem
|
||||||
# If there are no patches, simply comment this
|
# If there are no patches, simply comment this
|
||||||
patch[0]=curl-7.68.0-socklen_t.patch
|
patch[0]=curl-7.68.0-socklen_t.patch
|
||||||
|
patch[1]=curl-7.73.0-no-ipv6.patch
|
||||||
|
|
||||||
# Source function library
|
# Source function library
|
||||||
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
||||||
@ -87,6 +88,7 @@ install()
|
|||||||
compat curl 7.61.1 1 1
|
compat curl 7.61.1 1 1
|
||||||
compat curl 7.64.0 1 1
|
compat curl 7.64.0 1 1
|
||||||
compat curl 7.64.1 1 1
|
compat curl 7.64.1 1 1
|
||||||
|
compat curl 7.69.1 1 1
|
||||||
}
|
}
|
||||||
|
|
||||||
reg pack
|
reg pack
|
||||||
|
@ -1,5 +1,13 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
---------
|
---------
|
||||||
|
* Wed Oct 14 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.73.0-1
|
||||||
|
- Update to 7.73.0
|
||||||
|
- Update CA bundle to 2020-10-14
|
||||||
|
|
||||||
|
* Fri Aug 28 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.72.0-1
|
||||||
|
- Update to 7.72.0
|
||||||
|
- Update CA bundle to 2020-07-22
|
||||||
|
|
||||||
* Sat Mar 21 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.69.1-1
|
* Sat Mar 21 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.69.1-1
|
||||||
- Update to 7.69.1
|
- Update to 7.69.1
|
||||||
|
|
||||||
|
31
curl/src/curl-7.73.0-no-ipv6.patch
Normal file
31
curl/src/curl-7.73.0-no-ipv6.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 8b1a10cdf7fe0dd1dc288106500f6333b77b51a6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jay Satiro <raysatiro@yahoo.com>
|
||||||
|
Date: Thu, 15 Oct 2020 02:47:49 -0400
|
||||||
|
Subject: [PATCH] connect: repair build without ipv6 availability
|
||||||
|
|
||||||
|
Assisted-by: Daniel Stenberg
|
||||||
|
Reported-by: Tom G. Christensen
|
||||||
|
|
||||||
|
Fixes https://github.com/curl/curl/issues/6069
|
||||||
|
Closes https://github.com/curl/curl/pull/6071
|
||||||
|
---
|
||||||
|
lib/connect.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/connect.c b/lib/connect.c
|
||||||
|
index 5f23b79ca0b..7f33ea4ba85 100644
|
||||||
|
--- a/lib/connect.c
|
||||||
|
+++ b/lib/connect.c
|
||||||
|
@@ -1334,8 +1334,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
|
||||||
|
|
||||||
|
conn->tempfamily[0] = conn->tempaddr[0]?
|
||||||
|
conn->tempaddr[0]->ai_family:0;
|
||||||
|
+#ifdef ENABLE_IPV6
|
||||||
|
conn->tempfamily[1] = conn->tempfamily[0] == AF_INET6 ?
|
||||||
|
AF_INET : AF_INET6;
|
||||||
|
+#else
|
||||||
|
+ conn->tempfamily[1] = AF_UNSPEC;
|
||||||
|
+#endif
|
||||||
|
ainext(conn, 1, FALSE); /* assigns conn->tempaddr[1] accordingly */
|
||||||
|
|
||||||
|
DEBUGF(infof(data, "family0 == %s, family1 == %s\n",
|
Loading…
x
Reference in New Issue
Block a user