sysutils/syslog-ng: Update to 3.35.1

Submitted by:	Peter Czanik (CzP) <peter.czanik@oneidentity.com>
		Balabit (a OneIdentity company) / syslog-ng upstream
Reported by:	Peter Czanik (CzP) <peter.czanik@oneidentity.com>
		Balabit (a OneIdentity company) / syslog-ng upstream

4 files changed, 22 insertions, 16 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 83fef3507b3b..4c4c322710ac 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,7 +1,7 @@
 # Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.35.1
+DISTVERSION=	3.36.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 
@@ -123,7 +123,8 @@ 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-1.2.16.jar \
+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 \
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 42c8d9d8bd81..351d26c12e56 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636989174
-SHA256 (syslog-ng-3.35.1.tar.gz) = 1d0238b06b3e5987c859e5b529ecee738f75bacff04b149398b1fe8cbb121e53
-SIZE (syslog-ng-3.35.1.tar.gz) = 5901321
+TIMESTAMP = 1646416310
+SHA256 (syslog-ng-3.36.1.tar.gz) = 90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b
+SIZE (syslog-ng-3.36.1.tar.gz) = 5968598
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 639928c588ad..ebfcbbf7749a 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,4 +1,4 @@
-@version:3.35
+@version:3.36
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index a6bb370f4590..7ea32bae76de 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -55,6 +55,9 @@ include/syslog-ng/control/control-commands.h
 include/syslog-ng/control/control-main.h
 include/syslog-ng/control/control-server.h
 include/syslog-ng/control/control.h
+include/syslog-ng/control/control-command-thread.h
+include/syslog-ng/control/control-connection.h
+include/syslog-ng/control/control-server-unix.h
 include/syslog-ng/crypto.h
 include/syslog-ng/debugger/debugger-main.h
 include/syslog-ng/debugger/debugger.h
@@ -79,7 +82,6 @@ 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-throttle.h
 include/syslog-ng/find-crlf.h
 include/syslog-ng/gprocess.h
 include/syslog-ng/gsockaddr.h
@@ -187,6 +189,7 @@ include/syslog-ng/resolved-configurable-paths.h
 include/syslog-ng/rewrite/rewrite-expr-parser.h
 include/syslog-ng/rewrite/rewrite-expr.h
 include/syslog-ng/rewrite/rewrite-groupset.h
+include/syslog-ng/rewrite/rewrite-rename.h
 include/syslog-ng/rewrite/rewrite-set-facility.h
 include/syslog-ng/rewrite/rewrite-set-pri.h
 include/syslog-ng/rewrite/rewrite-set-severity.h
@@ -266,7 +269,7 @@ include/syslog-ng/transport/transport-pipe.h
 include/syslog-ng/transport/transport-socket.h
 include/syslog-ng/transport/transport-tls.h
 include/syslog-ng/transport/transport-udp-socket.h
-include/syslog-ng/type-hinting.h
+include/syslog-ng/logmsg/type-hinting.h
 include/syslog-ng/userdb.h
 include/syslog-ng/utf8utils.h
 include/syslog-ng/uuid.h
@@ -277,20 +280,21 @@ include/syslog-ng/value-pairs/transforms.h
 include/syslog-ng/value-pairs/value-pairs.h
 include/syslog-ng/versioning.h
 include/syslog-ng/window-size-counter.h
-lib/libevtlog-3.35.so.0
-lib/libevtlog-3.35.so.0.0.0
+include/syslog-ng/mainloop-threaded-worker.h
+lib/libevtlog-3.36.so.0
+lib/libevtlog-3.36.so.0.0.0
 lib/libevtlog.so
-lib/libloggen_helper-3.35.so.0
-lib/libloggen_helper-3.35.so.0.0.0
+lib/libloggen_helper-3.36.so.0
+lib/libloggen_helper-3.36.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-3.35.so.0
-lib/libloggen_plugin-3.35.so.0.0.0
+lib/libloggen_plugin-3.36.so.0
+lib/libloggen_plugin-3.36.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-3.35.so.0
-lib/libsyslog-ng-3.35.so.0.0.0
+lib/libsyslog-ng-3.36.so.0
+lib/libsyslog-ng-3.36.so.0.0.0
 lib/libsyslog-ng-native-connector.a
 lib/libsyslog-ng.so
 lib/syslog-ng/libadd-contextual-data.so
@@ -324,6 +328,7 @@ lib/syslog-ng/libtags-parser.so
 lib/syslog-ng/libtfgetent.so
 lib/syslog-ng/libtimestamp.so
 lib/syslog-ng/libxml.so
+lib/syslog-ng/librate-limit-filter.so
 lib/syslog-ng/loggen/libloggen_socket_plugin.so
 lib/syslog-ng/loggen/libloggen_ssl_plugin.so
 libdata/pkgconfig/syslog-ng-native-connector.pc