diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-11-12 13:26:25 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-11-12 13:26:25 +0200 |
| commit | d5620f61e13e24e3df147fb36aa484fb04edfb2b (patch) | |
| tree | 585a1e6a86358b7f27e9c3796b12718f84d68dc2 /main/apk-tools | |
| parent | 236cb81551e31e3f73feab219a8e6de3e367152b (diff) | |
| download | aports-d5620f61e13e24e3df147fb36aa484fb04edfb2b.tar.bz2 aports-d5620f61e13e24e3df147fb36aa484fb04edfb2b.tar.xz | |
main/apk-tools: upgrade to 2.6.5
Diffstat (limited to 'main/apk-tools')
| -rw-r--r-- | main/apk-tools/0001-io-fix-posix_fallocate-failure-handling.patch | 27 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 14 |
2 files changed, 5 insertions, 36 deletions
diff --git a/main/apk-tools/0001-io-fix-posix_fallocate-failure-handling.patch b/main/apk-tools/0001-io-fix-posix_fallocate-failure-handling.patch deleted file mode 100644 index 662d40b1ca..0000000000 --- a/main/apk-tools/0001-io-fix-posix_fallocate-failure-handling.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 19356dfbd6b3e7d4880d29b1f4b5c0cb665eb467 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 11 Sep 2015 16:16:26 +0200 -Subject: [PATCH] io: fix posix_fallocate failure handling - -We need fall back to a splice buffer if posix_fallocate call fails due -to file being a device (eg tty) or a pipe. This fixes apk fetch --stdout. ---- - src/io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/io.c b/src/io.c -index a321c0c..65851be 100644 ---- a/src/io.c -+++ b/src/io.c -@@ -149,7 +149,7 @@ size_t apk_istream_splice(void *stream, int fd, size_t size, - if (r == 0) - mmapbase = mmap(NULL, size, PROT_READ | PROT_WRITE, - MAP_SHARED, fd, 0); -- else if (r != ENOSYS) -+ else if (r == EBADF || r == EFBIG || r == ENOSPC || r == EIO) - return -r; - } - if (bufsz > 2*1024*1024) --- -2.5.1 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index b061647b08..ce0d6c1021 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.6.4 -pkgrel=1 +pkgver=2.6.5 +pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -13,7 +13,6 @@ if [ "$CBUILD" = "$CHOST" ]; then makedepends="$makedepends lua5.2-dev" fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz - 0001-io-fix-posix_fallocate-failure-handling.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -83,9 +82,6 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="14585ea5607a755beb57512261afd318 apk-tools-2.6.4.tar.xz -0616bb34e33a101637669d14086077ca 0001-io-fix-posix_fallocate-failure-handling.patch" -sha256sums="0c0f7e87d8241953ba06ab84d1dc82ad119bfb17b365c6a44cdd51bac3ab429c apk-tools-2.6.4.tar.xz -863e9af2d8f14c63e06c76d11dfaf3e4fa941d22d471b35c5901dafef21721e5 0001-io-fix-posix_fallocate-failure-handling.patch" -sha512sums="cf7327d283af8c1ac00632cccc8f607cad8cf4a5118c07b2d258214c55d64126c8c336b7c3619c4fd7e5bb06841c33c92b4a298e51c86459eef6919663de3cf4 apk-tools-2.6.4.tar.xz -9aaf5f3f83ed4012a49ff458cdc040318a734992d2754eac034f2bbeaccc5c2f9797240675346581248b1ce0bdf3b2a8c59deb19bf770eb4d6537864e6c6ced1 0001-io-fix-posix_fallocate-failure-handling.patch" +md5sums="4a3b636d9d97f6cf8afbfcf77d777dd2 apk-tools-2.6.5.tar.xz" +sha256sums="4347de7d8dfc0784cecae6d7e5e32d8d4a4f35660e2d9e01e3e3e41899b8ff5f apk-tools-2.6.5.tar.xz" +sha512sums="0953a66d3b2a5d186ea4941d33d92c95b9288d59cf9d0e338c1fd7daca4db03aed80cd05229c15db16c22a72094794a0b3979d939e5bc115c41b03b7ae93593b apk-tools-2.6.5.tar.xz" |