diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 61c3e112b291..885a7aee5527 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,172 +1,172 @@ PORTNAME= rsyslog -PORTVERSION= 8.2604.0 +PORTVERSION= 8.2606.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= libcurl.so:ftp/curl \ libestr.so:devel/libestr \ libfastjson.so:devel/libfastjson \ liblogging-rfc3195.so:devel/liblogging \ libprotobuf-c.so:devel/protobuf-c \ libsnappy.so:archivers/snappy \ libuuid.so:misc/libuuid \ libyaml.so:textproc/libyaml 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_DEFINE= BEATS 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 +BEATS_DESC= Enable input from Elastic *Beats +BEATS_CONFIGURE_ENABLE= imbeats +BEATS_PLIST_FILES= lib/rsyslog/imbeats.so + 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 b09e18431c1f..63690f4882cf 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1776782088 -SHA256 (rsyslog-8.2604.0.tar.gz) = 2a04b1cd6f0a5e2b60eec231acce3cf9927c4ed02bc5fbbe5dc4c35fcf887b64 -SIZE (rsyslog-8.2604.0.tar.gz) = 11110778 +TIMESTAMP = 1782557309 +SHA256 (rsyslog-8.2606.0.tar.gz) = 2574b3f3068e6955eb94ef5643e2b6a5b8585cc8eaa77209ff5cbc1e2e5f71e5 +SIZE (rsyslog-8.2606.0.tar.gz) = 11379436 diff --git a/sysutils/rsyslog8/files/extra-patch-mysql-microseconds b/sysutils/rsyslog8/files/extra-patch-mysql-microseconds index ec248b064741..ce91ec64048a 100644 --- a/sysutils/rsyslog8/files/extra-patch-mysql-microseconds +++ b/sysutils/rsyslog8/files/extra-patch-mysql-microseconds @@ -1,56 +1,63 @@ ---- ./runtime/datetime.c.orig 2010-05-04 18:57:25.588028725 -0400 -+++ ./runtime/datetime.c 2010-05-04 18:59:12.390680038 -0400 -@@ -644,18 +644,30 @@ - pBuf[1] = (ts->year / 100) % 10 + '0'; - pBuf[2] = (ts->year / 10) % 10 + '0'; - pBuf[3] = ts->year % 10 + '0'; -- pBuf[4] = (ts->month / 10) % 10 + '0'; -- pBuf[5] = ts->month % 10 + '0'; -- pBuf[6] = (ts->day / 10) % 10 + '0'; -- pBuf[7] = ts->day % 10 + '0'; -- pBuf[8] = (ts->hour / 10) % 10 + '0'; -- pBuf[9] = ts->hour % 10 + '0'; -- pBuf[10] = (ts->minute / 10) % 10 + '0'; -- pBuf[11] = ts->minute % 10 + '0'; -- pBuf[12] = (ts->second / 10) % 10 + '0'; -- pBuf[13] = ts->second % 10 + '0'; -- pBuf[14] = '\0'; -- return 15; +--- runtime/datetime.c.orig 2026-06-23 11:08:14 UTC ++++ runtime/datetime.c +@@ -788,18 +788,30 @@ static int formatTimestampToMySQL(struct syslogTime *t + pBuf[1] = (ts->year / 100) % 10 + '0'; + pBuf[2] = (ts->year / 10) % 10 + '0'; + pBuf[3] = ts->year % 10 + '0'; +- pBuf[4] = (ts->month / 10) % 10 + '0'; +- pBuf[5] = ts->month % 10 + '0'; +- pBuf[6] = (ts->day / 10) % 10 + '0'; +- pBuf[7] = ts->day % 10 + '0'; +- pBuf[8] = (ts->hour / 10) % 10 + '0'; +- pBuf[9] = ts->hour % 10 + '0'; +- pBuf[10] = (ts->minute / 10) % 10 + '0'; +- pBuf[11] = ts->minute % 10 + '0'; +- pBuf[12] = (ts->second / 10) % 10 + '0'; +- pBuf[13] = ts->second % 10 + '0'; +- pBuf[14] = '\0'; +- return 15; + pBuf[4] = '-'; + pBuf[5] = (ts->month / 10) % 10 + '0'; + pBuf[6] = ts->month % 10 + '0'; + pBuf[7] = '-'; + pBuf[8] = (ts->day / 10) % 10 + '0'; + pBuf[9] = ts->day % 10 + '0'; + pBuf[10] = ' '; + pBuf[11] = (ts->hour / 10) % 10 + '0'; + pBuf[12] = ts->hour % 10 + '0'; + pBuf[13] = ':'; + pBuf[14] = (ts->minute / 10) % 10 + '0'; + pBuf[15] = ts->minute % 10 + '0'; + pBuf[16] = ':'; + pBuf[17] = (ts->second / 10) % 10 + '0'; + pBuf[18] = ts->second % 10 + '0'; + pBuf[19] = '.'; + pBuf[20] = (ts->secfrac / 100000) % 10 + '0'; + pBuf[21] = (ts->secfrac / 10000) % 10 + '0'; + pBuf[22] = (ts->secfrac / 1000) % 10 + '0'; + pBuf[23] = (ts->secfrac / 100) % 10 + '0'; + pBuf[24] = (ts->secfrac / 10) % 10 + '0'; + pBuf[25] = ts->secfrac % 10 + '0'; + pBuf[26] = '\0'; -+ return 26; - ++ return 26; } ---- ./runtime/msg.c.orig 2010-05-04 19:00:20.241528788 -0400 -+++ ./runtime/msg.c 2010-05-04 19:00:06.136349680 -0400 -@@ -1293,7 +1293,7 @@ - case tplFmtMySQLDate: - MsgLock(pM); - if(pM->pszTIMESTAMP_MySQL == NULL) { -- if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) { -+ if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) { - MsgUnlock(pM); - return ""; - } + static int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf) { +@@ -1385,4 +1397,4 @@ ENDObjClassInit(datetime) + ENDObjClassInit(datetime) + + /* vi:set ai: +- */ +\ No newline at end of file ++ */ +--- runtime/msg.c.orig 2026-06-23 11:08:14 UTC ++++ runtime/msg.c +@@ -1624,7 +1624,7 @@ const char *getTimeReported(smsg_t *const pM, enum tpl + case tplFmtMySQLDate: + MsgLock(pM); + if (pM->pszTIMESTAMP_MySQL == NULL) { +- if ((pM->pszTIMESTAMP_MySQL = malloc(15)) == NULL) { ++ if ((pM->pszTIMESTAMP_MySQL = malloc(26)) == NULL) { + MsgUnlock(pM); + return ""; + } diff --git a/sysutils/rsyslog8/files/extra-patch-sane-hostname b/sysutils/rsyslog8/files/extra-patch-sane-hostname deleted file mode 100644 index bc7251475d81..000000000000 --- a/sysutils/rsyslog8/files/extra-patch-sane-hostname +++ /dev/null @@ -1,40 +0,0 @@ ---- ./tools/syslogd.c.orig 2010-05-04 19:02:05.548362478 -0400 -+++ ./tools/syslogd.c 2010-05-04 19:02:27.452450741 -0400 -@@ -2611,37 +2611,6 @@ - net.getLocalHostname(&LocalFQDNName); - CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName)); - glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */ -- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { -- *p++ = '\0'; -- LocalDomain = p; -- } else { -- LocalDomain = (uchar*)""; -- -- /* It's not clearly defined whether gethostname() -- * should return the simple hostname or the fqdn. A -- * good piece of software should be aware of both and -- * we want to distribute good software. Joey -- * -- * Good software also always checks its return values... -- * If syslogd starts up before DNS is up & /etc/hosts -- * doesn't have LocalHostName listed, gethostbyname will -- * return NULL. -- */ -- /* TODO: gethostbyname() is not thread-safe, but replacing it is -- * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25 -- */ -- hent = gethostbyname((char*)LocalHostName); -- if(hent) { -- free(LocalHostName); -- CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); -- -- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) -- { -- *p++ = '\0'; -- LocalDomain = p; -- } -- } -- } - - /* Convert to lower case to recognize the correct domain laterly */ - for(p = LocalDomain ; *p ; p++) diff --git a/sysutils/rsyslog8/files/patch-configure.ac b/sysutils/rsyslog8/files/patch-configure.ac new file mode 100644 index 000000000000..3cf9797b7bb8 --- /dev/null +++ b/sysutils/rsyslog8/files/patch-configure.ac @@ -0,0 +1,12 @@ +--- configure.ac.orig 2026-06-27 12:08:57 UTC ++++ configure.ac +@@ -56,9 +56,6 @@ then + + if test "$GCC" = "yes" + then +- m4_pattern_forbid([^AX_]) +- AX_IS_RELEASE([git-directory]) +- AX_COMPILER_FLAGS(,,,,[-Wunused-parameter -Wmissing-field-initializers]) + # unfortunately, AX_COMPILER_FLAGS does not provide a way to override + # the default -Wno-error=warning" flags. So we do this via sed below. + # Note: we *really* want to have this error out during CI testing! diff --git a/sysutils/rsyslog8/files/patch-plugins_impstats_Makefile.am b/sysutils/rsyslog8/files/patch-plugins_impstats_Makefile.am index ed3803f9d8dc..1d8422cda1d1 100644 --- a/sysutils/rsyslog8/files/patch-plugins_impstats_Makefile.am +++ b/sysutils/rsyslog8/files/patch-plugins_impstats_Makefile.am @@ -1,11 +1,11 @@ ---- plugins/impstats/Makefile.am.orig 2026-02-16 13:33:21 UTC +--- plugins/impstats/Makefile.am.orig 2026-06-23 11:08:14 UTC +++ plugins/impstats/Makefile.am -@@ -34,7 +34,7 @@ remote.pb-c.c remote.pb-c.h: remote.proto - BUILT_SOURCES = remote.pb-c.c remote.pb-c.h +@@ -35,7 +35,7 @@ remote.pb-c.stamp: remote.proto + remote.pb-c.c remote.pb-c.h: remote.pb-c.stamp - remote.pb-c.c remote.pb-c.h: remote.proto + remote.pb-c.stamp: remote.proto - $(PROTOC_C) --proto_path=$(srcdir) --c_out=. $< + $(PROTOC_C) --c_out=. $> - - CLEANFILES = remote.pb-c.c remote.pb-c.h - endif + { \ + echo '#if defined(__GNUC__)'; \ + echo '#pragma GCC diagnostic push'; \ diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c index d51a0d2e1a31..04df56a387d9 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 2026-02-07 11:43:26 UTC +--- runtime/nsd_ossl.c.orig 2026-06-23 11:08:14 UTC +++ runtime/nsd_ossl.c -@@ -889,7 +889,7 @@ rsRetVal osslPostHandshakeCheck(nsd_ossl_t *pNsd) { +@@ -921,7 +921,7 @@ rsRetVal 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 && !defined(ENABLE_WOLFSSL) +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) && !defined(ENABLE_WOLFSSL) if (SSL_get_shared_curve(pNsd->pNetOssl->ssl, -1) == 0) { // This is not a failure LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO,