Update 3.29.1 --> 3.30.1

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

5 files changed, 19 insertions, 34 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index c3971171a35a..00fd12c27071 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.29.1
-PORTREVISION=	2
+DISTVERSION=	3.30.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 
@@ -182,6 +181,8 @@ PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/templatelexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/editline.cpython-37.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/editline.py \
 		lib/syslog-ng/python/syslogng/debuggercli/tflang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
 
@@ -210,6 +211,7 @@ BROKEN=		Default configuration does not currently support non-JSON builds
 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:
 	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index fc3b45128a98..76870e150636 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598679319
-SHA256 (syslog-ng-3.29.1.tar.gz) = 5cd6b65466671ec5b793fc703a515e07e0da39b79190b2a3c89af176d07e89fd
-SIZE (syslog-ng-3.29.1.tar.gz) = 5111614
+TIMESTAMP = 1605799809
+SHA256 (syslog-ng-3.30.1.tar.gz) = 44e54a6186af14d01affa06bf7391cfe8fc2460bd4ba211aab5469d8b1ca5b4b
+SIZE (syslog-ng-3.30.1.tar.gz) = 5707042
diff --git a/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c b/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c
deleted file mode 100644
index b92530e0fbda..000000000000
--- a/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/afsocket/socket-options.c.orig	2020-08-10 18:04:39 UTC
-+++ modules/afsocket/socket-options.c
-@@ -86,7 +86,16 @@ _setup_keepalive(gint fd)
- static gboolean
- _setup_reuseport(gint fd)
- {
--#ifdef SO_REUSEPORT
-+#if defined(SO_REUSEPORT_LB)
-+  gint on = 1;
-+  if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT_LB, &on, sizeof(on)) < 0)
-+    {
-+      msg_error("The kernel refused our SO_REUSEPORT_LB setting",
-+                evt_tag_error("error"));
-+      return FALSE;
-+    }
-+  return TRUE;
-+#elif defined(SO_REUSEPORT)
-   gint on = 1;
-   if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0)
-     {
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 6da4747a5706..625b821f33dd 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.29
+@version:3.30
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 744e36621523..ad1ddd859197 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -269,22 +269,25 @@ include/syslog-ng/ack-tracker/consecutive_ack_tracker.h
 include/syslog-ng/ack-tracker/instant_ack_tracker.h
 include/syslog-ng/ack-tracker/ack_tracker_factory.h
 include/syslog-ng/ack-tracker/batched_ack_tracker.h
+include/syslog-ng/cfg-grammar-internal.h
+include/syslog-ng/logproto/logproto-proxied-text-server.h
+include/syslog-ng/template/eval.h
 lib/syslog-ng/libazure-auth-header.so
 lib/libsecret-storage.so
 lib/libsecret-storage.so.0
 lib/libsecret-storage.so.0.0.0
-lib/libevtlog-3.29.so.0
-lib/libevtlog-3.29.so.0.0.0
+lib/libevtlog-3.30.so.0
+lib/libevtlog-3.30.so.0.0.0
 lib/libevtlog.so
-lib/libsyslog-ng-3.29.so.0.0.0
-lib/libsyslog-ng-3.29.so.0
+lib/libsyslog-ng-3.30.so.0.0.0
+lib/libsyslog-ng-3.30.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
-lib/libloggen_helper-3.29.so.0
-lib/libloggen_helper-3.29.so.0.0.0
+lib/libloggen_helper-3.30.so.0
+lib/libloggen_helper-3.30.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-3.29.so.0
-lib/libloggen_plugin-3.29.so.0.0.0
+lib/libloggen_plugin-3.30.so.0
+lib/libloggen_plugin-3.30.so.0.0.0
 lib/libloggen_plugin.so
 lib/syslog-ng/loggen/libloggen_socket_plugin.so
 lib/syslog-ng/loggen/libloggen_ssl_plugin.so