gentoo resync : 21.05.2019

5 files changed, 142 insertions, 1 deletions

diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index f742b24cf019..75f0931b52a3 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,3 +1,6 @@
+AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af408b8e9cc31415efc1c1679b2bb0f21a998a1d0e951708203778e7d03e58e19cadf760a8f4ff1050d53e1eadbd8b83d5fcf84c4e5d8dc9ba SHA512 f0ef79aa548aef09a1611bacd6dd69d765ab09fd19a498fb24b14c7a2882f2b6ca2f2246f99faa3c1796ef7d9bf43bf4e1412442ec6220c4e71607ab7f41ec9d
+AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b
+AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593
 DIST ding-libs-0.4.0.tar.gz 827058 BLAKE2B aa6e1cef9747646ece2643495eaa720254a964ea1adf8695f0a8a2d9c401b141a72e0c81d9d9cd44aaa81feed73118b7c7e52a24121d4ee0f71928dcf4ecf43d SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0
 DIST ding-libs-0.5.0.tar.gz 868840 BLAKE2B dc89dbd0951d8505776ae98a10bbfb54f4a2106da0a5b76f3d08556f7df0e85093862813ceb12f0190709ca71fe75eceb2c373dd95a0437f15ceec0bd70cf171 SHA512 d79db6794dbb59b518db15c51c3f981e8873e478a156ca8ae766a61107796968eeed36cf21bd20f5e6f04c5b460d3a40ab114a482754e2f3976c53bb82fe1fcb
 DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e2758ddc42338556a2c697e83ec4c57aa60867d5d2dc6add935266c8a4404f59d089fe52507d52783aed8bbe967503 SHA512 7218b6825bc078bdc35f149bd17944f427af0e32fa4d94026c00ecd14037598959ad7e1dee46af6fd3736424cdb499720fd8e1a0d1dfd173a5bc0085f8f986b2
@@ -5,5 +8,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
 EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
 EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 596 BLAKE2B 11bef827671de0e05337eb7a834a0983b477d7639cf28484d06fdd7a5366ef6a57d5a9d4c8ddbbdb0b4c3e00ed2ed759c5586203930c80046022aa30752bb278 SHA512 15dba21537d6ba66a49a9b01bf3e114e98d05a822a0f2a970dc1ffac1a5f0b5c199e55814812254f4f5466d2b515f2a2d0e20db3fcedb5447173e53eae7b21fc
+EBUILD ding-libs-0.6.1.ebuild 802 BLAKE2B 3239136179d46f0b395bf68c3673996c7f2c307ffa3eaa261feb7f6d3ff6f7db1cb09467a2848328765ed9ec03b3b71fe0fe504be40531af961833db8a24ebb6 SHA512 c72fb6dbfdb36de0d12c35d3294f150dd05b9ddfee17bfbf9917f4174ce430b397ad543e8b954b9c4ab294e55b70483f9e625b101ee4bfab1766837cfc5c25c2
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index d5e4cec20bf8..88d34677f297 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -19,6 +19,12 @@ 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/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch
new file mode 100644
index 000000000000..62e436c7c92a
--- /dev/null
+++ b/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 <lslebodn@redhat.com>
+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 <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.21.0
+
diff --git a/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch
new file mode 100644
index 000000000000..a9ca8e9edc2b
--- /dev/null
+++ b/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 <henrik.riomar@gmail.com>
+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 <mzidek@redhat.com>
+---
+ 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/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch
new file mode 100644
index 000000000000..0524a128d620
--- /dev/null
+++ b/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?= <mzidek@redhat.com>
+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 <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.21.0
+