From 4a1022c5ae7dba5e59c7c01690799c8271439826 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 23 Apr 2018 12:50:19 +0200 Subject: [PATCH] libgit2: fix libressl-2.7 Import OpenBSD patches. --- .../patches/patch-src_openssl_stream_h.patch | 15 +++++++++++++++ srcpkgs/libgit2/template | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch diff --git a/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch new file mode 100644 index 00000000000..f5306b96d56 --- /dev/null +++ b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_openssl_stream_h,v 1.8 2018/03/19 18:28:12 jasper Exp $ + +Index: src/openssl_stream.h +--- src/openssl_stream.h.orig ++++ src/openssl_stream.h +@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, co + + + +-# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + + GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) + { diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 936260253e3..33c8d25c2d8 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,7 +1,7 @@ # Template file for 'libgit2' pkgname=libgit2 version=0.26.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="python git pkg-config" makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"