Date: Mon, 29 Jan 2024 18:54:05 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d7857e5c7148 - main - sysutils/syslog-ng: Update to 4.6.0 Message-ID: <202401291854.40TIs5ZT040328@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7857e5c714834972ad613a67461408295e26719 commit d7857e5c714834972ad613a67461408295e26719 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-01-29 18:41:26 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-01-29 18:53:59 +0000 sysutils/syslog-ng: Update to 4.6.0 Patch was created and tested by our upstream representative Peter Czanik. Submitted by: Peter Czanik (CzP) <peter.czanik@oneidentity.com> Balabit (a OneIdentity company) / syslog-ng upstream --- sysutils/syslog-ng/Makefile | 22 +++++++++++++++++----- sysutils/syslog-ng/distinfo | 6 +++--- sysutils/syslog-ng/files/syslog-ng.conf.sample | 2 +- sysutils/syslog-ng/pkg-plist | 26 ++++++++++++++++++-------- 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ce2990fe0280..8daa364aeb19 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,5 +1,5 @@ PORTNAME= syslog-ng -DISTVERSION= 4.4.0 +DISTVERSION= 4.6.0 CATEGORIES= sysutils # official master site: MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -29,7 +29,7 @@ CONFLICTS?= syslog-ng syslog-ng[0-9] \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST GRPC OPTIONS_DEFAULT= CURL JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -47,8 +47,7 @@ AMQP_DESC= Build with AMQP support RIEMANN_DESC= Build with Riemann support KAFKA_DESC= Build with Kafka (librdkafka) support SNMPDEST_DESC= Build with SNMP destination (net-snmp) support - -# USE_GCC= yes +GRPC_DESC= Build with experimental GRPC-based modules (OpenTelemetry, Loki, etc.) USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng @@ -61,7 +60,7 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --enable-manpages \ - --disable-linux-caps --disable-cpp \ + --disable-linux-caps \ --datadir=${PREFIX}/share/ --with-ivykis=system \ --with-python=${PYTHON_VER} --with-python-packages=none @@ -259,6 +258,15 @@ KAFKA_CONFIGURE_OFF= --disable-kafka KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_PLIST_FILES= lib/syslog-ng/libkafka.so +GRPC_CONFIGURE_ON= --enable-cpp +GRPC_CONFIGURE_OFF= --disable-cpp +GRPC_LIB_DEPENDS= libgrpc.so:devel/grpc +GRPC_PLIST_FILES= lib/libgrpc-protos.so \ + lib/libgrpc-protos.so.0 \ + lib/libgrpc-protos.so.0.0.0 \ + lib/syslog-ng/libloki.so \ + lib/syslog-ng/libotel.so + .include <bsd.port.pre.mk> .if !${PORT_OPTIONS:MJSON} @@ -269,6 +277,10 @@ BROKEN= Default configuration does not currently support non-JSON builds BROKEN= Java modules do not build currently .endif +.if ${PORT_OPTIONS:MGRPC} +BROKEN= GRPC-based modules do not build currently +.endif + post-patch: @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist touch -r ${WRKSRC}/lib/cfg-grammar.y ${WRKSRC}/lib/merge-grammar.py diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index cee1f09dfbd4..028adc89e82a 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695673548 -SHA256 (syslog-ng-4.4.0.tar.gz) = 583b147f3ec17fbc2dbbf31aafb1e3966237d7541313de5b41ea885dc16d932e -SIZE (syslog-ng-4.4.0.tar.gz) = 6208437 +TIMESTAMP = 1706192500 +SHA256 (syslog-ng-4.6.0.tar.gz) = b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f +SIZE (syslog-ng-4.6.0.tar.gz) = 6671746 diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample index 6421d11deb8a..5d918a5b9e4c 100644 --- a/sysutils/syslog-ng/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample @@ -1,4 +1,4 @@ -@version:4.4 +@version:4.6 @include "scl.conf" # diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index 3e1091564d3c..648931f69795 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -37,6 +37,7 @@ include/syslog-ng/cfg-walker.h include/syslog-ng/cfg.h include/syslog-ng/children.h include/syslog-ng/compat/compat.h +include/syslog-ng/compat/curl.h include/syslog-ng/compat/getent-generic.h include/syslog-ng/compat/getent-openbsd.h include/syslog-ng/compat/getent-sun.h @@ -239,6 +240,7 @@ include/syslog-ng/template/repr.h include/syslog-ng/template/simple-function.h include/syslog-ng/template/templates.h include/syslog-ng/template/user-function.h +include/syslog-ng/template/globals.h include/syslog-ng/thread-utils.h include/syslog-ng/timeutils/cache.h include/syslog-ng/timeutils/conv.h @@ -292,21 +294,22 @@ include/syslog-ng/cfg-monitor.h include/syslog-ng/multi-line/multi-line-pattern.h include/syslog-ng/multi-line/smart-multi-line.h include/syslog-ng/stats/stats-compat.h +include/syslog-ng/on-error.h share/syslog-ng/smart-multi-line.fsm -lib/libevtlog-4.4.so.0 -lib/libevtlog-4.4.so.0.0.0 +lib/libevtlog-4.6.so.0 +lib/libevtlog-4.6.so.0.0.0 lib/libevtlog.so -lib/libloggen_helper-4.4.so.0 -lib/libloggen_helper-4.4.so.0.0.0 +lib/libloggen_helper-4.6.so.0 +lib/libloggen_helper-4.6.so.0.0.0 lib/libloggen_helper.so -lib/libloggen_plugin-4.4.so.0 -lib/libloggen_plugin-4.4.so.0.0.0 +lib/libloggen_plugin-4.6.so.0 +lib/libloggen_plugin-4.6.so.0.0.0 lib/libloggen_plugin.so lib/libsecret-storage.so lib/libsecret-storage.so.0 lib/libsecret-storage.so.0.0.0 -lib/libsyslog-ng-4.4.so.0 -lib/libsyslog-ng-4.4.so.0.0.0 +lib/libsyslog-ng-4.6.so.0 +lib/libsyslog-ng-4.6.so.0.0.0 lib/libsyslog-ng-native-connector.a lib/libsyslog-ng.so lib/syslog-ng/libadd-contextual-data.so @@ -411,6 +414,13 @@ share/syslog-ng/include/scl/mariadb/audit.conf share/syslog-ng/include/scl/splunk/splunk.conf share/syslog-ng/include/scl/logscale/logscale.conf share/syslog-ng/include/scl/opensearch/opensearch.conf +share/syslog-ng/include/scl/google/google-pubsub.conf +share/syslog-ng/include/scl/openobserve/openobserve.conf +share/syslog-ng/include/scl/pgsql/pgsql.conf +share/syslog-ng/include/scl/pihole/pihole.conf +share/syslog-ng/include/scl/qbittorrent/qbittorrent.conf +share/syslog-ng/include/scl/darwinosl/darwinosl-metadata-db.csv +share/syslog-ng/include/scl/darwinosl/plugin.conf share/syslog-ng/include/scl.conf share/syslog-ng/tools/cfg-grammar.y share/syslog-ng/tools/lex-rules.am
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401291854.40TIs5ZT040328>