git: eaaf5dd03e57 - main - sysutils/syslog-ng: Update to 3.32.2

[Cy Schubert]

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eaaf5dd03e574cbc8a4504df46a67c1145e532c4

commit eaaf5dd03e574cbc8a4504df46a67c1145e532c4
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-05-17 15:49:25 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-05-17 16:54:17 +0000

    sysutils/syslog-ng: Update to 3.32.2
    
    Update our syslog-ng to 3.32.2 as submitted to us by our upstream.
    
    Submitted by:   Peter Czanik (CzP) <peter.czanik at oneidentity.com>
                    Balabit (a OneIdentity company) / syslog-ng upstream
---
 sysutils/syslog-ng/Makefile                    |  2 +-
 sysutils/syslog-ng/distinfo                    |  6 +++---
 sysutils/syslog-ng/files/patch-3677            | 25 +++++++++++++++++++++++++
 sysutils/syslog-ng/files/syslog-ng.conf.sample |  2 +-
 sysutils/syslog-ng/pkg-plist                   | 17 +++++++++--------
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 788256387315..5b493639feb7 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,7 +1,7 @@
 # Created by: Ivan Lago <ivan.lago at ifom-ieo-campus.it>
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.31.2
+DISTVERSION=	3.32.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 459136795d38..057d62ac07b2 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616082052
-SHA256 (syslog-ng-3.31.2.tar.gz) = 2eeb8e0dbbcb556fdd4e50bc9f29bc8c66c9b153026f87caa7567bd3139c186a
-SIZE (syslog-ng-3.31.2.tar.gz) = 5727835
+TIMESTAMP = 1620402762
+SHA256 (syslog-ng-3.32.1.tar.gz) = 19e3b76552d82c71c04230526925402c9f05fa5e6ea19b912b061850929b712d
+SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
diff --git a/sysutils/syslog-ng/files/patch-3677 b/sysutils/syslog-ng/files/patch-3677
new file mode 100644
index 000000000000..dc781313e2ca
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-3677
@@ -0,0 +1,25 @@
+diff --git modules/afmongodb/afmongodb-worker.c.old modules/afmongodb/afmongodb-worker.c
+index d111252ab5..1f65e2ff97 100644
+--- modules/afmongodb/afmongodb-worker.c.old
++++ modules/afmongodb/afmongodb-worker.c
+@@ -34,7 +34,8 @@ _worker_disconnect(LogThreadedDestWorker *s)
+   MongoDBDestWorker *self = (MongoDBDestWorker *)s;
+   MongoDBDestDriver *owner = (MongoDBDestDriver *) self->super.owner;
+ 
+-  mongoc_collection_destroy(self->coll_obj);
++  if (self->coll_obj)
++    mongoc_collection_destroy(self->coll_obj);
+   self->coll_obj = NULL;
+ 
+   if (self->client)
+@@ -63,7 +64,9 @@ _switch_collection(MongoDBDestWorker *self, const gchar *collection)
+   if (!self->client)
+     return FALSE;
+ 
+-  mongoc_collection_destroy(self->coll_obj);
++  if (self->coll_obj)
++    mongoc_collection_destroy(self->coll_obj);
++
+   self->coll_obj = mongoc_client_get_collection(self->client, owner->const_db, collection);
+ 
+   if (!self->coll_obj)
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 3260dcef4aac..3006fd93a40a 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,4 +1,4 @@
- at version:3.31
+ at version:3.32
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index dd564f139f61..5a7581d17475 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -10,6 +10,7 @@ bin/slogencrypt
 bin/slogkey
 bin/slogverify
 include/syslog-ng/cfg-walker.h
+include/syslog-ng/compat/getent-openbsd.h
 include/syslog-ng/evtlog.h
 include/syslog-ng/evtmaps.h
 include/syslog-ng/pe-versioning.h
@@ -278,18 +279,18 @@ 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.31.so.0
-lib/libevtlog-3.31.so.0.0.0
+lib/libevtlog-3.32.so.0
+lib/libevtlog-3.32.so.0.0.0
 lib/libevtlog.so
-lib/libsyslog-ng-3.31.so.0.0.0
-lib/libsyslog-ng-3.31.so.0
+lib/libsyslog-ng-3.32.so.0.0.0
+lib/libsyslog-ng-3.32.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
-lib/libloggen_helper-3.31.so.0
-lib/libloggen_helper-3.31.so.0.0.0
+lib/libloggen_helper-3.32.so.0
+lib/libloggen_helper-3.32.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-3.31.so.0
-lib/libloggen_plugin-3.31.so.0.0.0
+lib/libloggen_plugin-3.32.so.0
+lib/libloggen_plugin-3.32.so.0.0.0
 lib/libloggen_plugin.so
 lib/syslog-ng/loggen/libloggen_socket_plugin.so
 lib/syslog-ng/loggen/libloggen_ssl_plugin.so