diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog deleted file mode 100644 index aa9ee051cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -# ChangeLog for dev-libs/ding-libs -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*ding-libs-0.4.0 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +ding-libs-0.4.0.ebuild, - +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog-2015 deleted file mode 100644 index d025a9d5c5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ChangeLog-2015 +++ /dev/null @@ -1,84 +0,0 @@ -# ChangeLog for dev-libs/ding-libs -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ChangeLog,v 1.21 2015/04/10 00:10:17 blueness Exp $ - - 10 Apr 2015; Anthony G. Basile ding-libs-0.4.0.ebuild: - Keyword ~ppc, ~ppc64. Bug #540540. - - 06 Mar 2015; Jeroen Roovers ding-libs-0.4.0.ebuild: - Marked ~hppa (bug #540540). - - 03 Mar 2015; Markus Meier ding-libs-0.4.0.ebuild: - add ~arm, bug #540540 - - 26 Jan 2015; Manuel Rüger -ding-libs-0.1.3.ebuild, - -ding-libs-0.2.91.ebuild, -ding-libs-0.3.0.1.ebuild: - Remove old. - - 26 Jan 2015; Agostino Sarubbo ding-libs-0.4.0.ebuild: - Stable for x86, wrt bug #535106 - - 09 Jan 2015; Agostino Sarubbo ding-libs-0.4.0.ebuild: - Stable for amd64, wrt bug #535106 - -*ding-libs-0.4.0 (27 Jun 2014) - - 27 Jun 2014; Maxim Koltsov +ding-libs-0.4.0.ebuild: - Bump to 0.4.0, thanks to slepnoga - - 01 Dec 2013; Markos Chandras ding-libs-0.1.3.ebuild, - ding-libs-0.2.91.ebuild, ding-libs-0.3.0.1.ebuild: - Do not override src_install function. Fixes installation failures - - 14 Jul 2013; Agostino Sarubbo ding-libs-0.3.0.1.ebuild: - Stable for x86, wrt bug #476792 - - 14 Jul 2013; Agostino Sarubbo ding-libs-0.3.0.1.ebuild: - Stable for amd64, wrt bug #476792 - -*ding-libs-0.3.0.1 (07 Apr 2013) - - 07 Apr 2013; Maxim Koltsov +ding-libs-0.3.0.1.ebuild: - Bump to 0.3.0.1, thanks to slepnoga - - 17 Mar 2013; Markos Chandras metadata.xml: - Add proxy-maintainers to metadata.xml - - 03 Nov 2012; Sergey Popov metadata.xml: - Correct metadata, requested by Andreis Vinogradovs - -*ding-libs-0.2.91 (06 Aug 2012) - - 06 Aug 2012; Maxim Koltsov +ding-libs-0.2.91.ebuild: - Bump to 0.2.91, thanks to slepnoga - - 02 Jun 2012; Maxim Koltsov -ding-libs-0.1.2-r1.ebuild: - Remove old 0.1.2-r1 - - 21 May 2012; Jeff Horelick ding-libs-0.1.3.ebuild: - marked x86 per bug 415505 - - 02 Mar 2012; Agostino Sarubbo ding-libs-0.1.3.ebuild: - Stable for amd64, wrt bug #406291 - - 04 Feb 2012; Maxim Koltsov metadata.xml: - Fix maintainer's email in metadata - -*ding-libs-0.1.3 (08 Oct 2011) - - 08 Oct 2011; Maxim Koltsov +ding-libs-0.1.3.ebuild: - Bump to 0.1.3, by slepnoga. - -*ding-libs-0.1.2-r1 (15 Sep 2011) - - 15 Sep 2011; Maxim Koltsov - +ding-libs-0.1.2-r1.ebuild, -ding-libs-0.1.2.ebuild: - (ChangeLog by Andreis Vinogradovs ) - Disable install useless .la files #382715; - Thanks Samuli Suominen for report - -*ding-libs-0.1.2 (11 Aug 2011) - - 11 Aug 2011; Maxim Koltsov +ding-libs-0.1.2.ebuild, - +metadata.xml: - Add initial ebuild from rion-overlay, thanks to slepnoga 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 8103527fb9..88f8db9149 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,5 +1 @@ -DIST ding-libs-0.4.0.tar.gz 827058 SHA256 bdeb90b07ceaa9145e6784ce40a71b69a37fffc7373c51fee258ffffd5390457 SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0 WHIRLPOOL 41733ac92c3c7fcaa19f19843a2464a0644632cc345b77fc033910974fa449f91780725302fafadd233c6ef4379174261bbab45e49830e8673a46d9ee3d6f652 -EBUILD ding-libs-0.4.0.ebuild 497 SHA256 d7d313a3221c76c4c6c317235145aee8df5dcfff92366beb9d3113365cc3cb8d SHA512 ca1a446f51e2eb2ef441e521e55c943439eefbff6fc0bc3910a5ebffa535a748676ea8f2ae0ff0a36c97985bedcbca7a68c1722dbf523f3df77faafc96cc0cf5 WHIRLPOOL 297bf87645e6bb5f7ef13fc16cba94d1c504d73b971f6b00ad6da673e5925e21f97fbc9643ecb15da1167c21ddc504a02b16c76f560c9f146a83c2694e4c665c -MISC ChangeLog 2433 SHA256 d640b7cb7e7ecbe7f29b52bdf7a6212fbb74411f1f4f4c9233ebabe28ac0f957 SHA512 fd37af97f9a0e4d73f41742e0c700dcab8efa355e43cebe65d9d98099fb13b93ccbf11f15a8ff67d958a3e5267fd18d40927fc64fec470c25d36a10d3b55f6a8 WHIRLPOOL a3b8b6f2331cc9540d53ad9fbf5a6f287d2e176d34417e9d198f0f44daa2023276cd9da3fce1f91984173ca6e40ab3b513141d3d3e69d9f17e6ef90ecca8d8d4 -MISC ChangeLog-2015 3038 SHA256 b5834d36691c6cadabbf1f7c5a15387696afd8b7d2e328c840f77fdf3a7ef0b5 SHA512 3070f202ae9432ee0437e79cc7b555951a2a6a7a7fe892103be3ce2fcfe3d94f1cb33d3fa94dca4c65de33dbfac5349da511215f84d555e5f58456b394dffb64 WHIRLPOOL 349f303f87209cf88f9507e7dcddd5f5daab8d9818611e7c0a05b6d8e523dba0951471b108ef54bddb916e6b07fd7faaf6e4999803e26107a4315e935665c7e1 -MISC metadata.xml 599 SHA256 a5e01e3375343a49fe9f0f2daae627cab85084a5cb111fe4b8eca8808c4be28b SHA512 8eb65f04aff8bcd9c14c81ccf6a2ba9292da7a5b6c40bcbb242dc8812988a60146814851ce1f3205cc76744cb11c49e05d22d6e94f8875e694eaf528973b061d WHIRLPOOL 040905a8e211e70e02f8d0c6497f5fe028a3b925bf612ceefbc63ca2792ddd5c5d69a3ffa19898ea4c328d091d48019251afcd7946bfb018a70a405d2cf36bb0 +DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.4.0.ebuild deleted file mode 100644 index 48143ce829..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.4.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-multilib - -DESCRIPTION="Library set needed for build sssd" -HOMEPAGE="https://fedorahosted.org/sssd" -SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 GPL-3" -SLOT="0" - -KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="test static-libs" - -RDEPEND="" - -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check ) - " 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 new file mode 100644 index 0000000000..1445f869fe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild @@ -0,0 +1,36 @@ +# 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 new file mode 100644 index 0000000000..f64be15bf4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/ding-libs-0.6.1.ebuild @@ -0,0 +1,31 @@ +# 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/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 new file mode 100644 index 0000000000..62e436c7c9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch @@ -0,0 +1,47 @@ +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 new file mode 100644 index 0000000000..a9ca8e9edc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 0000000000..0524a128d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch @@ -0,0 +1,49 @@ +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 47e116b000..85e4ed814f 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,18 +1,5 @@ - + - - andreis.vinogradovs@gmail.com - Andreis Vinogradovs - Maintainer. Assign bugs to him - - - maksbotan@gentoo.org - Maxim Koltsov - Proxy maintainer. CC him on bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - +