sysutils/syslog-ng: Update to 4.2.0

Patch was created and tested by our upstream Balabit representative
Peter Czanik.

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

4 files changed, 31 insertions, 17 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 8b5fb0ac6303..fabab3d4e6b1 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	syslog-ng
-DISTVERSION=	4.1.1
+DISTVERSION=	4.2.0
 CATEGORIES=	sysutils
-# using a self generated release tgz as upstream 4.0.1 tgz is broken on FreeBSD
-# see: https://github.com/syslog-ng/syslog-ng/issues/4275
+# official master site:
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
+# for development snapshots:
 # MASTER_SITES=	https://peter.czanik.hu/freebsd/
 
 MAINTAINER=	cy@FreeBSD.org
@@ -54,7 +54,6 @@ SHEBANG_FILES=	lib/merge-grammar.py
 GNU_CONFIGURE=	yes
 # Note: Even if PYTHON is deselected, glib20 will install python.
 USE_GNOME=	glib20
-# USE_PYTHON=	allflavors
 SUB_FILES=	pkg-message
 INSTALL_TARGET=	install-strip
 
@@ -148,8 +147,8 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-api-2.17.2.jar \
 				lib/syslog-ng/java-modules/http.jar \
 				lib/syslog-ng/java-modules/syslog-ng-common.jar
 
-PYTHON_USES=			python:3.5+
 PYTHON_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
+PYTHON_USES=			python:3.5+
 PYTHON_CONFIGURE_ON=		--enable-python
 PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
@@ -178,6 +177,9 @@ PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		lib/syslog-ng/python/syslogng/modules/example/__init__.py \
 		lib/syslog-ng/python/syslogng/modules/example/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/example/scl/example.conf \
+		lib/syslog-ng/python/syslogng/modules/hypr/__init__.py \
+		lib/syslog-ng/python/syslogng/modules/hypr/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
+		lib/syslog-ng/python/syslogng/modules/hypr/scl/hypr.conf \
 		lib/syslog-ng/python/syslogng/parser.py \
 		lib/syslog-ng/python/syslogng/persist.py \
 		lib/syslog-ng/python/syslogng/source.py \
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index a09ef74e3fa7..1206123a311e 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678471064
-SHA256 (syslog-ng-4.1.1.tar.gz) = d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e
-SIZE (syslog-ng-4.1.1.tar.gz) = 5556174
+TIMESTAMP = 1683789671
+SHA256 (syslog-ng-4.2.0.tar.gz) = 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda
+SIZE (syslog-ng-4.2.0.tar.gz) = 5763000
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 9eab94704515..17d3ab40c1d0 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.1
+@version:4.2
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 203f2e196b5f..af3ecaddda61 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -291,20 +291,31 @@ include/syslog-ng/versioning.h
 include/syslog-ng/window-size-counter.h
 include/syslog-ng/mainloop-threaded-worker.h
 include/syslog-ng/metrics-pipe.h
-lib/libevtlog-4.1.so.0
-lib/libevtlog-4.1.so.0.0.0
+include/syslog-ng/cfg-persist.h
+include/syslog-ng/healthcheck/healthcheck-control.h
+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
+share/syslog-ng/smart-multi-line.fsm
+lib/libevtlog-4.2.so.0
+lib/libevtlog-4.2.so.0.0.0
 lib/libevtlog.so
-lib/libloggen_helper-4.1.so.0
-lib/libloggen_helper-4.1.so.0.0.0
+lib/libloggen_helper-4.2.so.0
+lib/libloggen_helper-4.2.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-4.1.so.0
-lib/libloggen_plugin-4.1.so.0.0.0
+lib/libloggen_plugin-4.2.so.0
+lib/libloggen_plugin-4.2.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.1.so.0
-lib/libsyslog-ng-4.1.so.0.0.0
+lib/libsyslog-ng-4.2.so.0
+lib/libsyslog-ng-4.2.so.0.0.0
 lib/libsyslog-ng-native-connector.a
 lib/libsyslog-ng.so
 lib/syslog-ng/libadd-contextual-data.so
@@ -406,6 +417,7 @@ 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/include/scl/mariadb/audit.conf
+share/syslog-ng/include/scl/splunk/splunk.conf
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/merge-grammar.py