Date: Sat, 24 Mar 2018 21:12:24 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465485 - head/ftp/curl/files Message-ID: <201803242112.w2OLCO7x071075@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Mar 24 21:12:23 2018 New Revision: 465485 URL: https://svnweb.freebsd.org/changeset/ports/465485 Log: Fix build with LibreSSL 2.7 Obtained from: https://github.com/openbsd/ports/blob/master/net/curl/patches/patch-lib_vtls_openssl_c PR: 226845 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> MFH: 2018Q1 Added: head/ftp/curl/files/patch-lib-vtls-openssl.c (contents, props changed) Added: head/ftp/curl/files/patch-lib-vtls-openssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/curl/files/patch-lib-vtls-openssl.c Sat Mar 24 21:12:23 2018 (r465485) @@ -0,0 +1,28 @@ +--- lib/vtls/openssl.c.orig 2018-03-22 14:26:38 UTC ++++ 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 +@@ -3526,7 +3521,11 @@ static size_t Curl_ossl_version(char *bu + 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';
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803242112.w2OLCO7x071075>