From 16fad2fc35e047b4f028551390b3337ac2910cec Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 23 Apr 2018 14:01:53 +0200 Subject: [PATCH] irssi: fix libressl-2.7 --- .../patch-src_core_network-openssl_c.patch | 25 +++++++++++++++++++ srcpkgs/irssi/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch diff --git a/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch b/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch new file mode 100644 index 00000000000..f783356d450 --- /dev/null +++ b/srcpkgs/irssi/patches/patch-src_core_network-openssl_c.patch @@ -0,0 +1,25 @@ +$OpenBSD: patch-src_core_network-openssl_c,v 1.6 2018/02/23 14:39:51 sthen Exp $ + +Index: src/core/network-openssl.c +--- src/core/network-openssl.c.orig ++++ src/core/network-openssl.c +@@ -35,7 +35,8 @@ + #include + + /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + /* The two functions below could be already defined if OPENSSL_API_COMPAT is + * below the 1.1.0 version so let's do a clean start */ + #undef X509_get_notBefore +@@ -47,7 +48,8 @@ + + /* OpenSSL 1.1.0 also introduced some useful additions to the api */ + #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + static int X509_STORE_up_ref(X509_STORE *vfy) + { + int n; diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 8593b897cd4..ed8bddcaa03 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template build file for 'irssi' pkgname=irssi version=1.1.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color" hostmakedepends="pkg-config"