diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index e28485f11fac..e3f139c1fb60 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,169 +1,169 @@ PORTNAME= rsyslog -PORTVERSION= 8.2504.0 +PORTVERSION= 8.2506.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= matthew@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS WWW= https://www.rsyslog.com/ LICENSE= GPLv3 LGPL3 APACHE20 LICENSE_COMB= multi LIB_DEPENDS= libestr.so:devel/libestr \ libfastjson.so:devel/libfastjson \ liblogging-rfc3195.so:devel/liblogging \ libuuid.so:misc/e2fsprogs-libuuid \ libcurl.so:ftp/curl BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} USES= cpe libtool pkgconfig autoreconf python:env PORTSCOUT= limit:^8\. OPTIONS_DEFINE= DBI DOCS DTLS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \ MYSQL NORMALIZE PGSQL RABBITMQ RELP SNMP OPTIONS_RADIO= SSLLIB OPTIONS_RADIO_SSLLIB= GNUTLS OPENSSL OPTIONS_DEFAULT=GCRYPT OPTIONS_SUB= yes DBI_DESC= LibDBI output module for rsyslog DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_ENABLE= libdbi DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so DTLS_DESC= DTLS input/output modules DTLS_CONFIGURE_ENABLE= imdtls omdtls DTLS_PLIST_FILES= lib/rsyslog/imdtls.so \ lib/rsyslog/omdtls.so ELASTIC_DESC= Elasticsearch module for rsyslog ELASTIC_CONFIGURE_ENABLE= elasticsearch ELASTIC_PLIST_FILES= lib/rsyslog/omelasticsearch.so GCRYPT_DESC= Enable support for encrypted logfiles GCRYPT_CONFIGURE_ENABLE=libgcrypt GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error GCRYPT_BUILD_DEPENDS= libgcrypt-config:security/libgcrypt GCRYPT_PLIST_FILES= lib/rsyslog/lmcry_gcry.so GNUTLS_DESC= GNUTLS module for rsyslog GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_IMPLIES= GCRYPT GNUTLS_CONFIGURE_ENABLE=gnutls GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so GSSAPI_DESC= GSS API input/output module for rsyslog GSSAPI_CONFIGURE_ENABLE=gssapi-krb5 GSSAPI_PLIST_FILES= lib/rsyslog/imgssapi.so \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.so HTTP_DESC= HTTP output module for rsyslog HTTP_CONFIGURE_ENABLE= omhttp HTTP_PLIST_FILES= lib/rsyslog/omhttp.so JSONPARSE_DESC= JSONPARSE module for rsyslog JSONPARSE_CONFIGURE_ENABLE= mmjsonparse JSONPARSE_PLIST_FILES= lib/rsyslog/mmjsonparse.so KAFKA_DESC= Kafka input/output module for rsyslog KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= imkafka omkafka KAFKA_PLIST_FILES= lib/rsyslog/imkafka.so \ lib/rsyslog/omkafka.so MYSQL_DESC= MySQL output module for rsyslog MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql MYSQL_PLIST_FILES= lib/rsyslog/ommysql.so MYSQL_PORTDOCS= plugins/ommysql/createDB.sql NORMALIZE_DESC= Message normalization module for rsyslog NORMALIZE_LIB_DEPENDS= liblognorm.so:devel/liblognorm NORMALIZE_CONFIGURE_ENABLE= mmnormalize NORMALIZE_PLIST_FILES= lib/rsyslog/mmnormalize.so OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ OPENSSL_CFLAGS="-I ${OPENSSLINC}" OPENSSL_PLIST_FILES= lib/rsyslog/lmnsd_ossl.so PGSQL_DESC= PostgreSQL output module for rsyslog PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_PLIST_FILES= lib/rsyslog/ompgsql.so PGSQL_PORTDOCS= plugins/ompgsql/createDB.sql RABBITMQ_DESC= RabbitMQ output module for rsyslog RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= omrabbitmq RABBITMQ_PLIST_FILES= lib/rsyslog/omrabbitmq.so RELP_DESC= RELP input/output module for rsyslog RELP_LIB_DEPENDS= librelp.so:devel/librelp RELP_CONFIGURE_ENABLE= relp RELP_PLIST_FILES= lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.so SNMP_DESC= SNMP trap sender for rsyslog SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ENABLE= snmp SNMP_PLIST_FILES= lib/rsyslog/omsnmp.so .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif .ifdef WITH_SANE_HOSTNAME EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname .endif CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share INSTALL_TARGET= install-strip .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif .include .if ${ARCH} == "i386" CPPFLAGS+=-march=i686 .endif CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats \ --enable-mail --enable-omprog --enable-omstdout \ --enable-omuxsock --enable-rfc3195 --disable-testbench \ --enable-pmciscoios \ ac_cv_func_inotify_init=no ac_cv_header_sys_inotify_h=no post-patch: @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rsyslog.d ${INSTALL_DATA} ${FILESDIR}/rsyslog.conf ${STAGEDIR}${PREFIX}/etc/rsyslog.conf.sample post-install-DOCS-on: .for SQL in ${PORTDOCS:M*.sql} @${MKDIR} ${STAGEDIR}${DOCSDIR}/${SQL:H} ${INSTALL_DATA} ${WRKSRC}/${SQL} ${STAGEDIR}${DOCSDIR}/${SQL} .endfor .include diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index e6940d40aa99..5d7da6888fe6 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746644321 -SHA256 (rsyslog-8.2504.0.tar.gz) = 5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab -SIZE (rsyslog-8.2504.0.tar.gz) = 3468108 +TIMESTAMP = 1749796569 +SHA256 (rsyslog-8.2506.0.tar.gz) = 6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b +SIZE (rsyslog-8.2506.0.tar.gz) = 3484506 diff --git a/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c b/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c deleted file mode 100644 index 3d1f95b3447d..000000000000 --- a/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/imdtls/imdtls.c.orig 2024-03-31 11:10:07 UTC -+++ plugins/imdtls/imdtls.c -@@ -23,6 +23,7 @@ - */ - #include "config.h" - -+#include - #include - #include - #include diff --git a/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c b/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c deleted file mode 100644 index cd4447416a9a..000000000000 --- a/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/omdtls/omdtls.c.orig 2024-02-26 08:24:02 UTC -+++ plugins/omdtls/omdtls.c -@@ -43,6 +43,7 @@ - #endif - #include - #include -+#include - - // --- Include openssl headers as well - #include diff --git a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c index 22e76aeebaef..a16b3734ad98 100644 --- a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c +++ b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c @@ -1,18 +1,18 @@ ---- runtime/net_ossl.c.orig 2024-02-26 08:24:02 UTC +--- runtime/net_ossl.c.orig 2025-03-05 18:14:51 UTC +++ runtime/net_ossl.c -@@ -460,6 +460,7 @@ void net_ossl_lastOpenSSLErrorMsg - +@@ -514,6 +514,7 @@ void net_ossl_lastOpenSSLErrorMsg + #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) /* initialize tls config commands in openssl context */ +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd) { DEFiRet; -@@ -543,6 +544,7 @@ finalize_it: - finalize_it: +@@ -630,6 +631,7 @@ finalize_it: + } RETiRet; } +#endif - /* Convert a fingerprint to printable data. The conversion is carried out + diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c index 8fad7d5c40e8..cc4fbf8037d8 100644 --- a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c +++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c @@ -1,11 +1,11 @@ ---- runtime/nsd_ossl.c.orig 2024-02-26 08:24:02 UTC +--- runtime/nsd_ossl.c.orig 2025-06-10 09:49:19 UTC +++ runtime/nsd_ossl.c -@@ -798,7 +798,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) +@@ -854,7 +854,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) if (SSL_get_shared_ciphers(pNsd->pNetOssl->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->pNetOssl->ssl, -1) == 0) { // This is not a failure LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: " diff --git a/sysutils/rsyslog8/files/patch-tools_omusrmsg.c b/sysutils/rsyslog8/files/patch-tools_omusrmsg.c new file mode 100644 index 000000000000..9eca33ebc1ce --- /dev/null +++ b/sysutils/rsyslog8/files/patch-tools_omusrmsg.c @@ -0,0 +1,69 @@ +# This is https://github.com/rgerhards/rsyslog/commit/72b8bcc05318f0a72ec828d1a5329fa98c021eb8 +# slightly reformatted for application by the ports. + +--- tools/omusrmsg.c.orig 2025-06-10 09:49:19 UTC ++++ tools/omusrmsg.c +@@ -8,7 +8,7 @@ + * File begun on 2007-07-20 by RGerhards (extracted from syslogd.c, which at the + * time of the fork from sysklogd was under BSD license) + * +- * Copyright 2007-2018 Adiscon GmbH. ++ * Copyright 2007-2025 Adiscon GmbH. + * + * This file is part of rsyslog. + * +@@ -35,14 +35,27 @@ + #include + #include + #include +-#ifdef HAVE_UTMP_H +-# include +-# define STRUCTUTMP struct utmp +-# define UTNAME ut_name +-#else +-# include +-# define STRUCTUTMP struct utmpx +-# define UTNAME ut_user ++#ifdef HAVE_UTMPX_H ++# include ++# define STRUCTUTMP struct utmpx ++# define UTNAME ut_user ++# define setutent setutxent ++# define getutent getutxent ++# define endutent endutxent ++# ifndef UT_LINESIZE ++/* __UT_LINESIZE for glibc; _UTX_LINESIZE common on Solaris */ ++# ifdef __UT_LINESIZE ++# define UT_LINESIZE __UT_LINESIZE ++# elif defined(_UTX_LINESIZE) ++# define UT_LINESIZE _UTX_LINESIZE ++# else /* method of last resort */ ++# define UT_LINESIZE 32 ++# endif ++# endif ++#elif defined(HAVE_UTMP_H) ++# include ++# define STRUCTUTMP struct utmp ++# define UTNAME ut_name + #endif + #include + #include +@@ -173,9 +186,15 @@ ENDdbgPrintInstInfo + #ifdef OS_BSD + /* Since version 900007, FreeBSD has a POSIX compliant */ + #if defined(__FreeBSD__) && (__FreeBSD_version >= 900007) +-# define setutent(void) setutxent(void) +-# define getutent(void) getutxent(void) +-# define endutent(void) endutxent(void) ++# ifndef setutent ++# define setutent() setutxent() ++# endif ++# ifndef getutent ++# define getutent() getutxent() ++# endif ++# ifndef endutent ++# define endutent() endutxent() ++# endif + #else + static FILE *BSD_uf = NULL; + void setutent(void)