From owner-svn-ports-all@freebsd.org Sat Mar 24 21:12:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00C73F70604; Sat, 24 Mar 2018 21:12:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 902F57FD0A; Sat, 24 Mar 2018 21:12:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A56714A77; Sat, 24 Mar 2018 21:12:24 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2OLCOxB071076; Sat, 24 Mar 2018 21:12:24 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2OLCO7x071075; Sat, 24 Mar 2018 21:12:24 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201803242112.w2OLCO7x071075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 24 Mar 2018 21:12:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465485 - head/ftp/curl/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/ftp/curl/files X-SVN-Commit-Revision: 465485 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Mar 2018 21:12:27 -0000 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 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';