jengelh/ding-libs
SHA256
1
0
Fork 0
forked from pool/ding-libs
Code Pull Requests Activity

Accepting request 1094836 from network:ldap

Browse Source 
- Update to 0.6.2:

OBS-URL: https://build.opensuse.org/request/show/1094836
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ding-libs?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2023-06-24 18:13:30 +00:00 committed by Git OBS Bridge
commit 6408425f19
11 changed files with 96 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
INI-Fix-detection-of-error-messages.patch
View File

@ -1,47 +0,0 @@
From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
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 <mzidek@redhat.com>
---
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

34
INI-Remove-definiton-of-TRACE_LEVEL.patch
View File

@ -1,34 +0,0 @@
From 8509cfaa757c0f8cc4d79357613f46d2fd9ee878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
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 <rharwood@redhat.com>
(cherry picked from commit a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b)
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
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 <sys/types.h>
#include <regex.h>
#include <unistd.h>
-#define TRACE_LEVEL 7
-#define TRACE_HOME
#include "trace.h"
#include "collection.h"
#include "collection_tools.h"

96
INI-Silence-ini_augment-match-failures.patch
View File

@ -1,96 +0,0 @@
From 781fdebda1d9e62e224630efb8d4dd5da8fe5f69 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <alexander.m.scheel@gmail.com>
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 <mzidek@redhat.com>
Signed-off-by: Alexander Scheel <alexander.m.scheel@gmail.com>
Merges: https://pagure.io/SSSD/ding-libs/pull-request/3183
(cherry picked from commit be9ca3a2c26b061d1f22bd4a09009bba7a01f67b)
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
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 <sys/types.h>
#include <regex.h>
#include <unistd.h>
+#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;

49
TEST-validators_ut_check-Fix-fail-with-new-glibc.patch
View File

@ -1,49 +0,0 @@
From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
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 <jhrozek@redhat.com>
---
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

3
ding-libs-0.6.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a319a327deb81f2dfab9ce4a4926e80e1dac5dcfc89f4c7e548cec2645af27c1
size 904092

11
ding-libs-0.6.1.tar.gz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCAAGBQJZxS/3AAoJELqIAA/mOYJyKy8H/jboCn7oe3C0cn+s3qct9TkX
IU1Ppq5c30+1VXFAmr8606WpzD70hgQItI/KnrOxYbzmibwFgorwTDON6E1ulFM0
9n6Ofp3u29EPdsGM39v9ivi+UWkWWVbHbZc+RLroVmHrUG+tLgKXON2Na3TA5Ynh
x63L97GagBpznIJ+YCs2Pifrc/z4WKCFgDfUOF8uVGJ2EETHuf8PRw2sYckO8czp
2NVcJy0UfiqdfgThTGUZsbKllZ/vdW3a71CwABWjee+x3QoLyFDWhD3wcaRpPU5W
VknjR5p8CbkqSUnV/D75Fmk7+FZ1Cz1Fr6oOyCLnVNi1rTGJboF9gWNIdGpYwao=
=Jlo+
-----END PGP SIGNATURE-----

BIN
ding-libs-0.6.2.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

17
ding-libs-0.6.2.tar.gz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJIBAABCAAyFiEEkwIBqrQt0ZRyELeDjXMmNRpyYhEFAmHrD3EUHGF0aWtob25v
QHJlZGhhdC5jb20ACgkQjXMmNRpyYhHO+g//WYm6GYnWkeZfztRoN+J89FMBz1hX
SN38Mvzvqhx1PurGv1Afs88jch7cqlQkfohDEPc22BzEdHN+H9VFJqBTtXJ3BzXH
kx8zsCL/ySYW46/yuVtDqlz8WX2dMbhVSObE0MlGdSK8GzuyrY2PjAAwgRfTe/yG
E+n8tkx36yKfxZQ9RGDUofHJh0+GUWEWNcKF5lEY8EkMV2jMr8Fsf/7ZCa4uzSwy
az5B/r+JfGpY04UMzWHd0+Q/H6JhDxyP9ou3ddXptGQz1G0vG7+DZIiXT772hqwq
8kETVb2Q2p3W5COJvUrJPdS6RDgpH7DT4aG6EVYv59i0L3w0+70tEJGET0DKdBTl
mqVkx9YDXMxv7VoLM6qpAFC5GWKN5eiiYALv7mNpjAEpt7eo+6ru8VdxR2fOnEny
YIoeijVRfJMWZGlRjFtrkrVUJ1pE/BhhSPTVAtBWUoQjeQR6FltROrpp0EGZfqck
UQ/9KryDxw2WHq3P2DApykROzE+JBKmQm10zMYeANdEvDi++72y23Y4jRfLK0rgG
M1kL5NErw7D1T+mm1SvO8nIadR1xM8kvwMNLck5ftSA+w42f9TQuKYH3GiPu2dbv
uIXinZAro6hLsV1U9FCny3beIGHJq0RTxr8fhNdOmioKW8l6hMBxQcU4I4OFJTnZ
22eqtH0ha/87Fr8=
=YBPD
-----END PGP SIGNATURE-----

14
ding-libs.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Jun 20 09:07:05 UTC 2023 - Valentin Lefebvre <valentin.lefebvre@suse.com>
- Update to 0.6.2:
* Minor maintenance update:
INI: Silent ini_argument match failures
INI: Fix detection of error message
- Remove patches fixed upstream
* INI-Fix-detection-of-error-messages.patch
* INI-Silence-ini_augment-match-failures.patch
* TEST-validators_ut_check-Fix-fail-with-new-glibc.patch
* INI-Remove-definiton-of-TRACE_LEVEL.patch
- Use github sources
-------------------------------------------------------------------
Tue Jun 18 08:50:40 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

89
ding-libs.keyring
View File

@ -1,43 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFmtFkYBCAChY0X55Q+SUoPPMxTZAs3RMIt0Ljxe61thEl8M1uqY5REZhCJR
CSECM+/cWNPcSINFkAy+SBndORpk/FARplZExkuB/ySkLsm/q2wey0uLIlQl00Lg
zpF2n4maN19TKA3RZVZutkO0NiKrelZ41XZFQEnR/h7QLZ/Rp6RYhDo+C2KUYg1U
hbDMicxgQ+x+HrYdut7v6ESxCZtapnMtAfQI/+keusb18sJG+XuK8gUDNuVQSZkx
BHEPVTFD3C3XBxRVI4V7F1H475GCi/HmzydfxZ1KgiGYOrslp0hDfbzYP5NzbLfo
sDFhafuTr4ShkbCdkrAOADTo5Mmt+mmQquW7ABEBAAG0K01pY2hhbCDFvWlkZWsg
KHJoX3dvcmspIDxtemlkZWtAcmVkaGF0LmNvbT6IRgQQEQIABgUCWa1eSgAKCRAe
xqt1Mue8JUttAJ9SlYW8t5aztLboI8BASyMM9+2vaACaAmXE8Q5/UKeAlqR2+aAX
k+IgEn+JAT0EEwEIACcFAlmtFkYCGwMFCQHhM4AFCwkIBwIGFQgJCgsCBBYCAwEC
HgECF4AACgkQuogAD+Y5gnKHfwf9G9e18jQZDkHrVzAQdz+TNW+4Iu0P45vPhjaG
23CbpMj4JHcH5V1Cz4uOFw95K04x2KholnVmCLWbqXUG7zzNpQt1xEAt/c41h2zz
S4KN3tKjb41otwzc//8nkTloA2LATavgiT+HX8z12o/GgE/CoyhErdIOemZfr544
RIl1B3/RHMmie60CGUiQ1UkTr7FBodydxzGWXUUlLcPEoAf3ZiSANcwwVgVcX//x
eAnC1MPs0jBJgvJpuBbTEkL8LLzo4YTflNT4kC9HBjnF40CC20Zm/JQ6jPRYpLfw
mB6zvo6uAGXeCGbzI8SuHS4P38DunprJksA8i38pWZ/R1kHo74kCMwQTAQgAHRYh
BIsywO9goZj3N+9e9tWxng1CkAflBQJZrWJMAAoJENWxng1CkAflsQEP/0npVqGQ
dDrDuyQreIC06IhRrg9TFkYSGh/G1HvYul+VQP1Hpi8068r/zw4IwzepaUZA4aSZ
/snizLYfAK2s+x4vM5OP32dcjUlSig5l2H7NK8lwlCw1CiXXCrUvSSxHiLM9NwD3
oTjwniiYs5onA/pYueamLlO3ByxK/SktkRG/KfgH9EvQAJtny2es2yJSMDpBhE0G
7fwZ2I4XwcXCKfm2zm05xWWiqqKqmDs7KwZI8XquK1q82FnH8WEzq7iMSeI9MPH9
Pr4TnO/Ac61hE8fBVtC4Bd7moU93htnFnVaJneD1o1zrvUMJhORlmKYA2CSOIDYZ
bw8YW37ngGYoLGbXUFWe2XFod4Yj31EOiH+D9ixzRJmsj5CTEbwQZ6R5CRBfgzLT
XZDPmvmcfwIymWRo9uUQ9n0jpFpdqrqP57kdD0LuSIhOTEEz2+ECh/ED4vOoxgPV
XxcB+8j7ugCbWBwZed45PSXdChTQQiV4FLCHRgxU592EY5J+gySD3s5sxzGRkpOQ
bmoAX8UmbtT9f5FJu9Eh8GZ1quBaurWk3J2olxF2OrgrjnVEGtI2EeuiY4pC7hke
9QZGJPc0uGsBGuE8D6hdg+TMG4C9CJQLUBGMALvxUlFMV3e1Agwg5/V7Rtp7in9K
zJ6B40+JsD9FWQgY4yjIBh5IPXh2GNZiUp0LuQENBFmtFkYBCAC0jTF0Ox/ij0R8
6m7fIptSBwDpqD7seh83SZYARFk0ND/xG4SQE6Qb5Ht6OCJEWT3sVwoGrH2HPCmq
Kh0HZHRDFjlI8CqJNXPFXu+p7asUJa+8ANMF2OXsNXFq6KRarmlc1ZPvrqNCoKB1
EgNQMfb+hyHdMQgV9DGXWTje3zVMJ4DnoQxCp0f0V37lwFLOHOMfyx3Wxi7vxjFa
9tbPCt0GKE3dJBAGKEP1a3udOWv+DA4mNXittzEuEoJROL/kY8U5YzNg4VEuBgom
EBpTEBzi3sQjNpP9UKbYueiGvDSxWH2F/zcyqMbvKSKZo1ILZyA+FtNWxVtiilbK
Sr4DrqPtABEBAAGJASUEGAEIAA8FAlmtFkYCGwwFCQHhM4AACgkQuogAD+Y5gnKN
7Qf/XUl70tVHJNFVf+Yl+yWMLSRghhdbkJiO9v5ZRz6oEvOSycnAIth7TywOryMU
Ey9kyaIZ7SRHnBKwAxnUCRLH99J1UBw5Po2bxQisd6pyzLP+5drc9jmlMVu8sHp3
YWjStOyfnXi7Zp20o/GaCja2hOyd9OLvEPksWo17OuPTzY9N56o+HUvxhFeFGCSv
2urpuY6skiyyFsu21KCUNH2fsUHEHKDPwkwNNs0Js3j7XQKJ+kW/iWlyXND2+gOd
6lzTpheERmf8gperNM21el2c+oPgvvJdxsAwiSUAnv4DjayvGIrE53rmTnEO8NVK
gZmj0yhMzGBElfS9FU0Kq+fUCQ==
=sTrO
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
nQ==
=uvJr
-----END PGP PUBLIC KEY BLOCK-----

24
ding-libs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ding-libs
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,24 +23,20 @@
%global ref_array_version 0.1.5
%global basicobjects_version 0.1.1
%global ini_config_version 1.3.1
Name: ding-libs
Version: 0.6.1
Version: 0.6.2
Release: 0
Summary: "Ding is not GLib" assorted utility libraries
License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: Development/Libraries/C and C++
URL: https://pagure.io/SSSD/ding-libs
URL: https://github.com/SSSD/ding-libs
#Git-Clone: https://pagure.io/SSSD/ding-libs
Source: https://fedorahosted.org/released/ding-libs/%name-%version.tar.gz
Source2: https://fedorahosted.org/released/ding-libs/%name-%version.tar.gz.asc
Source: https://github.com/SSSD/ding-libs/releases/download/%version/%name-%version.tar.gz
Source2: https://github.com/SSSD/ding-libs/releases/download/%version/%name-%version.tar.gz.asc
Source3: %name.keyring
Source4: baselibs.conf
Patch1: 0001-increase-ini-max-value-length.patch
Patch2: INI-Fix-detection-of-error-messages.patch
Patch3: INI-Silence-ini_augment-match-failures.patch
Patch4: TEST-validators_ut_check-Fix-fail-with-new-glibc.patch
Patch5: INI-Remove-definiton-of-TRACE_LEVEL.patch
BuildRequires: doxygen
BuildRequires: pkgconfig
BuildRequires: pkgconfig(check) >= 0.9.5
@ -187,19 +183,19 @@ A dynamically-growing, reference-counted array
%build
%configure --disable-static
make %{?_smp_mflags} all docs
%make_build all docs
%check
make %{?_smp_mflags} check
%make_build check
%install
%make_install
find %buildroot -type f -name "*.la" -delete -print
rm -fv "%buildroot/%_libdir"/*.la
# Remove the example files from the output directory
# We will copy them directly from the source directory
# for packaging
rm -f \
rm -fv \
"%buildroot/%_datadir/doc/ding-libs"/README.* \
"%buildroot/%_datadir/doc/ding-libs/examples/dhash_example.c" \
"%buildroot/%_datadir/doc/ding-libs/examples/dhash_test.c"