From owner-svn-ports-all@freebsd.org Mon Feb 17 10:50:38 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7DB1254F5C; Mon, 17 Feb 2020 10:50:38 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48LgkQ5ST5z3QdT; Mon, 17 Feb 2020 10:50:38 +0000 (UTC) (envelope-from fluffy@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 B66675B78; Mon, 17 Feb 2020 10:50:38 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01HAocGD021769; Mon, 17 Feb 2020 10:50:38 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01HAocxH021767; Mon, 17 Feb 2020 10:50:38 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202002171050.01HAocxH021767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Mon, 17 Feb 2020 10:50:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526361 - head/news/inn/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/news/inn/files X-SVN-Commit-Revision: 526361 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.29 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, 17 Feb 2020 10:50:38 -0000 Author: fluffy Date: Mon Feb 17 10:50:38 2020 New Revision: 526361 URL: https://svnweb.freebsd.org/changeset/ports/526361 Log: news/inn: unbreak with libressl PR: 243642 Approved by: maintainer (timeout >3w) Added: head/news/inn/files/patch-nnrpd_tls.c (contents, props changed) Added: head/news/inn/files/patch-nnrpd_tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/news/inn/files/patch-nnrpd_tls.c Mon Feb 17 10:50:38 2020 (r526361) @@ -0,0 +1,20 @@ +--- nnrpd/tls.c.orig 2017-09-12 18:17:21 UTC ++++ nnrpd/tls.c +@@ -495,7 +495,7 @@ tls_init_serverengine(int verifydepth, int askcert, in + syslog(L_NOTICE, "starting TLS engine"); + + /* New functions have been introduced in OpenSSL 1.1.0. */ +-#if OPENSSL_VERSION_NUMBER < 0x010100000L ++#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_load_error_strings(); + SSLeay_add_ssl_algorithms(); + CTX = SSL_CTX_new(SSLv23_server_method()); +@@ -652,7 +652,7 @@ tls_init_serverengine(int verifydepth, int askcert, in + } + } + +-#if OPENSSL_VERSION_NUMBER >= 0x01010100fL ++#if OPENSSL_VERSION_NUMBER >= 0x01010100fL && !defined(LIBRESSL_VERSION_NUMBER) + /* New API added in OpenSSL 1.1.1 for TLSv1.3 cipher suites. */ + if (tls_ciphers13 != NULL) { + if (SSL_CTX_set_ciphersuites(CTX, tls_ciphers13) == 0) {