On 18.11.2026 18:55, Stuart Henderson wrote: > Seems reasonable. Alternatively you could take a daily-stable checkout. > > Their normal release cycle is to make a new 'scheduled stable' once > every 2 months (i.e. unless they push an early release, 8.2612.0 around > 20 Dec). > > ok
So instead of managing patches manually, it then makes more sense to directly take master and build rsyslog on that. According to their docs, master is also "stable" and users are encouraged to use that, see: https://www.rsyslog.com/downloads/download-daily-build/ The changes to the port are equal to before, but now based on GH_COMMIT. The version tag is set to the upcoming 8.2612.0+pre0, so we can increase if needed (CVEs or whatever) until the final version is out on ~ Dec 20th. Only question. If 8.2612.0 is out and we drop the pre0, does pkg_add see this as newer or do we have to bump REV (or do we have a better solution)? Again...lightly tested and running fine. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.60 diff -u -p -r1.60 Makefile --- Makefile 26 Aug 2025 16:08:32 -0000 1.60 +++ Makefile 19 Nov 2026 08:17:50 -0000 @@ -6,14 +6,17 @@ COMMENT-elasticsearch = Elasticsearch pl MULTI_PACKAGES = -main -mysql -normalize -pgsql -elasticsearch -V = 8.2404.0 -DISTNAME = rsyslog-$V -PKGNAME-main = rsyslog-$V -PKGNAME-mysql = rsyslog-mysql-$V -PKGNAME-normalize = rsyslog-normalize-$V -PKGNAME-pgsql = rsyslog-pgsql-$V -PKGNAME-elasticsearch = rsyslog-elasticsearch-$V -REVISION = 1 +V = 8.2612.0pre0 +GH_ACCOUNT = rsyslog +GH_PROJECT = rsyslog +GH_COMMIT = a073c65ebb105e466d8de52edac3810e6ae0a0ad + +DISTNAME = rsyslog-${V} +PKGNAME-main = rsyslog-${V} +PKGNAME-mysql = rsyslog-mysql-${V} +PKGNAME-normalize = rsyslog-normalize-${V} +PKGNAME-pgsql = rsyslog-pgsql-${V} +PKGNAME-elasticsearch = rsyslog-elasticsearch-${V} CATEGORIES = sysutils @@ -29,6 +32,7 @@ WANTLIB-main += c crypto curl estr fast WANTLIB-main += gpg-error hogweed iconv idn2 intl m nettle nghttp2 WANTLIB-main += p11-kit pthread relp ssl tasn1 unistring uuid z WANTLIB-main += execinfo nghttp3 ngtcp2 ngtcp2_crypto_libressl +WANTLIB-main += yaml protobuf-c snappy WANTLIB-mysql += crypto m mariadb pthread ssl z @@ -39,8 +43,11 @@ WANTLIB-pgsql += crypto m pq pthread ssl WANTLIB-elasticsearch += crypto curl m nghttp2 pthread ssl z WANTLIB-elasticsearch += nghttp3 ngtcp2 ngtcp2_crypto_libressl -LIB_DEPENDS-main = devel/libfastjson \ +LIB_DEPENDS-main = archivers/snappy \ + devel/libfastjson \ devel/libestr \ + devel/libyaml \ + devel/protobuf-c \ net/curl \ security/libgcrypt \ security/gnutls \ @@ -55,9 +62,14 @@ LIB_DEPENDS-pgsql = databases/postgresql RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PKGPATH},-main RUN_DEPENDS-elasticsearch = ${PKGNAME-main}:${PKGPATH},-main -SITES = https://www.rsyslog.com/files/download/rsyslog/ +BUILD_DEPENDS += devel/autoconf-archive + +AUTOCONF_VERSION = 2.71 +AUTOMAKE_VERSION = 1.16 +CONFIGURE_STYLE = autoreconf + +USE_GMAKE= Yes -CONFIGURE_STYLE = gnu LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_ARGS += --enable-pgsql \ --enable-mysql \ @@ -68,7 +80,8 @@ CONFIGURE_ARGS += --enable-pgsql \ --enable-relp \ --enable-elasticsearch \ --enable-imfile -CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-install: rm ${PREFIX}/lib/rsyslog/*.la Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 1 Aug 2024 14:23:03 -0000 1.14 +++ distinfo 19 Nov 2026 08:17:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.2404.0.tar.gz) = MFKNFA7BsfB5IkCB+jffbgZYf/QrAuPmHy2qBSbFTTM= -SIZE (rsyslog-8.2404.0.tar.gz) = 3408657 +SHA256 (rsyslog-8.2612.0pre0-a073c65e.tar.gz) = 7vDb0FZWr3EpLvN9eyCDJoBdKqO6kY+evWn7batx9+I= +SIZE (rsyslog-8.2612.0pre0-a073c65e.tar.gz) = 14129172 Index: patches/patch-runtime_net_ossl_c =================================================================== RCS file: patches/patch-runtime_net_ossl_c diff -N patches/patch-runtime_net_ossl_c --- patches/patch-runtime_net_ossl_c 1 Aug 2024 14:23:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,46 +0,0 @@ -LibreSSL does not support SSL_CONF_cmd. -This is already present in rsyslog master and will most likely ship -with a future version. -https://github.com/rsyslog/rsyslog/commit/b79fd513271bdd02d8a37fa4197d2f293aaf6d11 - -Index: runtime/net_ossl.c ---- runtime/net_ossl.c.orig -+++ runtime/net_ossl.c -@@ -59,7 +59,9 @@ void net_ossl_set_ssl_verify_callback(SSL *pSsl, int f - void net_ossl_set_ctx_verify_callback(SSL_CTX *pCtx, int flags); - void net_ossl_set_bio_callback(BIO *conn); - int net_ossl_verify_callback(int status, X509_STORE_CTX *store); -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd); -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - rsRetVal net_ossl_chkpeercertvalidity(net_ossl_t *pThis, SSL *ssl, uchar *fromHostIP); - X509* net_ossl_getpeercert(net_ossl_t *pThis, SSL *ssl, uchar *fromHostIP); - rsRetVal net_ossl_peerfingerprint(net_ossl_t *pThis, X509* certpeer, uchar *fromHostIP); -@@ -472,6 +474,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,8 +560,8 @@ 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 - * returned in a new cstr object. It is the caller's responsibility to -@@ -1195,7 +1198,9 @@ CODESTARTobjQueryInterface(net_ossl) - pIf->osslPeerfingerprint = net_ossl_peerfingerprint; - pIf->osslGetpeercert = net_ossl_getpeercert; - pIf->osslChkpeercertvalidity = net_ossl_chkpeercertvalidity; -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - pIf->osslApplyTlscgfcmd = net_ossl_apply_tlscgfcmd; -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - pIf->osslSetBioCallback = net_ossl_set_bio_callback; - pIf->osslSetCtxVerifyCallback = net_ossl_set_ctx_verify_callback; - pIf->osslSetSslVerifyCallback = net_ossl_set_ssl_verify_callback; Index: patches/patch-runtime_net_ossl_h =================================================================== RCS file: patches/patch-runtime_net_ossl_h diff -N patches/patch-runtime_net_ossl_h --- patches/patch-runtime_net_ossl_h 1 Aug 2024 14:23:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -LibreSSL does not support SSL_CONF_cmd. -This is already present in rsyslog master and will most likely ship -with a future version. -https://github.com/rsyslog/rsyslog/commit/b79fd513271bdd02d8a37fa4197d2f293aaf6d11 - -Index: runtime/net_ossl.h ---- runtime/net_ossl.h.orig -+++ runtime/net_ossl.h -@@ -88,7 +88,9 @@ BEGINinterface(net_ossl) /* name must also be changed - rsRetVal (*osslPeerfingerprint)(net_ossl_t *pThis, X509* certpeer, uchar *fromHostIP); - X509* (*osslGetpeercert)(net_ossl_t *pThis, SSL *ssl, uchar *fromHostIP); - rsRetVal (*osslChkpeercertvalidity)(net_ossl_t *pThis, SSL *ssl, uchar *fromHostIP); -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - rsRetVal (*osslApplyTlscgfcmd)(net_ossl_t *pThis, uchar *tlscfgcmd); -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - void (*osslSetBioCallback)(BIO *conn); - void (*osslSetCtxVerifyCallback)(SSL_CTX *pCtx, int flags); - void (*osslSetSslVerifyCallback)(SSL *pSsl, int flags); Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v retrieving revision 1.10 diff -u -p -r1.10 PLIST-main --- pkg/PLIST-main 8 Nov 2022 11:17:12 -0000 1.10 +++ pkg/PLIST-main 19 Nov 2026 08:17:50 -0000 @@ -7,6 +7,7 @@ lib/rsyslog/ @so lib/rsyslog/imfile.so @so lib/rsyslog/imklog.so @so lib/rsyslog/immark.so +@so lib/rsyslog/impstats.so @so lib/rsyslog/imrelp.so @so lib/rsyslog/imtcp.so @so lib/rsyslog/imudp.so @@ -22,6 +23,8 @@ lib/rsyslog/ @so lib/rsyslog/lmtcpsrv.so @so lib/rsyslog/lmzlibw.so @so lib/rsyslog/mmexternal.so +@so lib/rsyslog/mmleefparse.so +@so lib/rsyslog/omkinesis.so @so lib/rsyslog/ommail.so @so lib/rsyslog/omrelp.so @so lib/rsyslog/omtesting.so -- Mark Patruck ( mark at wrapped.cx ) GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51 https://www.wrapped.cx
