Date: Mon, 26 Mar 2018 17:13:09 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465618 - head/irc/irssi/files Message-ID: <201803261713.w2QHD9na018816@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Mar 26 17:13:09 2018 New Revision: 465618 URL: https://svnweb.freebsd.org/changeset/ports/465618 Log: irc/irssi: Fix build with LibreSSL 2.7 - LibreSSL 2.7 added OpenSSL 1.1 API PR: 226925 Submitted by: Sergey Akhmatov <sergey akhmatov ru> Approved by: David O'Rourke <dor.bsd xm0 uk> (maintainer) Modified: head/irc/irssi/files/patch-src_core_network-openssl.c Modified: head/irc/irssi/files/patch-src_core_network-openssl.c ============================================================================== --- head/irc/irssi/files/patch-src_core_network-openssl.c Mon Mar 26 17:11:06 2018 (r465617) +++ head/irc/irssi/files/patch-src_core_network-openssl.c Mon Mar 26 17:13:09 2018 (r465618) @@ -1,6 +1,16 @@ ---- src/core/network-openssl.c.orig 2017-03-10 16:31:03 UTC +--- src/core/network-openssl.c.orig 2018-02-14 23:53:44 UTC +++ src/core/network-openssl.c -@@ -434,6 +434,7 @@ static GIOChannel *irssi_ssl_get_iochann +@@ -47,7 +47,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; +@@ -476,6 +477,7 @@ static GIOChannel *irssi_ssl_get_iochann if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1) g_warning("No valid SSL cipher suite could be selected"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803261713.w2QHD9na018816>