curl: update to 7.75.0
This commit is contained in:
parent
3090b4c2ac
commit
6600963ac2
@ -6,15 +6,14 @@
|
|||||||
###########################################################
|
###########################################################
|
||||||
# Check the following 4 variables before running the script
|
# Check the following 4 variables before running the script
|
||||||
topdir=curl
|
topdir=curl
|
||||||
version=7.73.0
|
version=7.75.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-10-14
|
certdate=2021-01-19
|
||||||
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
|
||||||
@ -26,17 +25,13 @@ export PKG_CONFIG=pkgconf
|
|||||||
|
|
||||||
# Prefer the X/Open feature set to get utimes() defined
|
# Prefer the X/Open feature set to get utimes() defined
|
||||||
export CC="gcc -D__EXTENSIONS__ -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
|
export CC="gcc -D__EXTENSIONS__ -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
|
||||||
configure_args+=(--enable-static=no --enable-http --enable-ftp --enable-file --disable-ldap --enable-manual --enable-cookies --enable-crypto --with-libidn2 --with-libssh2 --with-nghttp2 --with-ca-bundle=${prefix}/${_sysconfdir}/curl-ca-bundle.pem)
|
configure_args+=(--enable-static=no --enable-http --enable-ftp --enable-file --disable-ldap --enable-manual --enable-cookies --enable-crypto --with-libidn2 --with-libssh2 --with-nghttp2 --with-ca-bundle=${prefix}/${_sysconfdir}/curl-ca-bundle.pem --disable-threaded-resolver)
|
||||||
|
|
||||||
reg prep
|
reg prep
|
||||||
prep()
|
prep()
|
||||||
{
|
{
|
||||||
generic_prep
|
generic_prep
|
||||||
setdir source
|
setdir source
|
||||||
# There are weak pthread_* symbols in libc but curl actually needs the real
|
|
||||||
# thing so we reverse the test that would normally make configure skip
|
|
||||||
# looking for the pthread symbols in libpthread.
|
|
||||||
${__gsed} -i '/USE_THREADS_POSIX/ s/\!= "1"/\= "1"/' configure
|
|
||||||
# Ensure testsuite can find sshd
|
# Ensure testsuite can find sshd
|
||||||
sed -i 's#/usr/freeware#/usr/tgcware#' tests/sshhelp.pm
|
sed -i 's#/usr/freeware#/usr/tgcware#' tests/sshhelp.pm
|
||||||
}
|
}
|
||||||
@ -89,6 +84,8 @@ install()
|
|||||||
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
|
compat curl 7.69.1 1 1
|
||||||
|
compat curl 7.72.0 1 1
|
||||||
|
compat curl 7.73.0 1 1
|
||||||
}
|
}
|
||||||
|
|
||||||
reg pack
|
reg pack
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
---------
|
---------
|
||||||
|
* Wed Feb 24 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 7.75.0-1
|
||||||
|
- Update to 7.75.0
|
||||||
|
- Update CA bundle to 2021-01-19
|
||||||
|
|
||||||
* Wed Oct 14 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.73.0-1
|
* Wed Oct 14 2020 Tom G. Christensen <swpkg@jupiterrise.com> - 7.73.0-1
|
||||||
- Update to 7.73.0
|
- Update to 7.73.0
|
||||||
- Update CA bundle to 2020-10-14
|
- Update CA bundle to 2020-10-14
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
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