From owner-svn-ports-all@freebsd.org Mon Mar 26 17:13:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEEAFF5738B; Mon, 26 Mar 2018 17:13:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9C5A968384; Mon, 26 Mar 2018 17:13:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 974CA7D89; Mon, 26 Mar 2018 17:13:09 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QHD9Ya018817; Mon, 26 Mar 2018 17:13:09 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QHD9na018816; Mon, 26 Mar 2018 17:13:09 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201803261713.w2QHD9na018816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 26 Mar 2018 17:13:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465618 - head/irc/irssi/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/irc/irssi/files X-SVN-Commit-Revision: 465618 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 17:13:10 -0000 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 Approved by: David O'Rourke (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"); }