From ff717aeefe6188c69099c4f2203311595ac09eb3 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 31 Oct 2018 10:20:31 -0300 Subject: [PATCH] curl: update to 7.62.0. --- .../patches/patch-lib_vtls_openssl_c.patch | 31 ------------------- srcpkgs/curl/template | 4 +-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch diff --git a/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch b/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch deleted file mode 100644 index 4b36cef2226..00000000000 --- a/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch +++ /dev/null @@ -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'; diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index ce28413bd25..872405ac6f6 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -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