aboutsummaryrefslogtreecommitdiff
path: root/sysutils/syslog-ng
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/syslog-ng')
-rw-r--r--sysutils/syslog-ng/Makefile62
-rw-r--r--sysutils/syslog-ng/distinfo6
-rw-r--r--sysutils/syslog-ng/files/syslog-ng.conf.sample2
-rw-r--r--sysutils/syslog-ng/pkg-plist83
4 files changed, 57 insertions, 96 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 4dc613eb3783..a414a3f80b5b 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,6 +1,5 @@
PORTNAME= syslog-ng
-DISTVERSION= 4.8.2
-PORTREVISION= 4
+DISTVERSION= 4.10.1
CATEGORIES= sysutils
# official master site:
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
@@ -127,27 +126,10 @@ JAVA_MOD_CONFIGURE_ENABLE= java-modules
JAVA_MOD_USE= JAVA=yes
JAVA_MOD_BUILD_DEPENDS= gradle:devel/gradle \
bash:shells/bash
-JAVA_MOD_PLIST_DIRS= lib/syslog-ng/java-modules/elastic-jest-client
-JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-api-2.17.2.jar \
- lib/syslog-ng/java-modules/log4j-core-2.17.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/jest-2.0.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/jest-common-2.0.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/httpcore-nio-4.4.4.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/httpclient-4.5.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/httpasyncclient-4.1.1.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/slf4j-api-1.7.13.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/guava-19.0.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/gson-2.6.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/commons-lang3-3.4.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/httpcore-4.4.4.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/commons-logging-1.2.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/commons-codec-1.9.jar \
- lib/syslog-ng/java-modules/elastic-jest-client/slf4j-simple-1.7.13.jar \
+JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-api-2.24.3.jar \
+ lib/syslog-ng/java-modules/log4j-core-2.24.3.jar \
lib/syslog-ng/java-modules/hdfs.jar \
- lib/syslog-ng/java-modules/elastic-v2.jar \
- lib/syslog-ng/java-modules/kafka.jar \
lib/syslog-ng/java-modules/dummy.jar \
- lib/syslog-ng/java-modules/http.jar \
lib/syslog-ng/java-modules/syslog-ng-common.jar
PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS}
@@ -170,7 +152,7 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \
lib/syslog-ng/python/syslogng/__pycache__/persist%%PYTHON_TAG%%.pyc \
lib/syslog-ng/python/syslogng/__pycache__/source%%PYTHON_TAG%%.pyc \
lib/syslog-ng/python/syslogng/__pycache__/template%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/__pycache__/reloc%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/__pycache__/reloc%%PYTHON_TAG%%.pyc \
lib/syslog-ng/python/syslogng/dest.py \
lib/syslog-ng/python/syslogng/logger.py \
lib/syslog-ng/python/syslogng/message.py \
@@ -178,7 +160,7 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \
lib/syslog-ng/python/syslogng/persist.py \
lib/syslog-ng/python/syslogng/source.py \
lib/syslog-ng/python/syslogng/template.py \
- lib/syslog-ng/python/syslogng/reloc.py \
+ lib/syslog-ng/python/syslogng/reloc.py \
lib/syslog-ng/python/syslogng/__init__.py \
lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
lib/syslog-ng/python/syslogng/debuggercli/__init__.py \
@@ -233,17 +215,23 @@ PYTHON_MOD_PLIST_FILES= lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-
lib/syslog-ng/python/syslogng/modules/hypr/__init__.py \
lib/syslog-ng/python/syslogng/modules/hypr/__pycache__/__init__%%PYTHON_TAG%%.pyc \
lib/syslog-ng/python/syslogng/modules/hypr/scl/hypr.conf \
- lib/syslog-ng/python/syslogng/modules/s3/__init__.py \
- lib/syslog-ng/python/syslogng/modules/s3/__pycache__/__init__%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/modules/s3/__pycache__/compressable_file_buffer%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_destination%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_object_buffer%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_session_handler%%PYTHON_TAG%%.pyc \
- lib/syslog-ng/python/syslogng/modules/s3/s3_object_buffer.py \
- lib/syslog-ng/python/syslogng/modules/s3/s3_session_handler.py \
- lib/syslog-ng/python/syslogng/modules/s3/compressable_file_buffer.py \
- lib/syslog-ng/python/syslogng/modules/s3/s3_destination.py \
- lib/syslog-ng/python/syslogng/modules/s3/scl/s3.conf
+ lib/syslog-ng/python/syslogng/modules/s3/__init__.py \
+ lib/syslog-ng/python/syslogng/modules/s3/__pycache__/__init__%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/s3/__pycache__/compressable_file_buffer%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_destination%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_object_buffer%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_session_handler%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/s3/s3_object_buffer.py \
+ lib/syslog-ng/python/syslogng/modules/s3/s3_session_handler.py \
+ lib/syslog-ng/python/syslogng/modules/s3/compressable_file_buffer.py \
+ lib/syslog-ng/python/syslogng/modules/s3/s3_destination.py \
+ lib/syslog-ng/python/syslogng/modules/s3/scl/s3.conf \
+ lib/syslog-ng/python/syslogng/modules/webhook/__init__.py \
+ lib/syslog-ng/python/syslogng/modules/webhook/__pycache__/__init__%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/webhook/__pycache__/source%%PYTHON_TAG%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/webhook/scl/webhook.conf \
+ lib/syslog-ng/python/syslogng/modules/webhook/source.py
+
CURL_CONFIGURE_OFF= --with-libcurl=off
@@ -270,7 +258,9 @@ GRPC_PLIST_FILES= lib/libgrpc-protos.so \
lib/libgrpc-protos.so.0.0.0 \
lib/syslog-ng/libloki.so \
lib/syslog-ng/libotel.so \
+ lib/syslog-ng/libclickhouse.so \
lib/syslog-ng/libbigquery.so \
+ lib/syslog-ng/libpubsub.so \
lib/syslog-ng/libcloud_auth.so
MQTT_CONFIGURE_ON= --enable-mqtt --with-libpaho-mqtt=${PREFIX}
@@ -286,6 +276,10 @@ MQTT_PLIST_FILES= lib/syslog-ng/libmqtt.so
BROKEN= Default configuration does not currently support non-JSON builds
.endif
+.if ${PORT_OPTIONS:MJAVA_MOD}
+BROKEN= Java-based modules do not build due to Gradle problems
+.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 72165b95d1a0..1692b7f62616 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746636142
-SHA256 (syslog-ng-4.8.2.tar.gz) = 7d1ebe70746009dc06bd2fa5c412a1985579a9c887292f766cc775d169d60e68
-SIZE (syslog-ng-4.8.2.tar.gz) = 6944406
+TIMESTAMP = 1759241516
+SHA256 (syslog-ng-4.10.1.tar.gz) = dea90cf1dc4b8674ff191e0032f9dabc24b291abfd7f110fd092ae5f21cde5d7
+SIZE (syslog-ng-4.10.1.tar.gz) = 6993152
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index bbe2b2c3bb78..557d0f81f651 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.8
+@version:4.10
@include "scl.conf"
#
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 0663db6a8138..18cf32c0080f 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -75,8 +75,6 @@ include/syslog-ng/evtmaps.h
include/syslog-ng/fdhelpers.h
include/syslog-ng/file-perms.h
include/syslog-ng/cfg-source.h
-include/syslog-ng/filterx/expr-isset.h
-include/syslog-ng/filterx/expr-unset.h
include/syslog-ng/filter/filter-call.h
include/syslog-ng/filter/filter-cmp.h
include/syslog-ng/filter/filter-expr-parser.h
@@ -89,6 +87,7 @@ include/syslog-ng/filter/filter-pipe.h
include/syslog-ng/filter/filter-pri.h
include/syslog-ng/filter/filter-re.h
include/syslog-ng/filter/filter-tags.h
+include/syslog-ng/filter/filter-blank.h
include/syslog-ng/find-crlf.h
include/syslog-ng/generic-number.h
include/syslog-ng/gprocess.h
@@ -135,7 +134,6 @@ include/syslog-ng/logproto/logproto-client.h
include/syslog-ng/logproto/logproto-dgram-server.h
include/syslog-ng/logproto/logproto-framed-client.h
include/syslog-ng/logproto/logproto-framed-server.h
-include/syslog-ng/logproto/logproto-multiline-server.h
include/syslog-ng/logproto/logproto-record-server.h
include/syslog-ng/logproto/logproto-server.h
include/syslog-ng/logproto/logproto-text-client.h
@@ -293,72 +291,40 @@ include/syslog-ng/healthcheck/healthcheck-stats.h
include/syslog-ng/healthcheck/healthcheck.h
include/syslog-ng/healthcheck/stopwatch.h
include/syslog-ng/stats/stats-cluster-key-builder.h
-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
include/syslog-ng/compat/json.h
include/syslog-ng/cfg-helpers.h
-include/syslog-ng/filterx/expr-assign.h
-include/syslog-ng/filterx/expr-boolalg.h
-include/syslog-ng/filterx/expr-comparison.h
-include/syslog-ng/filterx/expr-function.h
-include/syslog-ng/filterx/expr-get-subscript.h
-include/syslog-ng/filterx/expr-getattr.h
-include/syslog-ng/filterx/expr-literal.h
-include/syslog-ng/filterx/expr-set-subscript.h
-include/syslog-ng/filterx/expr-setattr.h
-include/syslog-ng/filterx/expr-template.h
-include/syslog-ng/filterx/filterx-config.h
-include/syslog-ng/filterx/filterx-eval.h
-include/syslog-ng/filterx/filterx-expr.h
-include/syslog-ng/filterx/filterx-globals.h
-include/syslog-ng/filterx/filterx-object.h
-include/syslog-ng/filterx/filterx-parser.h
-include/syslog-ng/filterx/filterx-pipe.h
-include/syslog-ng/filterx/filterx-scope.h
-include/syslog-ng/filterx/filterx-weakrefs.h
-include/syslog-ng/filterx/object-datetime.h
-include/syslog-ng/filterx/object-json.h
-include/syslog-ng/filterx/object-message-value.h
-include/syslog-ng/filterx/object-null.h
-include/syslog-ng/filterx/object-primitive.h
-include/syslog-ng/filterx/object-string.h
-include/syslog-ng/filterx/expr-condition.h
-include/syslog-ng/filterx/object-dict-interface.h
-include/syslog-ng/filterx/object-json-internal.h
-include/syslog-ng/filterx/object-list-interface.h
-include/syslog-ng/filterx/filterx-private.h
-include/syslog-ng/filterx/expr-generator.h
-include/syslog-ng/filterx/expr-literal-generator.h
-include/syslog-ng/filterx/expr-regexp.h
-include/syslog-ng/filterx/expr-shorthand.h
-include/syslog-ng/filterx/expr-variable.h
-include/syslog-ng/filterx/func-istype.h
-include/syslog-ng/filterx/func-len.h
-include/syslog-ng/transport/multitransport.h
-include/syslog-ng/transport/transport-factory-id.h
-include/syslog-ng/transport/transport-factory-registry.h
-include/syslog-ng/transport/transport-factory-socket.h
-include/syslog-ng/transport/transport-factory.h
-include/syslog-ng/transport/transport-socket-proxy-private.h
-include/syslog-ng/transport/transport-socket-proxy.h
+include/syslog-ng/console.h
+include/syslog-ng/logproto/logproto-auto-server.h
+include/syslog-ng/stackdump.h
+include/syslog-ng/transport/transport-adapter.h
+include/syslog-ng/transport/transport-factory-haproxy.h
+include/syslog-ng/transport/transport-globals.h
+include/syslog-ng/transport/transport-haproxy.h
+include/syslog-ng/transport/transport-stack.h
+include/syslog-ng/notified-fd-events.h
+include/syslog-ng/file-monitor.h
+include/syslog-ng/logproto/logproto-http-scraper-responder-server.h
+include/syslog-ng/logproto/logproto-http-server.h
+include/syslog-ng/multi-line/empty-line-separated-multi-line.h
share/syslog-ng/smart-multi-line.fsm
-lib/libevtlog-4.8.so.0
-lib/libevtlog-4.8.so.0.0.0
+lib/libevtlog-4.10.so.0
+lib/libevtlog-4.10.so.0.0.0
lib/libevtlog.so
-lib/libloggen_helper-4.8.so.0
-lib/libloggen_helper-4.8.so.0.0.0
+lib/libloggen_helper-4.10.so.0
+lib/libloggen_helper-4.10.so.0.0.0
lib/libloggen_helper.so
-lib/libloggen_plugin-4.8.so.0
-lib/libloggen_plugin-4.8.so.0.0.0
+lib/libloggen_plugin-4.10.so.0
+lib/libloggen_plugin-4.10.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.8.so.0
-lib/libsyslog-ng-4.8.so.0.0.0
+lib/libsyslog-ng-4.10.so.0
+lib/libsyslog-ng-4.10.so.0.0.0
lib/libsyslog-ng-native-connector.a
lib/libsyslog-ng.so
lib/syslog-ng/libadd-contextual-data.so
@@ -422,7 +388,6 @@ share/syslog-ng/include/scl/collectd/plugin.conf
share/syslog-ng/include/scl/default-network-drivers/plugin.conf
share/syslog-ng/include/scl/discord/discord.conf
share/syslog-ng/include/scl/elasticsearch/elastic-http.conf
-share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
share/syslog-ng/include/scl/elasticsearch/elastic-datastream.conf
share/syslog-ng/include/scl/ewmm/ewmm.conf
share/syslog-ng/include/scl/fortigate/fortigate.conf
@@ -432,7 +397,6 @@ share/syslog-ng/include/scl/graylog2/plugin.conf
share/syslog-ng/include/scl/hdfs/plugin.conf
share/syslog-ng/include/scl/iptables/iptables.conf
share/syslog-ng/include/scl/junos/plugin.conf
-share/syslog-ng/include/scl/kafka/kafka-java.conf
share/syslog-ng/include/scl/kafka/kafka.conf
share/syslog-ng/include/scl/linux-audit/linux-audit.conf
share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
@@ -473,6 +437,9 @@ share/syslog-ng/include/scl/darwinosl/darwinosl-metadata-db.csv
share/syslog-ng/include/scl/darwinosl/plugin.conf
share/syslog-ng/include/scl/arr/arr.conf
share/syslog-ng/include/scl/jellyfin/jellyfin.conf
+share/syslog-ng/include/scl/azure/azure-monitor.conf
+share/syslog-ng/include/scl/freebsd-audit/plugin.conf
+share/syslog-ng/include/scl/stats-exporter/plugin.conf
share/syslog-ng/include/scl.conf
share/syslog-ng/tools/cfg-grammar.y
share/syslog-ng/tools/lex-rules.am