[packages/ding-libs] Up to 0.6.1 ; rel bump, too

arekm arekm at pld-linux.org
Thu May 21 15:11:44 CEST 2026


commit b17233665dd0007bceaec19d52e4bc5d0195022f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:11:24 2026 +0200

    Up to 0.6.1 ; rel bump, too

 ding-libs-test-regex-glibc.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 ding-libs.spec                   | 16 +++++++++-------
 2 files changed, 49 insertions(+), 7 deletions(-)
---
diff --git a/ding-libs.spec b/ding-libs.spec
index d2e1d63..4e0ff5b 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
@@ -5,21 +5,22 @@
 # see version.m4 or *.pc files
 %define		basicobjects_version	0.1.1
 %define		collection_version	0.7.0
-%define		dhash_version		0.4.3
-%define		ini_config_version	1.3.0
+%define		dhash_version		0.5.0
+%define		ini_config_version	1.3.1
 %define		path_utils_version	0.2.1
 %define		ref_array_version	0.1.5
 Summary:	"Ding is not GLib" assorted utility libraries
 Summary(pl.UTF-8):	"Ding is not GLib" - niepowiązane ze sobą biblioteki narzędzi
 Name:		ding-libs
-Version:	0.6.0
+Version:	0.6.1
 # NOTE: do not decrease Release on Version change, unless ALL subpackage versions have been increased too
-Release:	5
+Release:	6
 License:	GPL v3+ (basicobjects), LGPL v3+ (collection, dhash, ini, path_utils, ref_array)
 Group:		Libraries
-Source0:	https://fedorahosted.org/releases/d/i/ding-libs/%{name}-%{version}.tar.gz
-# Source0-md5:	0dd0a95f2f8d65b84d3cb9568494109a
-URL:		https://fedorahosted.org/sssd/
+Source0:	https://releases.pagure.org/SSSD/ding-libs/%{name}-%{version}.tar.gz
+# Source0-md5:	141ffba92d7703b7efc2595971305de7
+Patch0:		%{name}-test-regex-glibc.patch
+URL:		https://pagure.io/SSSD/ding-libs
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	check-devel >= 0.9.5
@@ -297,6 +298,7 @@ Statyczna biblioteka libref_array.
 
 %prep
 %setup -q
+%patch -P0 -p1
 
 %build
 %configure \
diff --git a/ding-libs-test-regex-glibc.patch b/ding-libs-test-regex-glibc.patch
new file mode 100644
index 0000000..b4a8a7d
--- /dev/null
+++ b/ding-libs-test-regex-glibc.patch
@@ -0,0 +1,40 @@
+--- ding-libs-0.6.1/ini/ini_validators_ut_check.c.orig	2026-05-21 00:00:00.000000000 +0200
++++ ding-libs-0.6.1/ini/ini_validators_ut_check.c	2026-05-21 00:00:00.000000000 +0200
+@@ -603,10 +603,15 @@
+     ini_errobj_next(errobj);
+
+     errmsg = ini_errobj_get_msg(errobj);
+-    ret = strcmp(errmsg,
+-                 "[rule/options_for_foo]: Cannot compile regular expression "
+-                 "from option 'section_re'. "
+-                 "Error: 'Unmatched [ or [^'");
++    /* glibc's regerror() wording for an unmatched '[' has changed over
++     * time (e.g. "Unmatched [ or [^" vs. "Unmatched [, [^, [:, [., or
++     * [="), so match only the stable prefix up to the embedded error. */
++    {
++        static const char prefix[] =
++            "[rule/options_for_foo]: Cannot compile regular expression "
++            "from option 'section_re'. Error: '";
++        ret = strncmp(errmsg, prefix, sizeof(prefix) - 1);
++    }
+     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+     ini_errobj_next(errobj);
+
+@@ -1025,9 +1030,14 @@
+     ini_errobj_next(errobj);
+
+     errmsg = ini_errobj_get_msg(errobj);
+-    ret = strcmp(errmsg,
+-                 "[rule/section_list]: Validator failed to use regex "
+-                 "[^foo\\(*$]:[Unmatched ( or \\(]");
++    /* Only the stable prefix is checked; the bracketed regerror text
++     * after "[^foo\\(*$]:" varies between glibc versions. */
++    {
++        static const char prefix[] =
++            "[rule/section_list]: Validator failed to use regex "
++            "[^foo\\(*$]:[";
++        ret = strncmp(errmsg, prefix, sizeof(prefix) - 1);
++    }
+     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+     ini_errobj_next(errobj);
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ding-libs.git/commitdiff/b17233665dd0007bceaec19d52e4bc5d0195022f



More information about the pld-cvs-commit mailing list