From e6ba8709df63fd3db5e831bfa9ddb77485bc2188 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 23 Apr 2018 12:43:11 +0200 Subject: [PATCH] curl: fix libressl-2.7 Import OpenBSD patches. --- .../patches/patch-lib_vtls_openssl_c.patch | 31 +++++++++++++++++++ srcpkgs/curl/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 00000000000..4b36cef2226 --- /dev/null +++ b/srcpkgs/curl/patches/patch-lib_vtls_openssl_c.patch @@ -0,0 +1,31 @@ +$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 2172b79fc90..e438d871c7a 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,7 +1,7 @@ # Template build file for 'curl'. pkgname=curl version=7.59.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)