Merge branch '3.5' into 3.6

3 files changed, 138 insertions, 132 deletions

diff --git a/syslog-ng/.footprint b/syslog-ng/.footprint
index 029853d84..df47cb343 100644
--- a/syslog-ng/.footprint
+++ b/syslog-ng/.footprint
@@ -39,6 +39,7 @@ drwxr-xr-x	root/root	usr/include/syslog-ng/ack-tracker/
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-args.h
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-block-generator.h
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-block.h
+-rw-r--r--	root/root	usr/include/syslog-ng/cfg-grammar-internal.h
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-grammar.h
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-lexer-subst.h
 -rw-r--r--	root/root	usr/include/syslog-ng/cfg-lexer.h
@@ -144,6 +145,7 @@ drwxr-xr-x	root/root	usr/include/syslog-ng/logproto/
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-framed-server.h
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-indented-multiline-server.h
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-multiline-server.h
+-rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-proxied-text-server.h
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-record-server.h
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-regexp-multiline-server.h
 -rw-r--r--	root/root	usr/include/syslog-ng/logproto/logproto-server.h
@@ -248,6 +250,7 @@ drwxr-xr-x	root/root	usr/include/syslog-ng/template/
 -rw-r--r--	root/root	usr/include/syslog-ng/template/common-template-typedefs.h
 -rw-r--r--	root/root	usr/include/syslog-ng/template/compiler.h
 -rw-r--r--	root/root	usr/include/syslog-ng/template/escaping.h
+-rw-r--r--	root/root	usr/include/syslog-ng/template/eval.h
 -rw-r--r--	root/root	usr/include/syslog-ng/template/function.h
 -rw-r--r--	root/root	usr/include/syslog-ng/template/macros.h
 -rw-r--r--	root/root	usr/include/syslog-ng/template/repr.h
@@ -296,27 +299,27 @@ drwxr-xr-x	root/root	usr/include/syslog-ng/value-pairs/
 -rw-r--r--	root/root	usr/include/syslog-ng/versioning.h
 -rw-r--r--	root/root	usr/include/syslog-ng/window-size-counter.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libevtlog-3.29.so.0 -> libevtlog-3.29.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libevtlog-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libevtlog-3.30.so.0 -> libevtlog-3.30.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libevtlog-3.30.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libevtlog.la
-lrwxrwxrwx	root/root	usr/lib/libevtlog.so -> libevtlog-3.29.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libloggen_helper-3.29.so.0 -> libloggen_helper-3.29.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libloggen_helper-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libevtlog.so -> libevtlog-3.30.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libloggen_helper-3.30.so.0 -> libloggen_helper-3.30.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libloggen_helper-3.30.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libloggen_helper.la
-lrwxrwxrwx	root/root	usr/lib/libloggen_helper.so -> libloggen_helper-3.29.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libloggen_plugin-3.29.so.0 -> libloggen_plugin-3.29.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libloggen_plugin-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libloggen_helper.so -> libloggen_helper-3.30.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libloggen_plugin-3.30.so.0 -> libloggen_plugin-3.30.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libloggen_plugin-3.30.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libloggen_plugin.la
-lrwxrwxrwx	root/root	usr/lib/libloggen_plugin.so -> libloggen_plugin-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libloggen_plugin.so -> libloggen_plugin-3.30.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libsecret-storage.la
 lrwxrwxrwx	root/root	usr/lib/libsecret-storage.so -> libsecret-storage.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libsecret-storage.so.0 -> libsecret-storage.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libsecret-storage.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libsyslog-ng-3.29.so.0 -> libsyslog-ng-3.29.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libsyslog-ng-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libsyslog-ng-3.30.so.0 -> libsyslog-ng-3.30.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libsyslog-ng-3.30.so.0.0.0
 -rw-r--r--	root/root	usr/lib/libsyslog-ng-native-connector.a
 -rwxr-xr-x	root/root	usr/lib/libsyslog-ng.la
-lrwxrwxrwx	root/root	usr/lib/libsyslog-ng.so -> libsyslog-ng-3.29.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libsyslog-ng.so -> libsyslog-ng-3.30.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/syslog-ng-native-connector.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/syslog-ng.pc
@@ -393,57 +396,60 @@ drwxr-xr-x	root/root	usr/lib/syslog-ng/loggen/
 -rwxr-xr-x	root/root	usr/lib/syslog-ng/loggen/libloggen_ssl_plugin.la
 -rwxr-xr-x	root/root	usr/lib/syslog-ng/loggen/libloggen_ssl_plugin.so
 drwxr-xr-x	root/root	usr/lib/syslog-ng/python/
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng-1.0-py3.8.egg-info
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng-1.0-py3.9.egg-info
 drwxr-xr-x	root/root	usr/lib/syslog-ng/python/syslogng/
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/__init__.py
 drwxr-xr-x	root/root	usr/lib/syslog-ng/python/syslogng/__pycache__/
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-38.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-39.pyc
 drwxr-xr-x	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__init__.py
 drwxr-xr-x	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-38.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-38.opt-1.pyc
--rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-38.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/editline.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/editline.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/choicecompleter.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/commandlinelexer.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/completer.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/completerlang.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/debuggercli.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/debuglang.py
+-rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/editline.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/getoptlexer.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/langcompleter.py
 -rw-r--r--	root/root	usr/lib/syslog-ng/python/syslogng/debuggercli/lexer.py
@@ -459,82 +465,82 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/syslog-ng/
 drwxr-xr-x	root/root	usr/share/syslog-ng/include/
 drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/apache/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/apache/apache.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/checkpoint/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/checkpoint/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/cim/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/cim/adapter.conf
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/cim/template.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/cisco/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/cisco/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/collectd/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/collectd/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/default-network-drivers/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/default-network-drivers/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/elasticsearch/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/elasticsearch/elastic-http.conf
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/ewmm/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/ewmm/ewmm.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/graphite/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/graphite/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/graylog2/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/graylog2/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/hdfs/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/hdfs/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/iptables/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/iptables/iptables.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/junos/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/junos/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/kafka/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/kafka/kafka-java.conf
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/kafka/kafka.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/linux-audit/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/linux-audit/linux-audit.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/loadbalancer/
--rwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/loadbalancer/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/loggly/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/loggly/loggly.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/logmatic/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/logmatic/logmatic.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/mbox/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/mbox/mbox.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/netskope/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/netskope/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/nodejs/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/nodejs/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/osquery/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/osquery/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/pacct/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/pacct/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/paloalto/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/paloalto/panos.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/rewrite/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/rewrite/cc-mask.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/slack/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/slack/slack.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/snmptrap/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/solaris/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/solaris/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/sudo/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/sudo/sudo.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/sumologic/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/sumologic/sumologic.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/syslogconf/
--rwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/syslogconf/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/system/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/system/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/telegram/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/telegram/telegram.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/websense/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/websense/plugin.conf
-drwxrwxr-x	root/root	usr/share/syslog-ng/include/scl/windowseventlog/
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/windowseventlog/plugin.conf
--rw-rw-r--	root/root	usr/share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/apache/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/apache/apache.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/checkpoint/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/checkpoint/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/cim/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/cim/adapter.conf
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/cim/template.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/cisco/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/cisco/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/collectd/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/collectd/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/default-network-drivers/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/default-network-drivers/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/elasticsearch/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/elasticsearch/elastic-http.conf
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/ewmm/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/ewmm/ewmm.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/graphite/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/graphite/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/graylog2/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/graylog2/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/hdfs/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/hdfs/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/iptables/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/iptables/iptables.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/junos/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/junos/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/kafka/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/kafka/kafka-java.conf
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/kafka/kafka.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/linux-audit/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/linux-audit/linux-audit.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/loadbalancer/
+-rwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/loadbalancer/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/loggly/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/loggly/loggly.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/logmatic/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/logmatic/logmatic.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/mbox/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/mbox/mbox.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/netskope/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/netskope/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/nodejs/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/nodejs/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/osquery/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/osquery/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/pacct/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/pacct/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/paloalto/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/paloalto/panos.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/rewrite/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/rewrite/cc-mask.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/slack/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/slack/slack.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/snmptrap/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/solaris/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/solaris/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/sudo/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/sudo/sudo.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/sumologic/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/sumologic/sumologic.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/syslogconf/
+-rwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/syslogconf/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/system/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/system/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/telegram/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/telegram/telegram.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/websense/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/websense/plugin.conf
+drwxr-xr-x	root/root	usr/share/syslog-ng/include/scl/windowseventlog/
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/windowseventlog/plugin.conf
+-rw-r--r--	root/root	usr/share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml
 drwxr-xr-x	root/root	usr/share/syslog-ng/tools/
 -rw-r--r--	root/root	usr/share/syslog-ng/tools/cfg-grammar.y
 -rw-r--r--	root/root	usr/share/syslog-ng/tools/lex-rules.am
diff --git a/syslog-ng/.signature b/syslog-ng/.signature
index c191ee65d..6cc30ee1a 100644
--- a/syslog-ng/.signature
+++ b/syslog-ng/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yIW/UpJutNZTZcENJtSFjb/SLMDgIvyWfNkUieEsUD7szpmhN1pbkEaYtieJzesuTCCzFrJubDDfb2vFZyclwE=
-SHA256 (Pkgfile) = df6ae53fd8f2748f1a0938ee557cca014b784eb587bf31c0440725605e68a0f2
-SHA256 (.footprint) = 240f8a1affbe3d060829ca0ef2913cb4fc46467d699b5aae4f62e4876862437c
-SHA256 (syslog-ng-3.29.1.tar.gz) = 5cd6b65466671ec5b793fc703a515e07e0da39b79190b2a3c89af176d07e89fd
+RWSagIOpLGJF3/LR4LYodD47LzgNB6BG+26Ld90JmtDLFV0fSciXVFQJfwOtaSbJ8JA0JOHjLP8rcf6+JiEu1Hz4Bmu7ee7gbAo=
+SHA256 (Pkgfile) = 3b767b6dd50f5071deda472a1a21877c2857aa07439c3bd658a703a9e233621b
+SHA256 (.footprint) = b40a3b27f3416dca31d5d0a7f944b43ec7c0a0a589425e9472adb0467914accc
+SHA256 (syslog-ng-3.30.1.tar.gz) = 44e54a6186af14d01affa06bf7391cfe8fc2460bd4ba211aab5469d8b1ca5b4b
 SHA256 (syslog-ng.rc) = 4e9cabda9916c9cac1c8e511028636e40980ee29583983735d6a78fa6c7b23d9
 SHA256 (syslog-ng.conf) = 5633a8e7ebf37b3c1b7d10a9345a22bd479611afe5d7dc88076ec56048d4c115
diff --git a/syslog-ng/Pkgfile b/syslog-ng/Pkgfile
index afaf54243..eacb66f85 100644
--- a/syslog-ng/Pkgfile
+++ b/syslog-ng/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  glib json-c python3
 
 name=syslog-ng
-version=3.29.1
+version=3.30.1
 release=1
 source=(https://github.com/$name/$name/releases/download/$name-$version/$name-$version.tar.gz
   syslog-ng.rc syslog-ng.conf)