curl: fix libressl-2.7

Import OpenBSD patches.
This commit is contained in:
Enno Boland 2018-04-23 12:43:11 +02:00
parent e1366e8e73
commit e6ba8709df
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
2 changed files with 32 additions and 1 deletions

View File

@ -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';

View File

@ -1,7 +1,7 @@
# Template build file for 'curl'. # Template build file for 'curl'.
pkgname=curl pkgname=curl
version=7.59.0 version=7.59.0
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 configure_args="ac_cv_sizeof_off_t=8
--enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp) --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp)