From 87830ee1964ce83722841db08e8d8bdfb3892865 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 3 May 2018 18:39:52 +0200 Subject: [PATCH] serf: restore patch mistakenly removed (libressl 2.7 fix) --- srcpkgs/serf/patches/libressl.patch | 11 +++++++++++ srcpkgs/serf/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/serf/patches/libressl.patch diff --git a/srcpkgs/serf/patches/libressl.patch b/srcpkgs/serf/patches/libressl.patch new file mode 100644 index 00000000000..8b0ad22ced4 --- /dev/null +++ b/srcpkgs/serf/patches/libressl.patch @@ -0,0 +1,11 @@ +--- buckets/ssl_buckets.c.orig ++++ buckets/ssl_buckets.c +@@ -52,7 +52,7 @@ + #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary))) + #endif + +-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + #define USE_OPENSSL_1_1_API + #endif + diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index 4344ffe06ed..bf0ab95a288 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -1,7 +1,7 @@ # Template file for 'serf' pkgname=serf version=1.3.9 -revision=6 +revision=7 nocross=yes hostmakedepends="scons libressl-devel apr-util-devel" makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"