Index | Thread | Search

From:
Remi Locherer <remi.locherer@relo.ch>
Subject:
[update] rsyslog version 8.24.04.0
To:
ports@openbsd.org
Date:
Sun, 14 Jul 2024 21:08:44 +0200

Download raw body.

Thread
Hi,

This updates the rsyslog port to version 8.2404.0.

The project already released a newer release. But that does not
compile because of some additions in their net_ossl code.

To make 8.2404.0 compile with LibreSSL I had to add a new patch.

I verified that the suslogd regress tests are still happy with this
version of rsyslog installed.

Since I'm not running rsyslog myself and I'm not particularily
interested in it anymore I removed myself as maintainer.

OK?

Remi


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
diff -u -p -r1.57 Makefile
--- Makefile	27 Sep 2023 17:16:33 -0000	1.57
+++ Makefile	26 May 2024 08:26:59 -0000
@@ -6,7 +6,7 @@ COMMENT-elasticsearch =	Elasticsearch pl
 
 MULTI_PACKAGES =	-main -mysql -normalize -pgsql -elasticsearch
 
-V =			8.2208.0
+V =			8.2404.0
 DISTNAME =		rsyslog-$V
 PKGNAME-main =		rsyslog-$V
 PKGNAME-mysql =		rsyslog-mysql-$V
@@ -22,8 +22,6 @@ REVISION-pgsql =	0
 
 HOMEPAGE =		https://www.rsyslog.com/
 
-MAINTAINER =		Remi Locherer <remi@openbsd.org>
-
 # GPLv3+
 PERMIT_PACKAGE =	Yes
 
@@ -32,7 +30,7 @@ COMPILER =		base-clang ports-gcc base-gc
 WANTLIB-main +=		c crypto curl estr fastjson gcrypt gmp gnutls
 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-main +=		execinfo nghttp3 ngtcp2 ngtcp2_crypto_quictls
 
 WANTLIB-mysql +=	crypto m mariadb pthread ssl z
 
@@ -41,6 +39,7 @@ WANTLIB-normalize +=	estr fastjson logno
 WANTLIB-pgsql +=	crypto m pq pthread ssl
 
 WANTLIB-elasticsearch +=	crypto curl m nghttp2 pthread ssl z
+WANTLIB-elasticsearch +=	nghttp3 ngtcp2 ngtcp2_crypto_quictls
 
 LIB_DEPENDS-main =	devel/libfastjson \
 			devel/libestr \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
diff -u -p -r1.13 distinfo
--- distinfo	6 Oct 2022 20:34:55 -0000	1.13
+++ distinfo	20 May 2024 19:08:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.2208.0.tar.gz) = FN5o57jlqwxdc0+C4tyf/yLNf0cQrWkHJ+sQp7mz314=
-SIZE (rsyslog-8.2208.0.tar.gz) = 3262298
+SHA256 (rsyslog-8.2404.0.tar.gz) = MFKNFA7BsfB5IkCB+jffbgZYf/QrAuPmHy2qBSbFTTM=
+SIZE (rsyslog-8.2404.0.tar.gz) = 3408657
Index: patches/patch-runtime_net_ossl_c
===================================================================
RCS file: patches/patch-runtime_net_ossl_c
diff -N patches/patch-runtime_net_ossl_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-runtime_net_ossl_c	20 May 2024 19:52:41 -0000
@@ -0,0 +1,24 @@
+LibreSSL does not support SSL_CONF_CTX.
+This patch is already present in rsyslog master and will most likely
+ship with a future version.
+
+Index: runtime/net_ossl.c
+--- runtime/net_ossl.c.orig
++++ runtime/net_ossl.c
+@@ -472,6 +472,7 @@ void net_ossl_lastOpenSSLErrorMsg
+ 	}
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* initialize tls config commands in openssl context
+  */
+ rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd)
+@@ -557,7 +558,7 @@ rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, u
+ finalize_it:
+ 	RETiRet;
+ }
+-
++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
+ 
+ /* Convert a fingerprint to printable data. The  conversion is carried out
+  * according IETF I-D syslog-transport-tls-12. The fingerprint string is