Date: Saturday, May 28, 2022 @ 15:09:28 Author: andyrtr Revision: 446594
upgpkg: ding-libs 0.6.2-1: upstream update 0.6.2 Modified: ding-libs/trunk/PKGBUILD Deleted: ding-libs/trunk/ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch ----------------------------------------------------------+ PKGBUILD | 27 +++------ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch | 36 ------------- 2 files changed, 9 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-05-28 08:14:19 UTC (rev 446593) +++ PKGBUILD 2022-05-28 15:09:28 UTC (rev 446594) @@ -3,30 +3,21 @@ # Contributor: Mantas M. <[email protected]> pkgname=ding-libs -pkgver=0.6.1 -pkgrel=4 -pkgdesc="'D is not GLib' utility libraries" +pkgver=0.6.2 +pkgrel=1 +pkgdesc="\"DING is not GNU\" helper libraries for SSSD and FreeIPA" arch=('x86_64') -url="https://pagure.io/SSSD/ding-libs/"; +url="https://github.com/SSSD/ding-libs"; license=('GPL3' 'LGPL3') depends=('glibc') makedepends=('doxygen') checkdepends=('check') -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' - '78ef3f3fcb25a9a98fcd82353d20b89000aee21a') -validpgpkeys=('7B54CAE8A03D66F3D70A5B516F5A90EB44FBC7C7' # "Pavel Reichl <[email protected]>" - 'E4E366758CA0716AAB8048671EC6AB7532E7BC25' # "Jakub Hrozek <[email protected]>" - '16F24229488E736048952737BA88000FE6398272') # "Michal Židek (rh_work) <[email protected]>" +# https://github.com/SSSD/ding-libs/releases/download/0.6.2/ding-libs-0.6.2.tar.gz.sha256sum +source=(https://github.com/SSSD/ding-libs/releases/download/$pkgver/$pkgname-$pkgver.tar.gz{,.asc}) +sha256sums=('e5f07f34f5921bcb5ccccfe3751c28497879a6451cd7b395e99e24d9b5728e8d' + 'SKIP') +validpgpkeys=('930201AAB42DD1947210B7838D7326351A726211') # Alexey Tikhonov <[email protected]> -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 Deleted: 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 2022-05-28 08:14:19 UTC (rev 446593) +++ ding-libs-0.6.1-ini_validators_ut_check-glibc-2.28.patch 2022-05-28 15:09:28 UTC (rev 446594) @@ -1,36 +0,0 @@ -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); - -
