From owner-dev-commits-ports-all@freebsd.org Thu Apr 8 15:14:09 2021 Return-Path: Delivered-To: dev-commits-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 06DC95DE7F8; Thu, 8 Apr 2021 15:14:09 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGPtS6mJTz3NxS; Thu, 8 Apr 2021 15:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAC6B45CE; Thu, 8 Apr 2021 15:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138FE8aP011131; Thu, 8 Apr 2021 15:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138FE8un011130; Thu, 8 Apr 2021 15:14:08 GMT (envelope-from git) Date: Thu, 8 Apr 2021 15:14:08 GMT Message-Id: <202104081514.138FE8un011130@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: b7cc04143049 - main - sysutils/rsyslog8 -- improve libressl compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7cc04143049938d72355c5c2ad77815d360207f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 15:14:09 -0000 The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7cc04143049938d72355c5c2ad77815d360207f commit b7cc04143049938d72355c5c2ad77815d360207f Author: Matthew Seaman AuthorDate: 2021-04-08 06:59:38 +0000 Commit: Matthew Seaman CommitDate: 2021-04-08 15:13:42 +0000 sysutils/rsyslog8 -- improve libressl compatibility PR: 254864 Reported by: dave@jetcafe.org Obtained from: Gentoo (https://bugs.gentoo.org/750842) --- sysutils/rsyslog8/Makefile | 1 + sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index a98f81b0294b..1e13685c0cc3 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,6 @@ PORTNAME= rsyslog PORTVERSION= 8.2102.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c new file mode 100644 index 000000000000..3f9ada6f8e67 --- /dev/null +++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c @@ -0,0 +1,11 @@ +--- runtime/nsd_ossl.c.orig 2021-04-08 06:34:23 UTC ++++ runtime/nsd_ossl.c +@@ -1381,7 +1381,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) + if (SSL_get_shared_ciphers(pNsd->ssl,szDbg, sizeof szDbg) != NULL) + dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg); + +- #if OPENSSL_VERSION_NUMBER >= 0x10002000L ++ #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) + if(SSL_get_shared_curve(pNsd->ssl, -1) == 0) { + LogError(0, RS_RET_NO_ERRCODE, "nsd_ossl:" + "No shared curve between syslog client and server.");