Date: Mon, 29 Aug 2022 15:57:00 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4a8e7f47c735 - main - sysutils/syslog-ng: Update to 3.38.1 Message-ID: <202208291557.27TFv0Bg026363@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a8e7f47c735e0e76765a24cbb3d29857980c8e2 commit 4a8e7f47c735e0e76765a24cbb3d29857980c8e2 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-08-29 15:55:44 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-08-29 15:56:44 +0000 sysutils/syslog-ng: Update to 3.38.1 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 --- sysutils/syslog-ng/Makefile | 3 +-- 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 | 17 ++++++------- 10 files changed, 14 insertions(+), 142 deletions(-) diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index af19a793a8be..e9080e136b65 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,6 +1,5 @@ PORTNAME= syslog-ng -DISTVERSION= 3.37.1 -PORTREVISION= 1 +DISTVERSION= 3.38.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 0a85a15a99b8..bd3fc44e643b 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654593377 -SHA256 (syslog-ng-3.37.1.tar.gz) = d67a320cb896cd5d62f24d9e1bec138847fa4618ae13a3946cae2b75c528ee14 -SIZE (syslog-ng-3.37.1.tar.gz) = 6033219 +TIMESTAMP = 1661790871 +SHA256 (syslog-ng-3.38.1.tar.gz) = 5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7 +SIZE (syslog-ng-3.38.1.tar.gz) = 5405048 diff --git a/sysutils/syslog-ng/files/patch-lib_logmatcher.c b/sysutils/syslog-ng/files/patch-lib_logmatcher.c deleted file mode 100644 index 256fd56f7616..000000000000 --- a/sysutils/syslog-ng/files/patch-lib_logmatcher.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 deleted file mode 100644 index de8126f674f4..000000000000 --- a/sysutils/syslog-ng/files/patch-lib_logmsg_logmsg.h +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 deleted file mode 100644 index 3f4feca24422..000000000000 --- a/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.c +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 deleted file mode 100644 index 0341244a3871..000000000000 --- a/sysutils/syslog-ng/files/patch-libtest_msg__parse__lib.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 221b5c6afcb3..000000000000 --- a/sysutils/syslog-ng/files/patch-modules_dbparser_pdbtool_pdbtool.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 deleted file mode 100644 index 1f9fd7e6ef63..000000000000 --- a/sysutils/syslog-ng/files/patch-modules_regexp-parser_tests_test__regexp__parser.c +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 = "(?<key>foo)|(?<key>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 = "(?<key>Abc)", .prefix="", .flags = LMF_ICASE, .expected_result = TRUE, .name = "key", .value = "abc"}, -+ -+ /* store into a builtin value */ -+ {.msg = "abcdef", .pattern = "(?<PID>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 9069feea1c77..1cac741f4ec2 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.37 +@version:3.38 @include "scl.conf" # diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index a6bc3fc8c907..b518237524b9 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -83,6 +83,7 @@ include/syslog-ng/filter/filter-pri.h include/syslog-ng/filter/filter-re.h include/syslog-ng/filter/filter-tags.h include/syslog-ng/find-crlf.h +include/syslog-ng/generic-number.h include/syslog-ng/gprocess.h include/syslog-ng/gsockaddr.h include/syslog-ng/gsocket.h @@ -283,20 +284,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.37.so.0 -lib/libevtlog-3.37.so.0.0.0 +lib/libevtlog-3.38.so.0 +lib/libevtlog-3.38.so.0.0.0 lib/libevtlog.so -lib/libloggen_helper-3.37.so.0 -lib/libloggen_helper-3.37.so.0.0.0 +lib/libloggen_helper-3.38.so.0 +lib/libloggen_helper-3.38.so.0.0.0 lib/libloggen_helper.so -lib/libloggen_plugin-3.37.so.0 -lib/libloggen_plugin-3.37.so.0.0.0 +lib/libloggen_plugin-3.38.so.0 +lib/libloggen_plugin-3.38.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.37.so.0 -lib/libsyslog-ng-3.37.so.0.0.0 +lib/libsyslog-ng-3.38.so.0 +lib/libsyslog-ng-3.38.so.0.0.0 lib/libsyslog-ng-native-connector.a lib/libsyslog-ng.so lib/syslog-ng/libadd-contextual-data.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208291557.27TFv0Bg026363>