diff --git a/.gitignore b/.gitignore index 87d8d28..569fcf6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ding-libs-0.5.0.tar.gz /ding-libs-0.6.0.tar.gz /ding-libs-0.6.1.tar.gz +/ding-libs-0.6.2.tar.gz diff --git a/INI-Fix-detection-of-error-messages.patch b/INI-Fix-detection-of-error-messages.patch deleted file mode 100644 index d5cdcac..0000000 --- a/INI-Fix-detection-of-error-messages.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Wed, 3 Jan 2018 18:03:44 +0100 -Subject: [PATCH 01/11] INI: Fix detection of error messages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libc on BSD returns different error messages. - -Reviewed-by: Michal Židek ---- - ini/ini_validators_ut_check.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c -index fa7105a..9ecde75 100644 ---- a/ini/ini_validators_ut_check.c -+++ b/ini/ini_validators_ut_check.c -@@ -607,6 +607,12 @@ START_TEST(test_ini_allowed_options_wrong_regex) - "[rule/options_for_foo]: Cannot compile regular expression " - "from option 'section_re'. " - "Error: 'Unmatched [ or [^'"); -+ if (ret != 0) { -+ ret = strcmp(errmsg, -+ "[rule/options_for_foo]: Cannot compile regular expression " -+ "from option 'section_re'. " -+ "Error: 'brackets ([ ]) not balanced'"); -+ } - fail_unless(ret == 0, "Got msg: [%s]", errmsg); - ini_errobj_next(errobj); - -@@ -1028,6 +1034,11 @@ START_TEST(test_ini_allowed_sections_wrong_regex) - ret = strcmp(errmsg, - "[rule/section_list]: Validator failed to use regex " - "[^foo\\(*$]:[Unmatched ( or \\(]"); -+ if (ret !=0) { -+ ret = strcmp(errmsg, -+ "[rule/section_list]: Validator failed to use regex " -+ "[^foo\\(*$]:[parentheses not balanced]"); -+ } - fail_unless(ret == 0, "Got msg: [%s]", errmsg); - ini_errobj_next(errobj); - --- -2.9.5 - diff --git a/INI-Remove-definiton-of-TRACE_LEVEL.patch b/INI-Remove-definiton-of-TRACE_LEVEL.patch deleted file mode 100644 index ba4c1f7..0000000 --- a/INI-Remove-definiton-of-TRACE_LEVEL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8509cfaa757c0f8cc4d79357613f46d2fd9ee878 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20=C5=BDidek?= -Date: Wed, 15 Nov 2017 18:31:47 +0100 -Subject: [PATCH] INI: Remove definiton of TRACE_LEVEL - -Macros TRACE_LEVEL 7 and TRACE_HOME should only be defined -in testing builds where we want debug messages to be generated. - -The macros are leftovers from the previous patch where they -were improperly added for debug purposes. - -Resolves: -https://pagure.io/SSSD/ding-libs/issue/3182 - -Reviewed-by: Robbie Harwood -(cherry picked from commit a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b) -Signed-off-by: Robbie Harwood ---- - ini/ini_augment.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/ini/ini_augment.c b/ini/ini_augment.c -index 9d83ad9..5a5a173 100644 ---- a/ini/ini_augment.c -+++ b/ini/ini_augment.c -@@ -32,8 +32,6 @@ - #include - #include - #include --#define TRACE_LEVEL 7 --#define TRACE_HOME - #include "trace.h" - #include "collection.h" - #include "collection_tools.h" diff --git a/INI-Silence-ini_augment-match-failures.patch b/INI-Silence-ini_augment-match-failures.patch deleted file mode 100644 index ea5e304..0000000 --- a/INI-Silence-ini_augment-match-failures.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 781fdebda1d9e62e224630efb8d4dd5da8fe5f69 Mon Sep 17 00:00:00 2001 -From: Alexander Scheel -Date: Mon, 30 Oct 2017 12:43:19 -0500 -Subject: [PATCH] INI: Silence ini_augment match failures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Resolves: -https://pagure.io/SSSD/ding-libs/issue/3182 - -Reviewed-by: Michal Židek -Signed-off-by: Alexander Scheel -Merges: https://pagure.io/SSSD/ding-libs/pull-request/3183 -(cherry picked from commit be9ca3a2c26b061d1f22bd4a09009bba7a01f67b) -Signed-off-by: Robbie Harwood ---- - ini/ini.d/merge.validator | 11 ----------- - ini/ini_augment.c | 13 +++++++------ - 2 files changed, 7 insertions(+), 17 deletions(-) - -diff --git a/ini/ini.d/merge.validator b/ini/ini.d/merge.validator -index 1defe8e..017c1cb 100644 ---- a/ini/ini.d/merge.validator -+++ b/ini/ini.d/merge.validator -@@ -1,17 +1,8 @@ --File %s%s/merge.validator did not match provided patterns. Skipping. --File %s%s/real8.conf did not match provided patterns. Skipping. --File %s%s/new_line.conf did not match provided patterns. Skipping. --File %s%s/real32be.conf did not match provided patterns. Skipping. --File %s%s/real32le.conf did not match provided patterns. Skipping. --File %s%s/real16be.conf did not match provided patterns. Skipping. --File %s%s/real16le.conf did not match provided patterns. Skipping. --File %s%s/foo.conf.in did not match provided patterns. Skipping. - Errors detected while parsing: %s%s/comment.conf. - Error (9) on line 22: Invalid space character at the beginning of the line. - Error (9) on line 24: Invalid space character at the beginning of the line. - Error (9) on line 26: Invalid space character at the beginning of the line. - Error (15) on line 32: Incomplete comment at the end of the file. --No sections found in file %s%s/comment.conf. Skipping. - Section [section_a] found in file %s%s/first.conf is not allowed. - Section [section_c] found in file %s%s/first.conf is not allowed. - Section [section_b] found in file %s%s/first.conf is not allowed. -@@ -42,7 +33,6 @@ Error (9) on line 1: Invalid space character at the beginning of the line. - Error (9) on line 2: Invalid space character at the beginning of the line. - Error (9) on line 3: Invalid space character at the beginning of the line. - Error (9) on line 4: Invalid space character at the beginning of the line. --No sections found in file %s%s/space.conf. Skipping. - Section [info] found in file %s%s/symbols.conf is not allowed. - Section [languages] found in file %s%s/symbols.conf is not allowed. - Section [text] found in file %s%s/symbols.conf is not allowed. -@@ -55,6 +45,5 @@ Error (9) on line 15: Invalid space character at the beginning of the line. - Error (9) on line 16: Invalid space character at the beginning of the line. - Error (9) on line 26: Invalid space character at the beginning of the line. - Error (9) on line 35: Invalid space character at the beginning of the line. --No sections found in file %s%s/test.conf. Skipping. - %s%s/ipa.conf - %s%s/real.conf -diff --git a/ini/ini_augment.c b/ini/ini_augment.c -index af5c0b6..9d83ad9 100644 ---- a/ini/ini_augment.c -+++ b/ini/ini_augment.c -@@ -32,6 +32,8 @@ - #include - #include - #include -+#define TRACE_LEVEL 7 -+#define TRACE_HOME - #include "trace.h" - #include "collection.h" - #include "collection_tools.h" -@@ -456,10 +458,9 @@ static int ini_aug_construct_list(char *dirname , - } - } - else { -- ini_aug_add_string(ra_err, -- "File %s did not match provided patterns." -- " Skipping.", -- fullname); -+ TRACE_INFO_STRING("File did not match provided patterns." -+ " Skipping:", -+ fullname); - } - } - -@@ -609,8 +610,8 @@ static int ini_aug_match_sec(struct ini_cfgobj *snip_cfg, - - /* Just in case check that we processed anything */ - if (section_count == 0) { -- ini_aug_add_string(ra_err, "No sections found in file %s. Skipping.", -- snip_name); -+ TRACE_INFO_STRING("No sections found in file. Skipping:", -+ snip_name); - *skip = true; - TRACE_FLOW_EXIT(); - return EOK; diff --git a/TEST-validators_ut_check-Fix-fail-with-new-glibc.patch b/TEST-validators_ut_check-Fix-fail-with-new-glibc.patch deleted file mode 100644 index be49fa0..0000000 --- a/TEST-validators_ut_check-Fix-fail-with-new-glibc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20=C5=BDidek?= -Date: Wed, 1 Aug 2018 17:48:10 +0200 -Subject: [PATCH] validators_ut_check: Fix fail with new glibc - -Error message was slightly change from previous version -of glibc which caused fails in validators unit tests. - -Reviewed-by: Jakub Hrozek ---- - ini/ini_validators_ut_check.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c -index 9ecde75..3af8551 100644 ---- a/ini/ini_validators_ut_check.c -+++ b/ini/ini_validators_ut_check.c -@@ -602,6 +602,8 @@ START_TEST(test_ini_allowed_options_wrong_regex) - fail_unless(ret == 0, "Got msg: [%s]", errmsg); - ini_errobj_next(errobj); - -+ /* Different versions of libc produce slightly different error strings -+ * in this case. For simplicity compare against all of them. */ - errmsg = ini_errobj_get_msg(errobj); - ret = strcmp(errmsg, - "[rule/options_for_foo]: Cannot compile regular expression " -@@ -609,10 +611,17 @@ START_TEST(test_ini_allowed_options_wrong_regex) - "Error: 'Unmatched [ or [^'"); - if (ret != 0) { - ret = strcmp(errmsg, -- "[rule/options_for_foo]: Cannot compile regular expression " -- "from option 'section_re'. " -+ "[rule/options_for_foo]: Cannot compile regular " -+ "expression from option 'section_re'. " - "Error: 'brackets ([ ]) not balanced'"); - } -+ -+ if (ret != 0) { -+ ret = strcmp(errmsg, -+ "[rule/options_for_foo]: Cannot compile regular " -+ "expression from option 'section_re'. " -+ "Error: 'Unmatched [, [^, [:, [., or [='"); -+ } - fail_unless(ret == 0, "Got msg: [%s]", errmsg); - ini_errobj_next(errobj); - --- -2.9.5 - diff --git a/ding-libs.spec b/ding-libs.spec index 0bfb19c..a89befa 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -1,6 +1,6 @@ Name: ding-libs -Version: 0.6.1 -Release: 49%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: "Ding is not GLib" assorted utility libraries License: LGPLv3+ URL: https://pagure.io/SSSD/ding-libs @@ -17,10 +17,6 @@ Source0: https://releases.pagure.org/SSSD/ding-libs/%{name}-%{version}.tar.gz %global ini_config_version 1.3.1 ### Patches ### -Patch0: INI-Silence-ini_augment-match-failures.patch -Patch1: INI-Remove-definiton-of-TRACE_LEVEL.patch -Patch2: INI-Fix-detection-of-error-messages.patch -Patch3: TEST-validators_ut_check-Fix-fail-with-new-glibc.patch ### Dependencies ### # ding-libs is a meta-package that will pull in all of its own @@ -36,6 +32,7 @@ Requires: libini_config = %{ini_config_version}-%{release} BuildRequires: autoconf BuildRequires: automake +BuildRequires: gettext-devel BuildRequires: gcc BuildRequires: git BuildRequires: libtool @@ -330,6 +327,9 @@ rm -f \ rm -f */doc/html/installdox %changelog +* Tue Jan 25 2022 Alexey Tikhonov - 0.6.2-1 +- New upstream release 0.6.2 + * Thu Jan 20 2022 Fedora Release Engineering - 0.6.1-49 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 9a5b882..7d9fb7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ding-libs-0.6.1.tar.gz) = 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628 +SHA512 (ding-libs-0.6.2.tar.gz) = 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703