From nobody Thu Jun 30 16:22:16 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DF6B78A7A54; Thu, 30 Jun 2022 16:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYkBK184cz3mld; Thu, 30 Jun 2022 16:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656606137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srTMSjHnAgH8BHXyRk6l9wRVJM2LqkhrbwamQCFGzBg=; b=ntl5K4I8+Plffo5HGPa2xLFzZ/YTtMDFqlwxJKuisYz6RSU9bsOMana/tD7jFvfxd3tuYy GB5UgeRi8IzRqCnn5XU2/1v/1wkTc+/VtzNAZJhSIBYcqk8w/PXb8WVYCvb0RZu5IO94Z4 qm+o/p17UCcvC01fKdnlui4Pk08JJUlh2yoPUASTMVeevXr0/4+Yi11y3twus4Vizx+S9a UTBAam/g6Yk73/uBRpF/NvvUprMxZ4tIxiNfedmWQ75HrVx2MU0PtF8BB4uk9ZcyoyUk6R S5c+nIq4WCW6u3ykAINEJl21OA9rJNmw3nae2mCuqpjS1z6sLqgNJ6u0FeZTew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C72C01C09; Thu, 30 Jun 2022 16:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25UGMG61028857; Thu, 30 Jun 2022 16:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGMG9s028856; Thu, 30 Jun 2022 16:22:16 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:22:16 GMT Message-Id: <202206301622.25UGMG9s028856@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 9f15b375dc27 - main - sysutils/syslog-ng: Update to 3.37.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f15b375dc27612c4f6ec121bf195e20e620e0a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656606137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=srTMSjHnAgH8BHXyRk6l9wRVJM2LqkhrbwamQCFGzBg=; b=whSwKtUw/4qQsyDzVLDCIg9DWtdl150Tprm1YjxC/VqUvFfd7Q8zVttwBwA7Ca3/o+UKnY pz5w1dftgqlSPW3fnS9ulPFfMWCwaeJhOMsmgNqy4uXgpkpjjr0GylRB26k/eZBSvv2/cs jsAn5ACq0kqTLJIDBAQvjGf4YlzZD1meCJYUxtjCevWbLn9pNkXV3Knk5mGCIgL838MM5r e1l9rwc2pnTe7d73f+abtK+I1wANhuNSpIMka0h+OhnVEQuuRKPE9cA6oY1dxKCSm3vHhp Lpi204ZpMYhs/9+QMW66lTII3urgReydf8R5kMC2ukwsFmy6QwPuNOyV6Tqk1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656606137; a=rsa-sha256; cv=none; b=X3th5WlUvsObUQjLDf4B0S8yzI99c3RiljG5B1OxboDYwjeRdayjbXIRyCCR3q+bz1TVW7 v9QZ/CvBKGpk5Ch/xs8/1SkccfH+ep2+PWASADwqAjFslj1eLNF/EhIttooHQTm4mCsAec iHHsCgAQwczvJC+0lRRtZAeNIyzZyYgfI7mkXSv5pimGYBMaNDC54A4NLQ+rD9Ui+GSx/3 KyISKcfH2RdoyJbA9J0Kr1XpfudUhsc5KrEECbzxCi/4x/fz4bO+0ygmIa5i53Mpl4GdGO dO4hL6uXn3BToII3ZU7Lm36u+4mMpQ2o7b4f4wLiccvLpchUtWXvga0xvfdTqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f15b375dc27612c4f6ec121bf195e20e620e0a3 commit 9f15b375dc27612c4f6ec121bf195e20e620e0a3 Author: Cy Schubert AuthorDate: 2022-06-30 16:18:44 +0000 Commit: Cy Schubert CommitDate: 2022-06-30 16:22:09 +0000 sysutils/syslog-ng: Update to 3.37.1 Update to 3.37.1 and apply a number of other fixes supplied by our upstream that didn't make it into the release. Patch was created and tested by our upstream representative Peter Czanik. Submitted by: Peter Czanik (CzP) Balabit (a OneIdentity company) / syslog-ng upstream --- sysutils/syslog-ng/Makefile | 9 ++++--- sysutils/syslog-ng/distinfo | 6 ++--- sysutils/syslog-ng/files/patch-lib_logmatcher.c | 28 ++++++++++++++++++++++ sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h | 28 ++++++++++++++++++++++ .../files/patch-libtest_msg__parse__lib.c | 23 ++++++++++++++++++ .../files/patch-libtest_msg__parse__lib.h | 11 +++++++++ .../files/patch-modules_dbparser_pdbtool_pdbtool.c | 13 ++++++++++ ...ules_regexp-parser_tests_test__regexp__parser.c | 25 +++++++++++++++++++ sysutils/syslog-ng/files/syslog-ng.conf.sample | 2 +- sysutils/syslog-ng/pkg-plist | 20 +++++++++------- 10 files changed, 150 insertions(+), 15 deletions(-) diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 4c4c322710ac..9def20978238 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,7 +1,7 @@ # Created by: Ivan Lago PORTNAME= syslog-ng -DISTVERSION= 3.36.1 +DISTVERSION= 3.37.1 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -149,7 +149,10 @@ PYTHON_USES= python:3.5+ PYTHON_CONFIGURE_ON= --enable-python PYTHON_CONFIGURE_OFF= --disable-python PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ - lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info \ + 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 \ + lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/top_level.txt \ lib/syslog-ng/python/syslogng/__init__.py \ lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \ lib/syslog-ng/python/syslogng/debuggercli/__init__.py \ @@ -199,7 +202,7 @@ CURL_PLIST_FILES= lib/syslog-ng/libhttp.so \ RIEMANN_CONFIGURE_ON= --enable-riemann RIEMANN_CONFIGURE_OFF= --disable-riemann -RIEMANN_LIB_DEPENDS= libriemann-client.so:net-mgmt/riemann-c-client +RIEMANN_LIB_DEPENDS= libriemann-client-gnutls.so:net-mgmt/riemann-c-client RIEMANN_PLIST_FILES= lib/syslog-ng/libriemann.so KAFKA_CONFIGURE_ON= --enable-kafka diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index 351d26c12e56..0a85a15a99b8 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646416310 -SHA256 (syslog-ng-3.36.1.tar.gz) = 90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b -SIZE (syslog-ng-3.36.1.tar.gz) = 5968598 +TIMESTAMP = 1654593377 +SHA256 (syslog-ng-3.37.1.tar.gz) = d67a320cb896cd5d62f24d9e1bec138847fa4618ae13a3946cae2b75c528ee14 +SIZE (syslog-ng-3.37.1.tar.gz) = 6033219 diff --git a/sysutils/syslog-ng/files/patch-lib_logmatcher.c b/sysutils/syslog-ng/files/patch-lib_logmatcher.c new file mode 100644 index 000000000000..256fd56f7616 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-lib_logmatcher.c @@ -0,0 +1,28 @@ +--- lib/logmatcher.c.orig 2022-06-03 13:40:38 UTC ++++ lib/logmatcher.c +@@ -30,14 +30,6 @@ + #include "compat/string.h" + #include "compat/pcre.h" + +-static gboolean +-_shall_set_values_indirectly(NVHandle value_handle) +-{ +- return value_handle != LM_V_NONE && +- !log_msg_is_handle_macro(value_handle) && +- !log_msg_is_handle_match(value_handle); +-} +- + static void + log_matcher_store_pattern(LogMatcher *self, const gchar *pattern) + { +@@ -416,7 +408,9 @@ log_matcher_pcre_re_feed_value(LogMatcherPcreRe *self, + LogMatcherPcreMatchResult *result, + gint begin_index, gint end_index) + { +- gboolean indirect = _shall_set_values_indirectly(result->source_handle); ++ gboolean indirect = result->source_handle != LM_V_NONE && ++ log_msg_is_handle_settable_with_an_indirect_value(target_handle) && ++ log_msg_is_handle_referencable_from_an_indirect_value(result->source_handle); + + if (target_handle == result->source_handle) + { diff --git a/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h b/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h new file mode 100644 index 000000000000..de8126f674f4 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h @@ -0,0 +1,28 @@ +--- lib/logmsg/logmsg.h.orig 2022-06-03 13:40:38 UTC ++++ lib/logmsg/logmsg.h +@@ -315,6 +315,25 @@ gboolean log_msg_is_handle_match(NVHandle handle); + }) + + static inline gboolean ++log_msg_is_handle_referencable_from_an_indirect_value(NVHandle handle) ++{ ++ if (handle == LM_V_NONE) ++ return FALSE; ++ ++ /* macro values should not be referenced as they are dynamic, store the actual value instead */ ++ if (log_msg_is_handle_macro(handle)) ++ return FALSE; ++ ++ /* matches are pretty temporary, so we should not reference them, as the ++ * next matching operation would overwrite them anyway */ ++ ++ if (log_msg_is_handle_match(handle)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static inline gboolean + log_msg_is_handle_settable_with_an_indirect_value(NVHandle handle) + { + return (handle >= LM_V_MAX); diff --git a/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.c b/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.c new file mode 100644 index 000000000000..3f4feca24422 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.c @@ -0,0 +1,23 @@ +--- libtest/msg_parse_lib.c.orig 2022-06-03 13:40:39 UTC ++++ libtest/msg_parse_lib.c +@@ -73,6 +73,20 @@ assert_log_message_value_unset_by_name(LogMessage *sel + } + + void ++assert_log_message_value_is_indirect(LogMessage *self, NVHandle handle) ++{ ++ NVEntry *entry = nv_table_get_entry(self->payload, handle, NULL, NULL); ++ cr_assert(entry->indirect); ++} ++ ++void ++assert_log_message_value_is_direct(LogMessage *self, NVHandle handle) ++{ ++ NVEntry *entry = nv_table_get_entry(self->payload, handle, NULL, NULL); ++ cr_assert(!entry->indirect); ++} ++ ++void + assert_log_message_value_and_type(LogMessage *self, NVHandle handle, + const gchar *expected_value, LogMessageValueType expected_type) + { diff --git a/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.h b/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.h new file mode 100644 index 000000000000..0341244a3871 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.h @@ -0,0 +1,11 @@ +--- libtest/msg_parse_lib.h.orig 2022-06-03 13:40:39 UTC ++++ libtest/msg_parse_lib.h +@@ -34,6 +34,8 @@ void deinit_syslogformat_module(void); + + void assert_log_messages_equal(LogMessage *log_message_a, LogMessage *log_message_b); + ++void assert_log_message_value_is_direct(LogMessage *self, NVHandle handle); ++void assert_log_message_value_is_indirect(LogMessage *self, NVHandle handle); + void assert_log_message_value_unset(LogMessage *self, NVHandle handle); + void assert_log_message_value_unset_by_name(LogMessage *self, const gchar *name); + void assert_log_message_value(LogMessage *self, NVHandle handle, const gchar *expected_value); diff --git a/sysutils/syslog-ng/files/patch-modules_dbparser_pdbtool_pdbtool.c b/sysutils/syslog-ng/files/patch-modules_dbparser_pdbtool_pdbtool.c new file mode 100644 index 000000000000..221b5c6afcb3 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-modules_dbparser_pdbtool_pdbtool.c @@ -0,0 +1,13 @@ +--- modules/dbparser/pdbtool/pdbtool.c.orig 2022-06-03 13:40:39 UTC ++++ modules/dbparser/pdbtool/pdbtool.c +@@ -1282,9 +1282,9 @@ main(int argc, char *argv[]) + ret = modes[mode].main(argc, argv); + scratch_buffers_allocator_deinit(); + scratch_buffers_global_deinit(); +- stats_destroy(); + log_tags_global_deinit(); + log_msg_global_deinit(); ++ stats_destroy(); + + cfg_free(configuration); + configuration = NULL; diff --git a/sysutils/syslog-ng/files/patch-modules_regexp-parser_tests_test__regexp__parser.c b/sysutils/syslog-ng/files/patch-modules_regexp-parser_tests_test__regexp__parser.c new file mode 100644 index 000000000000..1f9fd7e6ef63 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-modules_regexp-parser_tests_test__regexp__parser.c @@ -0,0 +1,25 @@ +--- modules/regexp-parser/tests/test_regexp_parser.c.orig 2022-06-03 13:40:39 UTC ++++ modules/regexp-parser/tests/test_regexp_parser.c +@@ -84,6 +84,9 @@ ParameterizedTestParameters(regexp_parser, test_regexp + {.msg = "foo", .pattern = "(?foo)|(?bar)", .prefix=".reg.", .expected_result = TRUE, .flags = LMF_DUPNAMES, .name = ".reg.key", .value = "foo"}, + {.msg = "abc", .pattern = "Abc", .prefix="", .flags = 0, .expected_result = FALSE, .name = NULL, .value = NULL}, + {.msg = "abc", .pattern = "(?Abc)", .prefix="", .flags = LMF_ICASE, .expected_result = TRUE, .name = "key", .value = "abc"}, ++ ++ /* store into a builtin value */ ++ {.msg = "abcdef", .pattern = "(?abc)", .prefix="", .flags = 0, .expected_result = TRUE, .name = "PID", .value = "abc"}, + }; + return cr_make_param_array(RegexpParserTestParam, parser_params, G_N_ELEMENTS(parser_params)); + } +@@ -92,9 +95,10 @@ ParameterizedTest(RegexpParserTestParam *parser_param, + { + LogParser *p = _construct_regexp_parser(parser_param->prefix, parser_param->pattern, parser_param->flags); + gboolean result; ++ GError *e = NULL; + +- result = regexp_parser_compile(p, NULL); +- cr_assert(result, "unexpected compiling failure; pattern=%s\n", parser_param->pattern); ++ result = regexp_parser_compile(p, &e); ++ cr_assert(result, "unexpected compiling failure; pattern=%s, error=%s\n", parser_param->pattern, e->message); + + LogMessage *msg = log_msg_new_empty(); + log_msg_set_value(msg, LM_V_MESSAGE, parser_param->msg, -1); diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample index ebfcbbf7749a..9069feea1c77 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.36 +@version:3.37 @include "scl.conf" # diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index 7ea32bae76de..a6bc3fc8c907 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -197,6 +197,8 @@ include/syslog-ng/rewrite/rewrite-set-tag.h include/syslog-ng/rewrite/rewrite-set.h include/syslog-ng/rewrite/rewrite-subst.h include/syslog-ng/rewrite/rewrite-unset.h +include/syslog-ng/rewrite/rewrite-set-matches.h +include/syslog-ng/rewrite/rewrite-unset-matches.h include/syslog-ng/ringbuffer.h include/syslog-ng/run-id.h include/syslog-ng/scanner/csv-scanner/csv-scanner.h @@ -281,20 +283,20 @@ include/syslog-ng/value-pairs/value-pairs.h include/syslog-ng/versioning.h include/syslog-ng/window-size-counter.h include/syslog-ng/mainloop-threaded-worker.h -lib/libevtlog-3.36.so.0 -lib/libevtlog-3.36.so.0.0.0 +lib/libevtlog-3.37.so.0 +lib/libevtlog-3.37.so.0.0.0 lib/libevtlog.so -lib/libloggen_helper-3.36.so.0 -lib/libloggen_helper-3.36.so.0.0.0 +lib/libloggen_helper-3.37.so.0 +lib/libloggen_helper-3.37.so.0.0.0 lib/libloggen_helper.so -lib/libloggen_plugin-3.36.so.0 -lib/libloggen_plugin-3.36.so.0.0.0 +lib/libloggen_plugin-3.37.so.0 +lib/libloggen_plugin-3.37.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-3.36.so.0 -lib/libsyslog-ng-3.36.so.0.0.0 +lib/libsyslog-ng-3.37.so.0 +lib/libsyslog-ng-3.37.so.0.0.0 lib/libsyslog-ng-native-connector.a lib/libsyslog-ng.so lib/syslog-ng/libadd-contextual-data.so @@ -368,6 +370,7 @@ share/syslog-ng/include/scl/iptables/iptables.conf share/syslog-ng/include/scl/junos/plugin.conf share/syslog-ng/include/scl/kafka/kafka-java.conf share/syslog-ng/include/scl/kafka/kafka.conf +share/syslog-ng/include/scl/kubernetes/kubernetes.conf share/syslog-ng/include/scl/linux-audit/linux-audit.conf share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh share/syslog-ng/include/scl/loadbalancer/plugin.conf @@ -393,6 +396,7 @@ share/syslog-ng/include/scl/telegram/telegram.conf 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/tools/cfg-grammar.y share/syslog-ng/tools/lex-rules.am share/syslog-ng/tools/merge-grammar.py