From owner-svn-ports-all@freebsd.org Tue Mar 27 12:17:07 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 8950BF34AC2; Tue, 27 Mar 2018 12:17:07 +0000 (UTC) (envelope-from brnrd@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 341E081489; Tue, 27 Mar 2018 12:17:07 +0000 (UTC) (envelope-from brnrd@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 2AD281BF43; Tue, 27 Mar 2018 12:17:07 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2RCH7jp097265; Tue, 27 Mar 2018 12:17:07 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2RCH6KD097263; Tue, 27 Mar 2018 12:17:06 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201803271217.w2RCH6KD097263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 27 Mar 2018 12:17:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465696 - head/devel/libgit2/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/devel/libgit2/files X-SVN-Commit-Revision: 465696 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: Tue, 27 Mar 2018 12:17:07 -0000 Author: brnrd Date: Tue Mar 27 12:17:06 2018 New Revision: 465696 URL: https://svnweb.freebsd.org/changeset/ports/465696 Log: devel/libgit2: Fix build with LibreSSL 2.7 - LibreSSL 2.7 adds OpenSSL 1.1 API PR: 226954 Approved by: wg (maintainer) Added: head/devel/libgit2/files/ head/devel/libgit2/files/patch-src_openssl__stream.c (contents, props changed) head/devel/libgit2/files/patch-src_openssl__stream.h (contents, props changed) Added: head/devel/libgit2/files/patch-src_openssl__stream.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgit2/files/patch-src_openssl__stream.c Tue Mar 27 12:17:06 2018 (r465696) @@ -0,0 +1,11 @@ +--- src/openssl_stream.c.orig 2017-06-14 11:31:20 UTC ++++ src/openssl_stream.c +@@ -103,7 +103,7 @@ int git_openssl_stream_global_init(void) + ssl_opts |= SSL_OP_NO_COMPRESSION; + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + SSL_load_error_strings(); + OpenSSL_add_ssl_algorithms(); + #else Added: head/devel/libgit2/files/patch-src_openssl__stream.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgit2/files/patch-src_openssl__stream.h Tue Mar 27 12:17:06 2018 (r465696) @@ -0,0 +1,11 @@ +--- src/openssl_stream.h.orig 2017-06-14 11:31:20 UTC ++++ src/openssl_stream.h +@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_st + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + {