[arch-commits] Commit in ding-libs/trunk (2 files)

[Andreas Radke]

    Date: Saturday, September 22, 2018 @ 13:36:27
  Author: andyrtr
Revision: 335231

upgpkg: ding-libs 0.6.1-2

fix test with recent glibc - FS#60089

Added:
  ding-libs/trunk/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
Modified:
  ding-libs/trunk/PKGBUILD

----------------------------------------------------------+
 PKGBUILD                                                 |   14 +++--
 ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch |   36 +++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-22 11:48:06 UTC (rev 335230)
+++ PKGBUILD	2018-09-22 13:36:27 UTC (rev 335231)
@@ -4,7 +4,7 @@
 
 pkgname=ding-libs
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="'D is not GLib' utility libraries"
 arch=('x86_64')
 url="https://pagure.io/SSSD/ding-libs/"
@@ -12,13 +12,21 @@
 depends=('glibc')
 makedepends=('doxygen')
 checkdepends=('check')
-source=(https://releases.pagure.org/SSSD//$pkgname/$pkgname-$pkgver.tar.gz{,.asc})
+source=(https://releases.pagure.org/SSSD//$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
+       ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch)
 sha1sums=('dab4c855b065bd728021437af81ae726c31c5272'
-          'SKIP')
+          'SKIP'
+          '78ef3f3fcb25a9a98fcd82353d20b89000aee21a')
 validpgpkeys=('7B54CAE8A03D66F3D70A5B516F5A90EB44FBC7C7'  # "Pavel Reichl <preichl at redhat.com>"
               'E4E366758CA0716AAB8048671EC6AB7532E7BC25'  # "Jakub Hrozek <jhrozek at redhat.com>"
               '16F24229488E736048952737BA88000FE6398272') # "Michal Židek (rh_work) <mzidek at redhat.com>"
 
+prepare() {
+  cd $pkgname-$pkgver
+  # fix a test; FS#60089
+  patch -Np1 -i ../ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static

Added: ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch
===================================================================
--- ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch	                        (rev 0)
+++ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch	2018-09-22 13:36:27 UTC (rev 335231)
@@ -0,0 +1,36 @@
+diff -rauN ding-libs-0.6.1/ini/ini_validators_ut_check.c ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c
+--- ding-libs-0.6.1/ini/ini_validators_ut_check.c	2017-09-07 17:24:13.000000000 +0200
++++ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28-patch/ini/ini_validators_ut_check.c	2018-09-17 13:13:29.989999949 +0200
+@@ -602,11 +602,31 @@
+     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 "
+                  "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'. "
++                     "[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);
++ 
++                 
+     fail_unless(ret == 0, "Got msg: [%s]", errmsg);
+     ini_errobj_next(errobj);
+ 
+