aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2021-05-03 10:42:09 +0200
committerRasmus Thomsen <oss@cogitri.dev>2021-05-03 14:15:52 +0000
commitbb386320ff28f1cb16e855b29b8c94a0f2e435c0 (patch)
tree12ceb1527a0634f2d301889adaf843176e721d1e
parent3495fd00528df1314d5021432e2d713f8ca26fe4 (diff)
downloadaports-bb386320ff28f1cb16e855b29b8c94a0f2e435c0.tar.gz
aports-bb386320ff28f1cb16e855b29b8c94a0f2e435c0.tar.bz2
aports-bb386320ff28f1cb16e855b29b8c94a0f2e435c0.tar.xz
testing/createrepo_c: upgrade to 0.17.1
Also re-enable test we previously disabled, works with file=5.40-r1
-rw-r--r--testing/createrepo_c/APKBUILD12
-rw-r--r--testing/createrepo_c/disable-failing-tests.patch24
2 files changed, 6 insertions, 30 deletions
diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index 8286308e4f..2fba8ebdb8 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -1,8 +1,8 @@
# Contributor:
# Maintainer: Paul Morgan <jumanjiman@gmail.com>
pkgname=createrepo_c
-pkgver=0.15.7
-pkgrel=1
+pkgver=0.17.1
+pkgrel=0
pkgdesc="C implementation of createrepo"
url="https://github.com/rpm-software-management/createrepo_c/"
arch="all"
@@ -13,7 +13,7 @@ makedepends="
cmake
curl-dev
expat-dev
- file-dev
+ file-dev>=5.40-r1
glib-dev
openssl-dev
libxml2-dev
@@ -38,7 +38,6 @@ subpackages="
"
source="
$pkgname-$pkgver.tar.gz::https://github.com/rpm-software-management/createrepo_c/archive/$pkgver.tar.gz
- disable-failing-tests.patch
"
build() {
@@ -83,5 +82,6 @@ py3() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
}
-sha512sums="8a20bda92338db87f8ac27a6c3e191f6ac63a6be0e77bdc3227143acc2eb5b4fe06f6fdbb13b2031f69555c7f8a053d6155e4515620724515b173bd546648f1f createrepo_c-0.15.7.tar.gz
-d10bcc42c89931c386757967d8ee1eb381bc97f2f450cf9c8c244eaf8c58602a26899257d112c65b24c63faf807981e63fa8edc9bbe1f451fb6c30fde8dedcbc disable-failing-tests.patch"
+sha512sums="
+5c5d459e255a3fef61ed4c25a655aa26698696b3f3fc0ba6492509338d527db0ccf71f23495e1bfba1a0e11055d29c7930dbf761ac3254f780d5dad33f7d70ce createrepo_c-0.17.1.tar.gz
+"
diff --git a/testing/createrepo_c/disable-failing-tests.patch b/testing/createrepo_c/disable-failing-tests.patch
deleted file mode 100644
index aa9a37d683..0000000000
--- a/testing/createrepo_c/disable-failing-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# https://github.com/rpm-software-management/createrepo_c/issues/258
-diff --git a/tests/test_compression_wrapper.c b/tests/test_compression_wrapper.c
-index edd4fe5..664c9f7 100644
---- a/tests/test_compression_wrapper.c
-+++ b/tests/test_compression_wrapper.c
-@@ -216,11 +216,12 @@ test_cr_detect_compression_bad_suffix(void)
- // Xz
-
- ret = cr_detect_compression(FILE_COMPRESSED_0_XZ_BAD_SUFFIX, &tmp_err);
-- g_assert_cmpint(ret, ==, CR_CW_XZ_COMPRESSION);
-- g_assert(!tmp_err);
-- ret = cr_detect_compression(FILE_COMPRESSED_1_XZ_BAD_SUFFIX, &tmp_err);
-- g_assert_cmpint(ret, ==, CR_CW_XZ_COMPRESSION);
-- g_assert(!tmp_err);
-+ // https://github.com/rpm-software-management/createrepo_c/issues/258
-+ //g_assert_cmpint(ret, ==, CR_CW_XZ_COMPRESSION);
-+ //g_assert(!tmp_err);
-+ //ret = cr_detect_compression(FILE_COMPRESSED_1_XZ_BAD_SUFFIX, &tmp_err);
-+ //g_assert_cmpint(ret, ==, CR_CW_XZ_COMPRESSION);
-+ //g_assert(!tmp_err);
- }
-
-
-