Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package liblognorm for openSUSE:Factory checked in at 2025-03-28 09:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblognorm (Old) and /work/SRC/openSUSE:Factory/.liblognorm.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liblognorm" Fri Mar 28 09:36:29 2025 rev:25 rq:1256207 version:2.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/liblognorm/liblognorm.changes 2019-01-25 22:41:31.539364175 +0100 +++ /work/SRC/openSUSE:Factory/.liblognorm.new.2696/liblognorm.changes 2025-03-28 09:36:41.419286525 +0100 @@ -1,0 +2,5 @@ +Sat Mar 15 11:32:09 UTC 2025 - Andreas Stieger <[email protected]> + +- build with pcre2, add liblognorm-2.0.6-pcre2.patch + +------------------------------------------------------------------- New: ---- liblognorm-2.0.6-pcre2.patch BETA DEBUG BEGIN: New: - build with pcre2, add liblognorm-2.0.6-pcre2.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblognorm.spec ++++++ --- /var/tmp/diff_new_pack.U183AF/_old 2025-03-28 09:36:41.923307400 +0100 +++ /var/tmp/diff_new_pack.U183AF/_new 2025-03-28 09:36:41.923307400 +0100 @@ -2,6 +2,7 @@ # spec file for package liblognorm # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2025 Andreas Stieger <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,15 +22,20 @@ Version: 2.0.6 Release: 0 Summary: Library and tool to normalize log data -License: LGPL-2.1-or-later AND Apache-2.0 +License: Apache-2.0 AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://www.liblognorm.com/ -Source0: http://www.liblognorm.com/download/files/download/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://www.liblognorm.com/ +Source0: https://www.liblognorm.com/download/files/download/%{name}-%{version}.tar.gz +Patch0: liblognorm-2.0.6-pcre2.patch +# for liblognorm-2.0.6-pcre2.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +# BuildRequires: pkgconfig >= 0.9.0 BuildRequires: pkgconfig(libestr) BuildRequires: pkgconfig(libfastjson) >= 0.99.0 -BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libpcre2-8) >= 10.00 %description Liblognorm is a fast-samples based normalization library. It is a library and @@ -106,37 +112,37 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build +# for liblognorm-2.0.6-pcre2.patch +autoreconf -fiv +# %configure \ --disable-static \ --enable-regexp \ --disable-testbench \ --enable-advanced-stats \ --enable-tools \ - --disable-docs - -make %{?_smp_mflags} + --disable-docs \ + %{nil} +%make_build %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install find %{buildroot} -type f -name "*.la" -delete -print %check -make check %{?_smp_mflags} +%make_build check -%post -n liblognorm%{sover} -p /sbin/ldconfig -%postun -n liblognorm%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n liblognorm%{sover} %files -n liblognorm%{sover} -%defattr(-,root,root) %license COPYING %{_libdir}/*.so.* %{_bindir}/lognormalizer %files devel -%defattr(-,root,root) %license COPYING %doc NEWS README AUTHORS ChangeLog %{_includedir}/* ++++++ liblognorm-2.0.6-pcre2.patch ++++++ >From b5c595baa49360614ef531cb9621644e8cf5fec5 Mon Sep 17 00:00:00 2001 From: alakatos <[email protected]> Date: Tue, 6 Jun 2023 15:13:17 +0200 Subject: [PATCH] Port pcre dependency to pcre2 Fixes #366 Upstream stopped the support for the old 'pcre' package. See https://www.pcre.org/ It only supports the new 'pcre2' version, we should replace the current pcre with the newer pcre2. --- configure.ac | 5 ++--- src/parser.c | 6 ------ src/v1_parser.c | 50 +++++++++++++++++++++++++++++++++---------------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index b6f92f1b..752b7d93 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ AC_ARG_ENABLE(regexp, ) AM_CONDITIONAL(ENABLE_REGEXP, test x$enable_regexp = xyes) if test "$enable_regexp" = "yes"; then - PKG_CHECK_MODULES(PCRE, libpcre) + PKG_CHECK_MODULES(PCRE, [libpcre2-8 >= 10.00]) AC_DEFINE(FEATURE_REGEXP, 1, [Regular expressions support enabled.]) FEATURE_REGEXP=1 else @@ -194,5 +194,4 @@ echo "Testbench enabled: $enable_testbench" echo "Valgrind enabled: $enable_valgrind" echo "Debug mode enabled: $enable_debug" echo "Tools enabled: $enable_tools" -echo "Docs enabled: $enable_docs" - +echo "Docs enabled: $enable_docs" \ No newline at end of file diff --git a/src/parser.c b/src/parser.c index 2d704246..dcd5b4ee 100644 --- a/src/parser.c +++ b/src/parser.c @@ -42,12 +42,6 @@ #include "samp.h" #include "helpers.h" -#ifdef FEATURE_REGEXP -#include <pcre.h> -#include <errno.h> -#endif - - /* how should output values be formatted? */ enum FMT_MODE { FMT_AS_STRING = 0, diff --git a/src/v1_parser.c b/src/v1_parser.c index 323ada0f..9fb3ccb2 100644 --- a/src/v1_parser.c +++ b/src/v1_parser.c @@ -39,7 +39,8 @@ #include "v1_samp.h" #ifdef FEATURE_REGEXP -#include <pcre.h> +#define PCRE2_CODE_UNIT_WIDTH 8 +#include <pcre2.h> #include <errno.h> #endif @@ -1266,7 +1267,7 @@ void* tokenized_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) { * significantly slower than other field-types. */ struct regex_parser_data_s { - pcre *re; + pcre2_code *re; int consume_group; int return_group; int max_groups; @@ -1276,17 +1277,33 @@ PARSER(Regex) assert(str != NULL); assert(offs != NULL); assert(parsed != NULL); - unsigned int* ovector = NULL; + PCRE2_SIZE *ovector; + pcre2_match_data *match_data = NULL; struct regex_parser_data_s *pData = (struct regex_parser_data_s*) node->parser_data; if (pData != NULL) { - ovector = calloc(pData->max_groups, sizeof(unsigned int) * 3); - if (ovector == NULL) FAIL(LN_NOMEM); + match_data = pcre2_match_data_create_from_pattern(pData->re, NULL); + if (match_data == NULL) FAIL(LN_NOMEM); + + int result = pcre2_match( + pData->re, /* the compiled pattern */ + (PCRE2_SPTR)str, /* the subject string */ + (PCRE2_SIZE)strLen, /* the length of the subject */ + (PCRE2_SIZE)*offs, /* start at offset 0 in the subject */ + 0, /* default options */ + match_data, /* block for storing the result */ + NULL); /* use default match context */ - int result = pcre_exec(pData->re, NULL, str, strLen, *offs, 0, (int*) ovector, pData->max_groups * 3); if (result == 0) result = pData->max_groups; if (result > pData->consume_group) { - /*please check 'man 3 pcreapi' for cryptic '2 * n' and '2 * n + 1' magic*/ + ovector = pcre2_get_ovector_pointer(match_data); + printf("Match succeeded at offset %d\n", (int)ovector[0]); + + /* please check 'man 3 pcre2api' for cryptic '2 * n' and '2 * n + 1' magic + * in a nutshell, within the ovector, the first in each pair of values is set to the + * offset of the first code unit of a substring, and the second is set to the + * offset of the first code unit after the end of a substring. + */ if (ovector[2 * pData->consume_group] == *offs) { *parsed = ovector[2 * pData->consume_group + 1] - ovector[2 * pData->consume_group]; if (pData->consume_group != pData->return_group) { @@ -1294,22 +1311,20 @@ PARSER(Regex) if((val = strndup(str + ovector[2 * pData->return_group], ovector[2 * pData->return_group + 1] - ovector[2 * pData->return_group])) == NULL) { - free(ovector); FAIL(LN_NOMEM); } *value = json_object_new_string(val); free(val); if (*value == NULL) { - free(ovector); FAIL(LN_NOMEM); } } } } - free(ovector); } r = 0; /* success */ done: + pcre2_match_data_free(match_data); return r; } @@ -1346,8 +1361,8 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) { char* name = NULL; struct regex_parser_data_s *pData = NULL; const char *unescaped_exp = NULL; - const char *error = NULL; - int erroffset = 0; + PCRE2_SIZE erroffset = 0; + int errcode = 0; CHKN(name = es_str2cstr(node->name, NULL)); @@ -1365,7 +1380,7 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) { if ((grp_parse_err = regex_parser_configure_consume_and_return_group(args, pData)) != NULL) FAIL(LN_BADCONFIG); - CHKN(pData->re = pcre_compile(exp, 0, &error, &erroffset, NULL)); + CHKN(pData->re = pcre2_compile((PCRE2_SPTR)exp, PCRE2_ZERO_TERMINATED, 0, &errcode, &erroffset, NULL)); pData->max_groups = ((pData->consume_group > pData->return_group) ? pData->consume_group : pData->return_group) + 1; @@ -1387,9 +1402,12 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) { ln_dbgprintf(ctx, "couldn't allocate memory for regex-string for field: '%s'", name); else if (grp_parse_err != NULL) ln_dbgprintf(ctx, "%s for: '%s'", grp_parse_err, name); - else if (pData->re == NULL) + else if (pData->re == NULL) { + PCRE2_UCHAR errbuffer[256]; + pcre2_get_error_message(errcode, errbuffer, sizeof(errbuffer)); ln_dbgprintf(ctx, "couldn't compile regex(encountered error '%s' at char '%d' in pattern) " - "for regex-matched field: '%s'", error, erroffset, name); + "for regex-matched field: '%s'", errbuffer, (int)erroffset, name); + } regex_parser_data_destructor((void**)&pData); } if (exp != NULL) free(exp); @@ -1401,7 +1419,7 @@ void* regex_parser_data_constructor(ln_fieldList_t *node, ln_ctx ctx) { void regex_parser_data_destructor(void** dataPtr) { if ((*dataPtr) != NULL) { struct regex_parser_data_s *pData = (struct regex_parser_data_s*) *dataPtr; - if (pData->re != NULL) pcre_free(pData->re); + if (pData->re != NULL) pcre2_code_free(pData->re); free(pData); *dataPtr = NULL; }
