git: 8cc70f94b9d9 - 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=8cc70f94b9d920ad31700852bde258ac6f9bb79f

commit 8cc70f94b9d920ad31700852bde258ac6f9bb79f
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-07-20 14:59:42 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-07-21 21:17:29 +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, 14 insertions(+), 38 deletions(-)

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 5b493639feb7..f60896ef17dd 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.32.1
+DISTVERSION=	3.33.2
 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 057d62ac07b2..ec3f9181e975 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620402762
-SHA256 (syslog-ng-3.32.1.tar.gz) = 19e3b76552d82c71c04230526925402c9f05fa5e6ea19b912b061850929b712d
-SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
+TIMESTAMP = 1626785667
+SHA256 (syslog-ng-3.33.2.tar.gz) = 0b786a06077b9150191d714f45a1b4b3792952cb58163a3af336f074da9fb14b
+SIZE (syslog-ng-3.33.2.tar.gz) = 5836576
diff --git a/sysutils/syslog-ng/files/patch-3677 b/sysutils/syslog-ng/files/patch-3677
deleted file mode 100644
index dc781313e2ca..000000000000
--- a/sysutils/syslog-ng/files/patch-3677
+++ /dev/null
@@ -1,25 +0,0 @@
-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 3006fd93a40a..d77f8a0cd232 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.32
+ at version:3.33
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 5a7581d17475..9f8207a0d1fe 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -279,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.32.so.0
-lib/libevtlog-3.32.so.0.0.0
+lib/libevtlog-3.33.so.0
+lib/libevtlog-3.33.so.0.0.0
 lib/libevtlog.so
-lib/libsyslog-ng-3.32.so.0.0.0
-lib/libsyslog-ng-3.32.so.0
+lib/libsyslog-ng-3.33.so.0.0.0
+lib/libsyslog-ng-3.33.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
-lib/libloggen_helper-3.32.so.0
-lib/libloggen_helper-3.32.so.0.0.0
+lib/libloggen_helper-3.33.so.0
+lib/libloggen_helper-3.33.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-3.32.so.0
-lib/libloggen_plugin-3.32.so.0.0.0
+lib/libloggen_plugin-3.33.so.0
+lib/libloggen_plugin-3.33.so.0.0.0
 lib/libloggen_plugin.so
 lib/syslog-ng/loggen/libloggen_socket_plugin.so
 lib/syslog-ng/loggen/libloggen_ssl_plugin.so
@@ -384,6 +384,7 @@ share/syslog-ng/include/scl/sumologic/sumologic.conf
 share/syslog-ng/include/scl/paloalto/panos.conf
 share/syslog-ng/include/scl/cee/adapter.conf
 share/syslog-ng/include/scl/fortigate/fortigate.conf
+share/syslog-ng/include/scl/discord/discord.conf
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/merge-grammar.py