cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update rsyslog to version 8.2204.1

Browse Source 
This includes a fix for CVE-2022-24903.
Additionally enable openssl support.

OK stehn@
This commit is contained in:
remi 2022-05-24 21:55:44 +00:00
parent 4f8e439202
commit a602ff945d
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/rsyslog/Makefile
View File

@ -6,7 +6,7 @@ COMMENT-elasticsearch = Elasticsearch plugin for rsyslog
MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch
V = 8.2102.0
V = 8.2204.1
DISTNAME = rsyslog-$V
PKGNAME-main = rsyslog-$V
PKGNAME-mysql = rsyslog-mysql-$V
@ -15,8 +15,6 @@ PKGNAME-pgsql = rsyslog-pgsql-$V
PKGNAME-elasticsearch = rsyslog-elasticsearch-$V
CATEGORIES = sysutils
REVISION-main = 0
HOMEPAGE = https://www.rsyslog.com/
MAINTAINER = Remi Locherer <remi@openbsd.org>
@ -27,11 +25,10 @@ PERMIT_PACKAGE = Yes
COMPILER = base-clang ports-gcc base-gcc
WANTLIB-main += c crypto curl estr fastjson gcrypt gmp gnutls
WANTLIB-main += gpg-error hogweed iconv idn2 intl nettle nghttp2
WANTLIB-main += gpg-error hogweed iconv idn2 intl m nettle nghttp2
WANTLIB-main += p11-kit pthread relp ssl tasn1 unistring uuid z
WANTLIB-main += brotlidec brotlienc execinfo zstd
WANTLIB-mysql += crypto m mariadb pthread ssl z
WANTLIB-normalize += estr fastjson lognorm pthread
@ -65,6 +62,7 @@ CONFIGURE_ARGS += --enable-pgsql \
--enable-mail \
--enable-mmnormalize \
--enable-gnutls \
--enable-openssl \
--enable-relp \
--enable-elasticsearch \
--enable-imfile

4
sysutils/rsyslog/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rsyslog-8.2102.0.tar.gz) = lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc=
SIZE (rsyslog-8.2102.0.tar.gz) = 3123684
SHA256 (rsyslog-8.2204.1.tar.gz) = ptcx5GrT1k9q1LGbvxv1bKR2CkSiS7loIxidwucfcCg=
SIZE (rsyslog-8.2204.1.tar.gz) = 3243183

6
sysutils/rsyslog/files/rsyslog.conf
View File

@ -4,8 +4,10 @@
# like we have with the default config. For more advanced
# things, RainerScript configuration is suggested.
#
# For more information see http://www.rsyslog.com/doc/rsyslog_conf.html
# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
# For more information see
# https://www.rsyslog.com/doc/v8-stable/configuration/index.html
# If you experience problems, see
# https://www.rsyslog.com/doc/v8-stable/troubleshooting/index.html
#### MODULES ####

13
sysutils/rsyslog/patches/patch-runtime_nsd_ossl_c Normal file
View File

@ -0,0 +1,13 @@
Index: runtime/nsd_ossl.c
--- runtime/nsd_ossl.c.orig
+++ runtime/nsd_ossl.c
@@ -1415,7 +1415,8 @@ 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) {
// This is not a failure
LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: "

1
sysutils/rsyslog/pkg/PLIST-main
View File

@ -15,6 +15,7 @@ lib/rsyslog/
@so lib/rsyslog/lmnet.so
@so lib/rsyslog/lmnetstrms.so
@so lib/rsyslog/lmnsd_gtls.so
@so lib/rsyslog/lmnsd_ossl.so
@so lib/rsyslog/lmnsd_ptcp.so
@so lib/rsyslog/lmregexp.so
@so lib/rsyslog/lmtcpclt.so