curl: update to 7.62.0.

This commit is contained in:
maxice8 2018-10-31 10:20:31 -03:00 committed by Enno Boland
parent 7a2cdc548a
commit ff717aeefe
2 changed files with 2 additions and 33 deletions

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-lib_vtls_openssl_c,v 1.3 2018/02/15 22:13:20 sthen Exp $
Index: lib/vtls/openssl.c
--- lib/vtls/openssl.c.orig
+++ lib/vtls/openssl.c
@@ -117,12 +117,7 @@
#define X509_get0_notBefore(x) X509_get_notBefore(x)
#define X509_get0_notAfter(x) X509_get_notAfter(x)
#define CONST_EXTS /* nope */
-#ifdef LIBRESSL_VERSION_NUMBER
-static unsigned long OpenSSL_version_num(void)
-{
- return LIBRESSL_VERSION_NUMBER;
-}
-#else
+#ifndef LIBRESSL_VERSION_NUMBER
#define OpenSSL_version_num() SSLeay()
#endif
#endif
@@ -3527,7 +3522,11 @@ static size_t Curl_ossl_version(char *buffer, size_t s
unsigned long ssleay_value;
sub[2]='\0';
sub[1]='\0';
+#ifdef LIBRESSL_VERSION_NUMBER
+ ssleay_value = LIBRESSL_VERSION_NUMBER;
+#else
ssleay_value = OpenSSL_version_num();
+#endif
if(ssleay_value < 0x906000) {
ssleay_value = SSLEAY_VERSION_NUMBER;
sub[0]='\0';

View File

@ -1,6 +1,6 @@
# Template file for 'curl'
pkgname=curl
version=7.61.1
version=7.62.0
revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@ -20,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=a308377dbc9a16b2e994abd55455e5f9edca4e31666f8f8fcfe7a1a4aea419b9
checksum=7802c54076500be500b171fde786258579d60547a3a35b8c5a23d8c88e8f9620
build_options="gnutls gssapi ldap rtmp ssh ssl"
build_options_default="ssh ssl"
vopt_conflict ssl gnutls