Thu Sep 16 09:22:48 2021 UTC ()
syslog-ng: update to 3.34.1

Based on package provided by Peter Czanik in PR 56406.

Changes below are for 3.34.1 only, the other 16 releases before
that are not summarized.

3.34.1
======

## Highlights

 * `regexp-parser()`: new parser that can parse messages with regular expressions

 * `redis()`: `workers()` and batching support

   The Redis driver now support the `workers()` option, which specifies the
   number of parallel workers, and the `batch-lines()` option.

   This could drastically increase the throughput of the Redis destination driver.

 * `mqtt()`: TLS and WebSocket Secure support

   The MQTT destination now supports TLS and WSS.

## Features

 * `system()` source: added support for NetBSD

 * `stats`: new statistics counter

 * `mqtt()`: username/password authentication

 * `mqtt()`: new option `http-proxy()` for specifying HTTP/HTTPS proxy for WebSocket connections
   ([#3747](https://github.com/syslog-ng/syslog-ng/pull/3747))

 * `syslog-ng-ctl`: new flag for pruning statistics

 * `disk-buffer()`: added a new option to reliable disk-buffer: `qout-size()`.

## Bugfixes

 * `network(), syslog()`: fixed network sources on NetBSD

 * `disk-buffer()`: fixed a very rare case, where the reliable disk-buffer never resumed
   after triggering `flow-control`.

 * `disk-buffer()`: fixed a rare memory leak that occurred when `mem-buf-length()`
   or `mem-buf-size()` was configured incorrectly

 * `redis()`: fixed command errors that were not detected and marked as successful delivery


(wiz)
diff -r1.966 -r1.967 pkgsrc/sysutils/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/py-syslog-ng/DESCR
diff -r1.1 -r1.2 pkgsrc/sysutils/py-syslog-ng/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/py-syslog-ng/Makefile
diff -r1.39 -r1.40 pkgsrc/sysutils/syslog-ng/Makefile
diff -r1.18 -r1.19 pkgsrc/sysutils/syslog-ng/Makefile.common
diff -r1.5 -r0 pkgsrc/sysutils/syslog-ng/Makefile.module
diff -r1.17 -r1.18 pkgsrc/sysutils/syslog-ng/PLIST
diff -r1.16 -r1.17 pkgsrc/sysutils/syslog-ng/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/syslog-ng/module.mk
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-amqp/DESCR
diff -r1.2 -r1.3 pkgsrc/sysutils/syslog-ng-amqp/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-curl/DESCR
diff -r1.22 -r1.23 pkgsrc/sysutils/syslog-ng-curl/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/syslog-ng-geoip/DESCR
diff -r1.1 -r0 pkgsrc/sysutils/syslog-ng-geoip/Makefile
diff -r1.1 -r0 pkgsrc/sysutils/syslog-ng-geoip/PLIST
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-mongodb/DESCR
diff -r1.8 -r1.9 pkgsrc/sysutils/syslog-ng-mongodb/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-redis/DESCR
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-redis/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-smtp/DESCR
diff -r1.4 -r1.5 pkgsrc/sysutils/syslog-ng-smtp/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-sql/DESCR
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-sql/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng/patches/patch-lib_signal-handler.c
diff -r1.2 -r0 pkgsrc/sysutils/syslog-ng/patches/patch-modules_system-source_system-source.c
cvs diff -r1.966 -r1.967 pkgsrc/sysutils/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/Makefile 2021/09/04 20:28:42 1.966
+++ pkgsrc/sysutils/Makefile 2021/09/16 09:22:46 1.967
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.966 2021/09/04 20:28:42 maya Exp $
+# $NetBSD: Makefile,v 1.967 2021/09/16 09:22:46 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -662,7 +662,7 @@
 SUBDIR+=	syslog-ng
 SUBDIR+=	syslog-ng-amqp
 SUBDIR+=	syslog-ng-curl
-SUBDIR+=	syslog-ng-geoip
+SUBDIR+=	syslog-ng-geoip2
 SUBDIR+=	syslog-ng-mongodb
 SUBDIR+=	syslog-ng-redis
 SUBDIR+=	syslog-ng-smtp
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/py-syslog-ng/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/py-syslog-ng/DESCR 2015/11/01 19:08:22 1.1
+++ pkgsrc/sysutils/py-syslog-ng/DESCR 2021/09/16 09:22:46 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the python bindings.
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/py-syslog-ng/PLIST (expand / switch to context diff)
--- pkgsrc/sysutils/py-syslog-ng/PLIST 2015/11/01 19:08:22 1.1
+++ pkgsrc/sysutils/py-syslog-ng/PLIST 2021/09/16 09:22:46 1.2
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/11/01 19:08:22 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/09/16 09:22:46 wiz Exp $
 ${PYSITELIB}/syslogng/__init__.py
 ${PYSITELIB}/syslogng/__init__.pyc
 ${PYSITELIB}/syslogng/debuggercli/__init__.py
@@ -13,6 +13,8 @@
 ${PYSITELIB}/syslogng/debuggercli/completerlang.pyc
 ${PYSITELIB}/syslogng/debuggercli/debuggercli.py
 ${PYSITELIB}/syslogng/debuggercli/debuggercli.pyc
+${PYSITELIB}/syslogng/debuggercli/editline.py
+${PYSITELIB}/syslogng/debuggercli/editline.pyc
 ${PYSITELIB}/syslogng/debuggercli/debuglang.py
 ${PYSITELIB}/syslogng/debuggercli/debuglang.pyc
 ${PYSITELIB}/syslogng/debuggercli/getoptlexer.py
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/py-syslog-ng/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/py-syslog-ng/Makefile 2017/01/15 13:06:04 1.2
+++ pkgsrc/sysutils/py-syslog-ng/Makefile 2021/09/16 09:22:46 1.3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/01/15 13:06:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/09/16 09:22:46 wiz Exp $
 
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 SYSLOG_MOD=		python
@@ -6,12 +6,16 @@
 COMMENT=		Syslog-ng Python module
 GITHUB_PROJECT=		syslog-ng
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--with-python=${PYVERSSUFFIX}
 
 INSTALL_TARGET+=	install-pylib
 PY_PATCHPLIST=		yes
+
+INSTALLATION_DIRS+=	${PYSITELIB}
+post-install:
+	mv ${DESTDIR}${PREFIX}/lib/syslog-ng/python/* ${DESTDIR}${PREFIX}/${PYSITELIB}
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
cvs diff -r1.39 -r1.40 pkgsrc/sysutils/syslog-ng/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/Makefile 2020/05/31 17:30:17 1.39
+++ pkgsrc/sysutils/syslog-ng/Makefile 2021/09/16 09:22:46 1.40
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2020/05/31 17:30:17 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2021/09/16 09:22:46 wiz Exp $
 
 .include "../../sysutils/syslog-ng/Makefile.common"
-
-PKGREVISION=		4
 
 CONFIGURE_ARGS+=	--enable-stomp
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/syslog-ng/Makefile.common (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/Makefile.common 2021/01/18 10:19:47 1.18
+++ pkgsrc/sysutils/syslog-ng/Makefile.common 2021/09/16 09:22:46 1.19
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.18 2021/01/18 10:19:47 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2021/09/16 09:22:46 wiz Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
-DISTNAME=	syslog-ng-3.17.2
+DISTNAME=	syslog-ng-3.34.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GITHUB:=balabit/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=syslog-ng/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.syslog-ng.org/
+HOMEPAGE=	http://www.syslog-ng.com/
 COMMENT=	Highly portable log management solution
 LICENSE=	gnu-gpl-v2
 
@@ -17,7 +17,7 @@
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/syslog-ng/distinfo
 
 USE_LANGUAGES=	c c99
-USE_TOOLS+=	flex pkg-config gmake awk:run yacc
+USE_TOOLS+=	flex pkg-config gmake awk:run bison
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_FEATURES+=	strnlen
@@ -25,7 +25,6 @@
 CHECK_PORTABILITY_SKIP+=	debian/syslog-ng.init
 
 CONFIGURE_ARGS+=	--disable-amqp
-CONFIGURE_ARGS+=	--disable-geoip
 CONFIGURE_ARGS+=	--disable-http
 CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--disable-java
@@ -41,7 +40,6 @@
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db/syslog-ng
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ivykis=system
-CONFIGURE_ARGS+=	--with-mongoc=no
 CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
 
 CONFIGURE_ARGS.SunOS+=	--enable-dynamic-linking
@@ -52,10 +50,12 @@
 SUBST_FILES.unamepath=	contrib/syslog2ng
 SUBST_VARS.unamepath=	UNAME
 
-PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 REPLACE_AWK+=		contrib/syslog2ng
 REPLACE_PYTHON+=	lib/merge-grammar.py
+
+BUILD_DEFS+=		VARBASE
 
 # Kill bundled depedencies, speeds up configure time
 post-extract:
File Deleted: pkgsrc/sysutils/syslog-ng/Attic/Makefile.module
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/syslog-ng/PLIST (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/PLIST 2018/08/15 13:08:21 1.17
+++ pkgsrc/sysutils/syslog-ng/PLIST 2021/09/16 09:22:47 1.18
@@ -1,30 +1,45 @@
-@comment $NetBSD: PLIST,v 1.17 2018/08/15 13:08:21 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.18 2021/09/16 09:22:47 wiz Exp $
 bin/dqtool
 bin/loggen
 bin/pdbtool
+bin/persist-tool
+bin/slogencrypt
+bin/slogkey
+bin/slogverify
 bin/syslog2ng
 bin/update-patterndb
-include/syslog-ng/ack_tracker.h
+include/syslog-ng/ack-tracker/ack_tracker.h
+include/syslog-ng/ack-tracker/ack_tracker_factory.h
+include/syslog-ng/ack-tracker/ack_tracker_types.h
+include/syslog-ng/ack-tracker/batched_ack_tracker.h
+include/syslog-ng/ack-tracker/bookmark.h
+include/syslog-ng/ack-tracker/consecutive_ack_record_container.h
+include/syslog-ng/ack-tracker/consecutive_ack_tracker.h
+include/syslog-ng/ack-tracker/instant_ack_tracker.h
 include/syslog-ng/afinter.h
 include/syslog-ng/alarms.h
 include/syslog-ng/apphook.h
 include/syslog-ng/atomic-gssize.h
 include/syslog-ng/atomic.h
 include/syslog-ng/block-ref-parser.h
-include/syslog-ng/bookmark.h
 include/syslog-ng/cache.h
 include/syslog-ng/cfg-args.h
 include/syslog-ng/cfg-block-generator.h
 include/syslog-ng/cfg-block.h
+include/syslog-ng/cfg-grammar-internal.h
 include/syslog-ng/cfg-grammar.h
 include/syslog-ng/cfg-lexer-subst.h
 include/syslog-ng/cfg-lexer.h
 include/syslog-ng/cfg-parser.h
+include/syslog-ng/cfg-path.h
 include/syslog-ng/cfg-tree.h
+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/getent-bb.h
+include/syslog-ng/compat/getent-generic.h
+include/syslog-ng/compat/getent-openbsd.h
+include/syslog-ng/compat/getent-sun.h
 include/syslog-ng/compat/getent.h
 include/syslog-ng/compat/getutent.h
 include/syslog-ng/compat/glib.h
@@ -35,6 +50,7 @@
 include/syslog-ng/compat/socket.h
 include/syslog-ng/compat/string.h
 include/syslog-ng/compat/time.h
+include/syslog-ng/compat/un.h
 include/syslog-ng/control/control-commands.h
 include/syslog-ng/control/control-main.h
 include/syslog-ng/control/control-server.h
@@ -45,6 +61,8 @@
 include/syslog-ng/debugger/tracer.h
 include/syslog-ng/dnscache.h
 include/syslog-ng/driver.h
+include/syslog-ng/dynamic-window-pool.h
+include/syslog-ng/dynamic-window.h
 include/syslog-ng/evtlog.h
 include/syslog-ng/evtmaps.h
 include/syslog-ng/fdhelpers.h
@@ -68,7 +86,7 @@
 include/syslog-ng/host-id.h
 include/syslog-ng/host-resolve.h
 include/syslog-ng/hostname.h
-include/syslog-ng/late_ack_tracker.h
+include/syslog-ng/list-adt.h
 include/syslog-ng/loggen_helper.h
 include/syslog-ng/loggen_plugin.h
 include/syslog-ng/logmatcher.h
@@ -95,6 +113,7 @@
 include/syslog-ng/logproto/logproto-framed-server.h
 include/syslog-ng/logproto/logproto-indented-multiline-server.h
 include/syslog-ng/logproto/logproto-multiline-server.h
+include/syslog-ng/logproto/logproto-proxied-text-server.h
 include/syslog-ng/logproto/logproto-record-server.h
 include/syslog-ng/logproto/logproto-regexp-multiline-server.h
 include/syslog-ng/logproto/logproto-server.h
@@ -105,10 +124,12 @@
 include/syslog-ng/logqueue.h
 include/syslog-ng/logreader.h
 include/syslog-ng/logsource.h
-include/syslog-ng/logstamp.h
-include/syslog-ng/logthrdestdrv.h
+include/syslog-ng/logthrdest/logthrdestdrv.h
+include/syslog-ng/logthrsource/logthrfetcherdrv.h
+include/syslog-ng/logthrsource/logthrsourcedrv.h
 include/syslog-ng/logwriter.h
 include/syslog-ng/mainloop-call.h
+include/syslog-ng/mainloop-control.h
 include/syslog-ng/mainloop-io-worker.h
 include/syslog-ng/mainloop-worker.h
 include/syslog-ng/mainloop.h
@@ -117,14 +138,8 @@
 include/syslog-ng/misc.h
 include/syslog-ng/ml-batched-timer.h
 include/syslog-ng/module-config.h
-include/syslog-ng/modules/add-contextual-data/add-contextual-data-parser.h
-include/syslog-ng/modules/add-contextual-data/add-contextual-data-selector.h
-include/syslog-ng/modules/add-contextual-data/add-contextual-data-template-selector.h
-include/syslog-ng/modules/add-contextual-data/add-contextual-data.h
-include/syslog-ng/modules/add-contextual-data/context-info-db.h
-include/syslog-ng/modules/add-contextual-data/contextual-data-record-scanner.h
-include/syslog-ng/modules/add-contextual-data/csv-contextual-data-record-scanner.h
 include/syslog-ng/msg-format.h
+include/syslog-ng/msg-stats.h
 include/syslog-ng/nondumpable-allocator.h
 include/syslog-ng/parse-number.h
 include/syslog-ng/parser/parser-expr-parser.h
@@ -146,6 +161,9 @@
 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-set-facility.h
+include/syslog-ng/rewrite/rewrite-set-pri.h
+include/syslog-ng/rewrite/rewrite-set-severity.h
 include/syslog-ng/rewrite/rewrite-set-tag.h
 include/syslog-ng/rewrite/rewrite-set.h
 include/syslog-ng/rewrite/rewrite-subst.h
@@ -155,12 +173,16 @@
 include/syslog-ng/scanner/csv-scanner/csv-scanner.h
 include/syslog-ng/scanner/kv-scanner/kv-scanner.h
 include/syslog-ng/scanner/list-scanner/list-scanner.h
+include/syslog-ng/scanner/xml-scanner/xml-scanner.h
 include/syslog-ng/scratch-buffers.h
 include/syslog-ng/secret-storage.h
 include/syslog-ng/seqnum.h
 include/syslog-ng/serialize.h
 include/syslog-ng/service-management.h
 include/syslog-ng/signal-handler.h
+include/syslog-ng/signal-slot-connector/signal-slot-connector.h
+include/syslog-ng/stats/aggregator/stats-aggregator-registry.h
+include/syslog-ng/stats/aggregator/stats-aggregator.h
 include/syslog-ng/stats/stats-cluster-logpipe.h
 include/syslog-ng/stats/stats-cluster-single.h
 include/syslog-ng/stats/stats-cluster.h
@@ -171,7 +193,6 @@
 include/syslog-ng/stats/stats-query-commands.h
 include/syslog-ng/stats/stats-query.h
 include/syslog-ng/stats/stats-registry.h
-include/syslog-ng/stats/stats-syslog.h
 include/syslog-ng/stats/stats.h
 include/syslog-ng/str-format.h
 include/syslog-ng/str-repr/decode.h
@@ -184,6 +205,7 @@
 include/syslog-ng/template/common-template-typedefs.h
 include/syslog-ng/template/compiler.h
 include/syslog-ng/template/escaping.h
+include/syslog-ng/template/eval.h
 include/syslog-ng/template/function.h
 include/syslog-ng/template/macros.h
 include/syslog-ng/template/repr.h
@@ -191,7 +213,18 @@
 include/syslog-ng/template/templates.h
 include/syslog-ng/template/user-function.h
 include/syslog-ng/thread-utils.h
-include/syslog-ng/timeutils.h
+include/syslog-ng/timeutils/cache.h
+include/syslog-ng/timeutils/conv.h
+include/syslog-ng/timeutils/format.h
+include/syslog-ng/timeutils/misc.h
+include/syslog-ng/timeutils/names.h
+include/syslog-ng/timeutils/scan-timestamp.h
+include/syslog-ng/timeutils/timeutils.h
+include/syslog-ng/timeutils/unixtime.h
+include/syslog-ng/timeutils/wallclocktime.h
+include/syslog-ng/timeutils/zonecache.h
+include/syslog-ng/timeutils/zonedb.h
+include/syslog-ng/timeutils/zoneinfo.h
 include/syslog-ng/tls-support.h
 include/syslog-ng/tlscontext.h
 include/syslog-ng/transport/logtransport.h
@@ -206,12 +239,14 @@
 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/userdb.h
 include/syslog-ng/utf8utils.h
 include/syslog-ng/uuid.h
 include/syslog-ng/value-pairs/cmdline.h
 include/syslog-ng/value-pairs/evttag.h
+include/syslog-ng/value-pairs/internals.h
 include/syslog-ng/value-pairs/transforms.h
 include/syslog-ng/value-pairs/value-pairs.h
 include/syslog-ng/versioning.h
@@ -231,14 +266,15 @@
 lib/syslog-ng/libafstomp.la
 lib/syslog-ng/libafuser.la
 lib/syslog-ng/libappmodel.la
+lib/syslog-ng/libazure-auth-header.la
 lib/syslog-ng/libbasicfuncs.la
 lib/syslog-ng/libcef.la
 lib/syslog-ng/libconfgen.la
 lib/syslog-ng/libcryptofuncs.la
 lib/syslog-ng/libcsvparser.la
-lib/syslog-ng/libdate.la
 lib/syslog-ng/libdbparser.la
 lib/syslog-ng/libdisk-buffer.la
+lib/syslog-ng/libexamples.la
 lib/syslog-ng/libgraphite.la
 lib/syslog-ng/libhook-commands.la
 lib/syslog-ng/libjson-plugin.la
@@ -246,16 +282,30 @@
 lib/syslog-ng/liblinux-kmsg-format.la
 lib/syslog-ng/libmap-value-pairs.la
 lib/syslog-ng/libpseudofile.la
+lib/syslog-ng/libregexp-parser.la
 ${PLIST.systemd}lib/syslog-ng/libsdjournal.la
-lib/syslog-ng/libsnmptrapd-parser.la
+lib/syslog-ng/libsecure-logging.la
 lib/syslog-ng/libstardate.la
 lib/syslog-ng/libsyslogformat.la
 lib/syslog-ng/libsystem-source.la
 lib/syslog-ng/libtags-parser.la
 lib/syslog-ng/libtfgetent.la
+lib/syslog-ng/libtimestamp.la
 lib/syslog-ng/libxml.la
 lib/syslog-ng/loggen/libloggen_socket_plugin.la
 lib/syslog-ng/loggen/libloggen_ssl_plugin.la
+man/man1/dqtool.1
+man/man1/loggen.1
+man/man1/pdbtool.1
+man/man1/persist-tool.1
+man/man1/slogencrypt.1
+man/man1/slogkey.1
+man/man1/slogverify.1
+man/man1/syslog-ng-ctl.1
+man/man1/syslog-ng-debun.1
+man/man5/syslog-ng.conf.5
+man/man7/secure-logging.7
+man/man8/syslog-ng.8
 sbin/syslog-ng
 sbin/syslog-ng-ctl
 sbin/syslog-ng-debun
@@ -266,35 +316,49 @@
 share/examples/syslog-ng/syslog-ng.conf.RedHat
 share/examples/syslog-ng/syslog-ng.conf.SunOS
 share/syslog-ng/include/scl/apache/apache.conf
+share/syslog-ng/include/scl/cee/adapter.conf
+share/syslog-ng/include/scl/checkpoint/plugin.conf
 share/syslog-ng/include/scl/cim/adapter.conf
 share/syslog-ng/include/scl/cim/template.conf
 share/syslog-ng/include/scl/cisco/plugin.conf
+share/syslog-ng/include/scl/collectd/plugin.conf
 share/syslog-ng/include/scl/default-network-drivers/plugin.conf
-share/syslog-ng/include/scl/elasticsearch/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/ewmm/ewmm.conf
+share/syslog-ng/include/scl/fortigate/fortigate.conf
 share/syslog-ng/include/scl/graphite/README
 share/syslog-ng/include/scl/graphite/plugin.conf
 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/kafka/plugin.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
 share/syslog-ng/include/scl/loadbalancer/plugin.conf
 share/syslog-ng/include/scl/loggly/loggly.conf
 share/syslog-ng/include/scl/logmatic/logmatic.conf
 share/syslog-ng/include/scl/mbox/mbox.conf
+share/syslog-ng/include/scl/netskope/plugin.conf
 share/syslog-ng/include/scl/nodejs/plugin.conf
 share/syslog-ng/include/scl/osquery/plugin.conf
 share/syslog-ng/include/scl/pacct/plugin.conf
+share/syslog-ng/include/scl/paloalto/panos.conf
 share/syslog-ng/include/scl/rewrite/cc-mask.conf
+share/syslog-ng/include/scl/slack/slack.conf
 share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
 share/syslog-ng/include/scl/solaris/plugin.conf
 share/syslog-ng/include/scl/sudo/sudo.conf
+share/syslog-ng/include/scl/sumologic/sumologic.conf
 share/syslog-ng/include/scl/syslogconf/README
 share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
 share/syslog-ng/include/scl/syslogconf/plugin.conf
 share/syslog-ng/include/scl/system/plugin.conf
 share/syslog-ng/include/scl/telegram/telegram.conf
+share/syslog-ng/include/scl/websense/plugin.conf
 share/syslog-ng/include/scl/windowseventlog/plugin.conf
 share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml
 share/syslog-ng/tools/cfg-grammar.y
@@ -306,4 +370,3 @@
 share/syslog-ng/xsd/patterndb-3.xsd
 share/syslog-ng/xsd/patterndb-4.xsd
 share/syslog-ng/xsd/patterndb-5.xsd
-@pkgdir share/examples/syslog-ng/patterndb.d
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/syslog-ng/distinfo (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/distinfo 2019/03/15 10:04:00 1.16
+++ pkgsrc/sysutils/syslog-ng/distinfo 2021/09/16 09:22:47 1.17
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.16 2019/03/15 10:04:00 bouyer Exp $
+$NetBSD: distinfo,v 1.17 2021/09/16 09:22:47 wiz Exp $
 
-SHA1 (syslog-ng-3.17.2.tar.gz) = 75d7881d2cf258017c3b98fd37ceb3322c1855ad
-RMD160 (syslog-ng-3.17.2.tar.gz) = 6464dd3fd20662e69e3056d090bcce470be90e93
-SHA512 (syslog-ng-3.17.2.tar.gz) = 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
-Size (syslog-ng-3.17.2.tar.gz) = 9119227 bytes
+SHA1 (syslog-ng-3.34.1.tar.gz) = b0c02f7ca30d6b29722630c7c62961f1941c886f
+RMD160 (syslog-ng-3.34.1.tar.gz) = 2e8759268de8a57d631eab7d6ea3577ad5feb401
+SHA512 (syslog-ng-3.34.1.tar.gz) = f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10
+Size (syslog-ng-3.34.1.tar.gz) = 5903489 bytes
 SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
-SHA1 (patch-configure) = 2d8ef2285de44de016f44e51be47cd4c1178dfdb
+SHA1 (patch-configure) = 94d1ffade36a2c3d2385657403872a0240a80277
-SHA1 (patch-lib_signal-handler.c) = dd59ad8dba34139da6233aa65ded757f3268ac5c
+SHA1 (patch-lib_signal-handler.c) = 52206c566c2fcb418208deb2940ab1e69168344a
-SHA1 (patch-modules_system-source_system-source.c) = 14c2bb4b6681766da1330b43965da9547cf73b12
File Added: pkgsrc/sysutils/syslog-ng/module.mk
# $NetBSD: module.mk,v 1.1 2021/09/16 09:22:47 wiz Exp $
# used by sysutils/py-syslog-ng/Makefile
# used by sysutils/syslog-ng-amqp/Makefile
# used by sysutils/syslog-ng-curl/Makefile
# used by sysutils/syslog-ng-geoip/Makefile
# used by sysutils/syslog-ng-mongodb/Makefile
# used by sysutils/syslog-ng-redis/Makefile
# used by sysutils/syslog-ng-smtp/Makefile
# used by sysutils/syslog-ng-sql/Makefile

.include "../../sysutils/syslog-ng/Makefile.common"

PKGNAME?=	${DISTNAME:S/ng/ng-${SYSLOG_MOD}/}

DEPENDS+=	syslog-ng-${PKGVERSION_NOREV}{nb*,}:../../sysutils/syslog-ng

CONFIGURE_ARGS+=	--enable-${SYSLOG_MOD}

SYSLOG_MOD_DIR?=	${SYSLOG_MOD}
SYSLOG_MOD_TARGET?=	${SYSLOG_MOD_DIR}
BUILD_TARGET?=		modules/${SYSLOG_MOD_DIR}/lib${SYSLOG_MOD_TARGET}.la

# Avoid building common stuff
MAKE_FLAGS+=		MODULE_DEPS_LIBS=""

INSTALL_TARGET=		install-moduleLTLIBRARIES
INSTALL_MAKE_FLAGS+=	lib_LTLIBRARIES=""
INSTALL_MAKE_FLAGS+=	module_LTLIBRARIES=${BUILD_TARGET}

INSTALLATION_DIRS=	lib/syslog-ng
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-amqp/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-amqp/DESCR 2016/08/21 20:20:27 1.1
+++ pkgsrc/sysutils/syslog-ng-amqp/DESCR 2021/09/16 09:22:47 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the amqp module.
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/syslog-ng-amqp/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-amqp/Makefile 2020/01/18 21:50:59 1.2
+++ pkgsrc/sysutils/syslog-ng-amqp/Makefile 2021/09/16 09:22:47 1.3
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2020/01/18 21:50:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2021/09/16 09:22:47 wiz Exp $
 
 SYSLOG_MOD=		afamqp
 SYSLOG_MOD_TARGET=	afamqp
 COMMENT=		Syslog-ng RabbitMQ module
-PKGREVISION=		1
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--enable-amqp
 CONFIGURE_ARGS+=	--with-librabbitmq-client=system
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-curl/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-curl/DESCR 2016/08/21 20:20:59 1.1
+++ pkgsrc/sysutils/syslog-ng-curl/DESCR 2021/09/16 09:22:47 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the curl module.
cvs diff -r1.22 -r1.23 pkgsrc/sysutils/syslog-ng-curl/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-curl/Makefile 2021/04/21 13:25:25 1.22
+++ pkgsrc/sysutils/syslog-ng-curl/Makefile 2021/09/16 09:22:47 1.23
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/04/21 13:25:25 adam Exp $
+# $NetBSD: Makefile,v 1.23 2021/09/16 09:22:47 wiz Exp $
 
 SYSLOG_MOD=		http
 COMMENT=		Syslog-ng curl module
-PKGREVISION=		11
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--enable-http
 CONFIGURE_ARGS+=	--with-libcurl=${BUILDLINK_PREFIX.curl}
File Deleted: pkgsrc/sysutils/syslog-ng-geoip/Attic/DESCR
File Deleted: pkgsrc/sysutils/syslog-ng-geoip/Attic/Makefile
File Deleted: pkgsrc/sysutils/syslog-ng-geoip/Attic/PLIST
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-mongodb/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-mongodb/DESCR 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-mongodb/DESCR 2021/09/16 09:22:47 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the mongodb module.
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/syslog-ng-mongodb/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-mongodb/Makefile 2021/04/21 11:42:44 1.8
+++ pkgsrc/sysutils/syslog-ng-mongodb/Makefile 2021/09/16 09:22:47 1.9
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2021/04/21 11:42:44 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/09/16 09:22:47 wiz Exp $
 
 SYSLOG_MOD=		mongodb
 SYSLOG_MOD_DIR=		afmongodb
 COMMENT=		Syslog-ng MongoDB module
-PKGREVISION=		6
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--with-mongoc=system
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-redis/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-redis/DESCR 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-redis/DESCR 2021/09/16 09:22:47 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the redis module.
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-redis/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-redis/Makefile 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-redis/Makefile 2021/09/16 09:22:47 1.2
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/16 09:22:47 wiz Exp $
 
 SYSLOG_MOD=		redis
 COMMENT=		Syslog-ng Redis module
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--with-libhires=${BUILDLINK_PREFIX.hiredis}
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-smtp/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-smtp/DESCR 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-smtp/DESCR 2021/09/16 09:22:48 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the smtp module.
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/syslog-ng-smtp/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-smtp/Makefile 2020/01/18 21:50:59 1.4
+++ pkgsrc/sysutils/syslog-ng-smtp/Makefile 2021/09/16 09:22:48 1.5
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 21:50:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/16 09:22:48 wiz Exp $
 
 SYSLOG_MOD=		smtp
 SYSLOG_MOD_DIR=		afsmtp
 COMMENT=		Syslog-ng SMTP module
-PKGREVISION=		1
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 
 CONFIGURE_ARGS+=	--with-libesmtp=${BUILDLINK_PREFIX.libesmtp}
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-sql/DESCR (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-sql/DESCR 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-sql/DESCR 2021/09/16 09:22:48 1.2
@@ -4,3 +4,5 @@
 	* message integrity, message encryption
 	* portability
 	* better network forwarding
+
+This package contains the sql module.
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng-sql/Makefile (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng-sql/Makefile 2015/10/29 16:34:14 1.1
+++ pkgsrc/sysutils/syslog-ng-sql/Makefile 2021/09/16 09:22:48 1.2
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/16 09:22:48 wiz Exp $
 
 SYSLOG_MOD=		sql
 SYSLOG_MOD_DIR=		afsql
 COMMENT=		Syslog-ng SQL module
 
-.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../sysutils/syslog-ng/module.mk"
 .include "../../databases/libdbi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/patches/Attic/patch-configure (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/patches/Attic/patch-configure 2017/01/10 18:54:15 1.3
+++ pkgsrc/sysutils/syslog-ng/patches/Attic/patch-configure 2021/09/16 09:22:47 1.4
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure,v 1.3 2017/01/10 18:54:15 fhajny Exp $
+$NetBSD: patch-configure,v 1.4 2021/09/16 09:22:47 wiz Exp $
 
 Portability.
 
---- configure.orig	2016-12-21 15:00:32.000000000 +0000
+--- configure.orig	2021-09-10 11:02:58.000000000 +0000
 +++ configure
-@@ -16463,7 +16463,7 @@ $as_echo_n "checking for JAVA_VERSION...
+@@ -19950,7 +19950,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-          if test "x$PYLINT" == "x"; then
++          if test "x$PYLINT" = "x"; then
+             # Extract the first word of "pylint", so it can be a program name with args.
+ set dummy pylint; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -20067,7 +20067,7 @@ $as_echo_n "checking for JAVA_VERSION...
    JAVA_HOME_CHECKER="/usr/libexec/java_home"
  
    if test "x$JAVAC_BIN" != "x"; then
@@ -13,7 +22,7 @@
        JAVAC_BIN=`
    READLINK_TARGET=$JAVAC_BIN
    cd $(dirname "$READLINK_TARGET")
-@@ -16570,7 +16570,7 @@ $as_echo_n "checking for JAVA_VERSION...
+@@ -20174,7 +20174,7 @@ $as_echo_n "checking for JAVA_VERSION...
    JAVA_HOME_CHECKER="/usr/libexec/java_home"
  
    if test "x$JAVAC_BIN" != "x"; then
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/syslog-ng/patches/Attic/patch-lib_signal-handler.c (expand / switch to context diff)
--- pkgsrc/sysutils/syslog-ng/patches/Attic/patch-lib_signal-handler.c 2019/03/15 10:04:00 1.1
+++ pkgsrc/sysutils/syslog-ng/patches/Attic/patch-lib_signal-handler.c 2021/09/16 09:22:47 1.2
@@ -1,11 +1,12 @@
-$NetBSD: patch-lib_signal-handler.c,v 1.1 2019/03/15 10:04:00 bouyer Exp $
+$NetBSD: patch-lib_signal-handler.c,v 1.2 2021/09/16 09:22:47 wiz Exp $
+
 sigaction() is the old, compat syscall. On NetBSD call the up to date one.
 
---- lib/signal-handler.c.orig	2019-03-15 09:25:35.669181384 +0100
-+++ lib/signal-handler.c	2019-03-15 09:29:02.023178726 +0100
-@@ -45,6 +45,9 @@
+--- lib/signal-handler.c.orig	2021-06-09 18:47:52.838429049 +0200
++++ lib/signal-handler.c	2021-06-09 18:48:47.322106570 +0200
+@@ -84,12 +84,16 @@
  static int
- call_original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
+ _original_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
  {
 +#ifdef __NetBSD__
 +  __libc_sigaction14(signum, act, oldact);
@@ -13,11 +14,10 @@
    static int (*real_sa)(int, const struct sigaction *, struct sigaction *);
  
    if (real_sa == NULL)
-@@ -52,6 +55,7 @@
-       real_sa = dlsym(RTLD_NEXT, "sigaction");
-     }
+     real_sa = dlsym(RTLD_NEXT, "sigaction");
+ 
    return real_sa(signum, act, oldact);
 +#endif
  }
  
- static gboolean
+ static gint
File Deleted: pkgsrc/sysutils/syslog-ng/patches/Attic/patch-modules_system-source_system-source.c