Date: Thu, 8 Apr 2021 15:14:08 GMT From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b7cc04143049 - main - sysutils/rsyslog8 -- improve libressl compatibility Message-ID: <202104081514.138FE8un011130@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7cc04143049938d72355c5c2ad77815d360207f commit b7cc04143049938d72355c5c2ad77815d360207f Author: Matthew Seaman <matthew@FreeBSD.org> AuthorDate: 2021-04-08 06:59:38 +0000 Commit: Matthew Seaman <matthew@FreeBSD.org> 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.");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104081514.138FE8un011130>