From 63dd5562c746edd5b31253503dec93aa6a2dd748 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 10 Nov 2023 14:58:47 +0100 Subject: [PATCH] dev-libs/ding-libs: Sync with Gentoo It's from Gentoo commit 3e0de4c3b9bb72ac63c48349ea390b6586d4f9e5. --- .../dev-libs/ding-libs/Manifest | 2 +- .../ding-libs/ding-libs-0.6.1-r1.ebuild | 36 -------------- .../dev-libs/ding-libs/ding-libs-0.6.1.ebuild | 31 ------------ .../ding-libs/ding-libs-0.6.2-r1.ebuild | 24 +++++++++ ...-INI-Fix-detection-of-error-messages.patch | 47 ------------------ ...1-path_utils_ut-allow-single-as-well.patch | 36 -------------- ...ors_ut_check-Fix-fail-with-new-glibc.patch | 49 ------------------- .../dev-libs/ding-libs/metadata.xml | 5 +- 8 files changed, 29 insertions(+), 201 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/Manifest index 88f8db9149..bed4d6c291 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/Manifest @@ -1 +1 @@ -DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628 +DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild deleted file mode 100644 index 1445f869fe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="set of utility libraries (mostly used by sssd)" -HOMEPAGE="https://pagure.io/SSSD/ding-libs" -SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch - "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch - "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf --disable-static -} - -multilib_src_install_all() { - einstalldocs - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1.ebuild deleted file mode 100644 index f64be15bf4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit multilib-minimal - -DESCRIPTION="set of utility libraries (mostly used by sssd)" -HOMEPAGE="https://pagure.io/SSSD/ding-libs" -SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" -IUSE="test static-libs" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" - -PATCHES=( - "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch - "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch - "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild new file mode 100644 index 0000000000..ccd6a03cf4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Set of utility libraries (mostly used by sssd)" +HOMEPAGE="https://github.com/SSSD/ding-libs" +SRC_URI="https://github.com/SSSD/ding-libs/releases/download/${PV}/${P}.tar.gz" + +LICENSE="LGPL-3 GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-libs/check )" +BDEPEND="virtual/pkgconfig" + +src_install() { + default + + # No static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch deleted file mode 100644 index 62e436c7c9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0000-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] 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.21.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch deleted file mode 100644 index a9ca8e9edc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4236e323e8ab4f13770e1ac9e94666b304b693fb Mon Sep 17 00:00:00 2001 -From: Henrik Riomar -Date: Tue, 24 Jul 2018 21:59:36 +0000 -Subject: [PATCH 1/2] path_utils_ut: allow single / as well -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266 - Multiple successive slashes are considered to be the same as one slash. - -When running the tests on a musl libc system - get_dirname(p, PATH_MAX, "//foo//") -actually results in a / and not // - -Reviewed-by: Michal Židek ---- - path_utils/path_utils_ut.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/path_utils/path_utils_ut.c b/path_utils/path_utils_ut.c -index 27c99b6..061abfb 100644 ---- a/path_utils/path_utils_ut.c -+++ b/path_utils/path_utils_ut.c -@@ -62,7 +62,7 @@ START_TEST(test_dirname) - fail_unless_str_equal(p, "//foo"); - - fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS); -- fail_unless_str_equal(p, "//"); -+ fail_unless(!strcmp(p, "/") || !strcmp(p, "//")); - - fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS); - fail_unless_str_equal(p, "foo"); --- -2.21.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch deleted file mode 100644 index 0524a128d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0002-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 2/2] 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.21.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/metadata.xml index 85e4ed814f..a5ebe852b9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/metadata.xml @@ -1,5 +1,8 @@ - + + + SSSD/ding-libs +