From 238c6a32caa20330d355037e25c1445d72a599e8 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 23 Apr 2018 13:56:00 +0200 Subject: [PATCH] haproxy: fix libressl-2.7 --- .../patch-include_proto_openssl-compat_h.patch | 15 +++++++++++++++ srcpkgs/haproxy/template | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch diff --git a/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch new file mode 100644 index 0000000000..474a51e22b --- /dev/null +++ b/srcpkgs/haproxy/patches/patch-include_proto_openssl-compat_h.patch @@ -0,0 +1,15 @@ +$OpenBSD: patch-include_proto_openssl-compat_h,v 1.6 2018/03/20 21:57:55 sthen Exp $ + +Index: include/proto/openssl-compat.h +--- include/proto/openssl-compat.h.orig ++++ include/proto/openssl-compat.h +@@ -89,7 +89,8 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESS + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* + * Functions introduced in OpenSSL 1.1.0 and not yet present in LibreSSL + */ diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 3e87f1d25f..5acd03052d 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,7 +1,7 @@ # Template file for 'haproxy' pkgname=haproxy version=1.7.10 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="TARGET=linux2628 USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1"