sysutils/syslog-ng: Update to 4.3.0

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

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

4 files changed, 49 insertions, 44 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index de27c690ffc1..784830696b42 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	syslog-ng
-DISTVERSION=	4.2.0
+DISTVERSION=	4.3.0
 CATEGORIES=	sysutils
 # official master site:
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
@@ -16,11 +16,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libivykis.so:devel/ivykis
 
 USES=		autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
-		libtool pathfix pkgconfig python:build shebangfix ssl
+		libtool pathfix pkgconfig python:3.5+,build shebangfix ssl
 
 CPE_VENDOR=	oneidentity
 
@@ -30,7 +31,7 @@ CONFLICTS?=	syslog-ng syslog-ng[0-9] \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST
 OPTIONS_DEFAULT=	CURL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
@@ -42,12 +43,15 @@ REDIS_DESC=		Build with Redis support
 JAVA_DESC=		Build with Java support (no modules)
 JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
 PYTHON_DESC=		Build with Python ${PYTHON_VER} support
+PYTHON_MOD_DESC=	Build with Python modules (Kubernetes, Hyper, etc.)
 CURL_DESC=		Build with Curl HTTP support
 AMQP_DESC=		Build with AMQP support
 RIEMANN_DESC=		Build with Riemann support
 KAFKA_DESC=		Build with Kafka (librdkafka) support
 SNMPDEST_DESC=		Build with SNMP destination (net-snmp) support
 
+# USE_GCC=	yes
+
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 SHEBANG_FILES=	lib/merge-grammar.py
@@ -59,8 +63,8 @@ INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --enable-manpages \
-		--disable-linux-caps \
-		--datadir=${PREFIX}/share/ \
+		--disable-linux-caps --disable-cpp \
+		--datadir=${PREFIX}/share/ --with-ivykis=system \
 		--with-python=${PYTHON_VER} --with-python-packages=none
 
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
@@ -154,12 +158,8 @@ PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		etc/python/README.md \
 		lib/syslog-ng/python/requirements.txt \
-		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/requires.txt \
 		lib/syslog-ng/python/syslogng/__pycache__/confgen%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/confgen.py \
-		lib/syslog-ng/python/syslogng/modules/kubernetes/__init__.py \
-		lib/syslog-ng/python/syslogng/modules/kubernetes/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
-		lib/syslog-ng/python/syslogng/modules/kubernetes/scl/kubernetes.conf \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt \
@@ -174,12 +174,6 @@ PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		lib/syslog-ng/python/syslogng/dest.py \
 		lib/syslog-ng/python/syslogng/logger.py \
 		lib/syslog-ng/python/syslogng/message.py \
-		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 \
@@ -225,6 +219,21 @@ PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		lib/syslog-ng/python/syslogng/debuggercli/tflang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
 
+PYTHON_MOD_IMPLIES=		PYTHON
+PYTHON_MOD_CONFIGURE_ON=	--enable-python-modules
+PYTHON_MOD_CONFIGURE_OFF=	--disable-python-modules
+PYTHON_MOD_PLIST_FILES=		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/requires.txt \
+		lib/syslog-ng/python/syslogng/modules/kubernetes/__init__.py \
+		lib/syslog-ng/python/syslogng/modules/kubernetes/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
+		lib/syslog-ng/python/syslogng/modules/kubernetes/scl/kubernetes.conf \
+		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
+
+
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_CONFIGURE_ON=		--enable-http
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
@@ -247,9 +256,12 @@ KAFKA_PLIST_FILES=		lib/syslog-ng/libkafka.so
 BROKEN=		Default configuration does not currently support non-JSON builds
 .endif
 
+.if ${PORT_OPTIONS:MJAVA_MOD}
+BROKEN=		Java modules do not build currently
+.endif
+
 post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
-	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 	touch -r ${WRKSRC}/lib/cfg-grammar.y ${WRKSRC}/lib/merge-grammar.py
 
 post-patch-JAVA_MOD-on:
@@ -268,7 +280,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
 		${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \
-		${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc
+		${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
 		${STAGEDIR}${PREFIX}/include/syslog-ng/
 
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 1206123a311e..df118622b228 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683789671
-SHA256 (syslog-ng-4.2.0.tar.gz) = 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda
-SIZE (syslog-ng-4.2.0.tar.gz) = 5763000
+TIMESTAMP = 1690191982
+SHA256 (syslog-ng-4.3.0.tar.gz) = 9c9747819014cfbd282d5c95e310937dc5122fe7c610d143e01d550e9f2c3869
+SIZE (syslog-ng-4.3.0.tar.gz) = 6090929
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 17d3ab40c1d0..269c39e50b56 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.2
+@version:4.3
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index af3ecaddda61..7100519358b6 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -7,7 +7,6 @@ bin/slogkey
 bin/slogverify
 bin/update-patterndb
 bin/syslog-ng-update-virtualenv
-@sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 include/syslog-ng/ack-tracker/ack_tracker.h
 include/syslog-ng/ack-tracker/ack_tracker_factory.h
@@ -52,6 +51,8 @@ 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/compat/cpp-end.h
+include/syslog-ng/compat/cpp-start.h
 include/syslog-ng/control/control-commands.h
 include/syslog-ng/control/control-main.h
 include/syslog-ng/control/control-server.h
@@ -104,18 +105,6 @@ include/syslog-ng/iv_thread.h
 include/syslog-ng/iv_tls.h
 include/syslog-ng/iv_wait.h
 include/syslog-ng/iv_work.h
-include/syslog-ng/ivykis/iv.h
-include/syslog-ng/ivykis/iv_avl.h
-include/syslog-ng/ivykis/iv_event.h
-include/syslog-ng/ivykis/iv_event_raw.h
-include/syslog-ng/ivykis/iv_fd_pump.h
-include/syslog-ng/ivykis/iv_list.h
-include/syslog-ng/ivykis/iv_popen.h
-include/syslog-ng/ivykis/iv_signal.h
-include/syslog-ng/ivykis/iv_thread.h
-include/syslog-ng/ivykis/iv_tls.h
-include/syslog-ng/ivykis/iv_wait.h
-include/syslog-ng/ivykis/iv_work.h
 include/syslog-ng/list-adt.h
 include/syslog-ng/loggen_helper.h
 include/syslog-ng/loggen_plugin.h
@@ -156,6 +145,8 @@ 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/logscheduler-pipe.h
+include/syslog-ng/logscheduler.h
 include/syslog-ng/mainloop-call.h
 include/syslog-ng/mainloop-control.h
 include/syslog-ng/mainloop-io-worker.h
@@ -302,20 +293,20 @@ 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-4.3.so.0
+lib/libevtlog-4.3.so.0.0.0
 lib/libevtlog.so
-lib/libloggen_helper-4.2.so.0
-lib/libloggen_helper-4.2.so.0.0.0
+lib/libloggen_helper-4.3.so.0
+lib/libloggen_helper-4.3.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-4.2.so.0
-lib/libloggen_plugin-4.2.so.0.0.0
+lib/libloggen_plugin-4.3.so.0
+lib/libloggen_plugin-4.3.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.2.so.0
-lib/libsyslog-ng-4.2.so.0.0.0
+lib/libsyslog-ng-4.3.so.0
+lib/libsyslog-ng-4.3.so.0.0.0
 lib/libsyslog-ng-native-connector.a
 lib/libsyslog-ng.so
 lib/syslog-ng/libadd-contextual-data.so
@@ -418,6 +409,8 @@ 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/include/scl/logscale/logscale.conf
+share/syslog-ng/include/scl.conf
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/merge-grammar.py