diff options
| author | Ismael Luceno | 2019-01-30 16:48:49 -0300 |
|---|---|---|
| committer | Ismael Luceno | 2019-01-30 16:48:49 -0300 |
| commit | 12b29a4ee644223b085a9652bcfef31760179de9 (patch) | |
| tree | 523f569371afc51fc4a1605b940e4cb3c6b0750e /chat-irc | |
| parent | 6479e62eed302b9621502e41e08c5b8b31d28002 (diff) | |
irssi: Fix build against libressl
Diffstat (limited to 'chat-irc')
| -rw-r--r-- | chat-irc/irssi/HISTORY | 4 | ||||
| -rwxr-xr-x | chat-irc/irssi/PRE_BUILD | 1 | ||||
| -rw-r--r-- | chat-irc/irssi/patches/0001-fix-build-with-LibreSSL-2.7.0.patch | 33 |
3 files changed, 38 insertions, 0 deletions
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY index bc6538c2b5..8d34eb95ef 100644 --- a/chat-irc/irssi/HISTORY +++ b/chat-irc/irssi/HISTORY @@ -1,3 +1,7 @@ +2019-01-30 Ismael Luceno <ismael@iodev.co.uk> + * PRE_BUILD, patches/0001-fix-build-with-LibreSSL-2.7.0.patch: + fixed build against libressl + 2019-01-18 Remko van der Vossen <wich@sourcemage.org> * DETAILS: updated spell to 1.1.2 diff --git a/chat-irc/irssi/PRE_BUILD b/chat-irc/irssi/PRE_BUILD index 50eea5fcf6..5302b47cf7 100755 --- a/chat-irc/irssi/PRE_BUILD +++ b/chat-irc/irssi/PRE_BUILD @@ -1,5 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +apply_patch_dir patches && if [[ $IRSSI_BRANCH == scm ]]; then NOCONFIGURE=yes ./autogen.sh diff --git a/chat-irc/irssi/patches/0001-fix-build-with-LibreSSL-2.7.0.patch b/chat-irc/irssi/patches/0001-fix-build-with-LibreSSL-2.7.0.patch new file mode 100644 index 0000000000..644c73be32 --- /dev/null +++ b/chat-irc/irssi/patches/0001-fix-build-with-LibreSSL-2.7.0.patch @@ -0,0 +1,33 @@ +From 25a44dacf4114f33f3a887f358c02f4fd9938427 Mon Sep 17 00:00:00 2001 +From: Dorian Harmans <dorian@woohooyeah.nl> +Date: Fri, 23 Mar 2018 21:35:35 +0100 +Subject: [PATCH] fix build with LibreSSL 2.7.0 + +--- + src/core/network-openssl.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c +index 9fddf073e..692c7e716 100644 +--- a/src/core/network-openssl.c ++++ b/src/core/network-openssl.c +@@ -35,7 +35,8 @@ + #include <openssl/err.h> + + /* 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; |