diff options
| author | Max Rees <maxcrees@me.com> | 2018-09-15 17:56:06 -0400 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-09-16 16:35:28 +0000 |
| commit | d7524c45a0a538a6881c69e8db2ec696545b78c5 (patch) | |
| tree | 6f7140d7121a869abf2b1f982a7c85b2196ffb35 /system | |
| parent | de8797f10419669525608fe59f181908e94696f5 (diff) | |
| download | packages-d7524c45a0a538a6881c69e8db2ec696545b78c5.tar.gz packages-d7524c45a0a538a6881c69e8db2ec696545b78c5.tar.bz2 packages-d7524c45a0a538a6881c69e8db2ec696545b78c5.tar.xz packages-d7524c45a0a538a6881c69e8db2ec696545b78c5.zip | |
system/abuild: fix checkapk
Diffstat (limited to 'system')
| -rw-r--r-- | system/abuild/APKBUILD | 6 | ||||
| -rw-r--r-- | system/abuild/checkapk-libarchive-tar.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index baf4aac5c..5e462a8c9 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild pkgver=3.2.0_rc1 -pkgrel=4 +pkgrel=5 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/aports" arch="all" @@ -24,6 +24,7 @@ source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz 0001-newapkbuild-fix-typo.patch 0002-newapkbuild-move-checksum-call-to-after-fetch.patch use-pigz.patch + checkapk-libarchive-tar.patch " builddir="$srcdir/$pkgname-$pkgver+adelie" @@ -69,4 +70,5 @@ sha512sums="8d9e66ec6a4e814f9be0a10b53c4b183afa97c9969d9bb86fdec0b9096756d6343ce b7aa7ff9858eee2ff20eeed3b8da60d40e608b4da2676acb9c8b16ca6639283e5d70884888efd505fcd239bb462f726203e4773a4f706b16d07742b2a8631b6c 0001-abuild-continue-faking-POSIX-support-for-now.patch 4ef673998b8f28469eeb4d1448a664f7052686466a67b1a3f3cab1e249ad44308df92737da4eae3c3ffea06806f460e23fc1c0ddccd7f9e82c4e308cb63be029 0001-newapkbuild-fix-typo.patch c6ebe8219c2e8ec9fc75da1c597b2d8d960e632286a6c7f1d1ffb6623b4d4acca54ae90a6c07637c589cbbe3ed2fb0da0c26a41df20cac0318b4894991e2dbf4 0002-newapkbuild-move-checksum-call-to-after-fetch.patch -b428baddee9b719898a6e7f87d3a990aa1000cac0b6bcf3890e7cafd0ee164164551e7c4699d12f29ea9b6364cc18722a5560b0b65b9d8f586caf739a5432313 use-pigz.patch" +b428baddee9b719898a6e7f87d3a990aa1000cac0b6bcf3890e7cafd0ee164164551e7c4699d12f29ea9b6364cc18722a5560b0b65b9d8f586caf739a5432313 use-pigz.patch +0acff1a66e327236aad85ab3b77724dd1ac398cc4db305fee82c6ead64ab9c9332c9ffa5d08c8607494e5925ced8d7b315670b2fe589c0df3b3fc61caea3acba checkapk-libarchive-tar.patch" diff --git a/system/abuild/checkapk-libarchive-tar.patch b/system/abuild/checkapk-libarchive-tar.patch new file mode 100644 index 000000000..fb5243d02 --- /dev/null +++ b/system/abuild/checkapk-libarchive-tar.patch @@ -0,0 +1,11 @@ +--- abuild-3.2.0_rc1+adelie/checkapk.in 2017-08-13 13:39:10.730229975 -0400 ++++ abuild-3.2.0_rc1+adelie/checkapk.in 2018-09-15 17:52:51.160104742 -0400 +@@ -72,7 +72,7 @@ + fi + + apk fetch --quiet --repositories-file $tmpdir/repositories --stdout $_pkgname \ +- | tar -zt | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \ ++ | tar -ztf - | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \ + || die "failed to download old pkg, maybe run 'apk update'?" + + tar -ztf "$filepath" | grep -v '^\.SIGN\.' | sort > "filelist-$_pkgname" |