diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-13 09:49:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-13 09:49:21 +0000 |
| commit | a1f4edf330ef50bd6e4f14071805e1abb7005fae (patch) | |
| tree | 4fdbfd32d529c2ffa37c1383235faca63e5ea1b8 /main/apk-tools | |
| parent | ae8401fe9aeb7313870597b03f6da374afea592c (diff) | |
| download | aports-a1f4edf330ef50bd6e4f14071805e1abb7005fae.tar.bz2 aports-a1f4edf330ef50bd6e4f14071805e1abb7005fae.tar.xz | |
main/apk-tools: upgrade to 2.6.0_rc2
Diffstat (limited to 'main/apk-tools')
3 files changed, 5 insertions, 66 deletions
diff --git a/main/apk-tools/0001-update-return-errors-also-with-quiet.patch b/main/apk-tools/0001-update-return-errors-also-with-quiet.patch deleted file mode 100644 index 62a8e525c9..0000000000 --- a/main/apk-tools/0001-update-return-errors-also-with-quiet.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2322ba0ad938c142d0bb7a715940fc75ccdbe91b Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 10 Apr 2015 17:33:21 +0000 -Subject: [PATCH] update: return errors also with --quiet - -fixes #4040 ---- - src/update.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/update.c b/src/update.c -index 84833ec..72e8673 100644 ---- a/src/update.c -+++ b/src/update.c -@@ -23,7 +23,7 @@ static int update_main(void *ctx, struct apk_database *db, struct apk_string_arr - char buf[32] = "OK:"; - - if (apk_verbosity < 1) -- return 0; -+ return db->repo_update_errors; - - for (i = 0; i < db->num_repos; i++) { - repo = &db->repos[i]; --- -2.3.5 - diff --git a/main/apk-tools/0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch b/main/apk-tools/0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch deleted file mode 100644 index 079b00ab1b..0000000000 --- a/main/apk-tools/0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 60dd5798c90f0032b5c477bd35a2e0d49c280c7c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Wed, 8 Apr 2015 16:58:20 +0300 -Subject: [PATCH] use memmove for copying buffer leftovers, as the ranges may - overlap - -issue cought by fortify ---- - src/io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/io.c b/src/io.c -index e9d95df..765afc5 100644 ---- a/src/io.c -+++ b/src/io.c -@@ -224,7 +224,7 @@ static apk_blob_t is_bs_read(void *stream, apk_blob_t token) - - /* We need more data */ - if (isbs->left.len != 0) -- memcpy(isbs->buffer, isbs->left.ptr, isbs->left.len); -+ memmove(isbs->buffer, isbs->left.ptr, isbs->left.len); - isbs->left.ptr = isbs->buffer; - size = isbs->is->read(isbs->is, isbs->buffer + isbs->left.len, - sizeof(isbs->buffer) - isbs->left.len); --- -2.3.5 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 5cedfd4b8b..d427cb0b7b 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.0_rc1 -pkgrel=2 +pkgver=2.6.0_rc2 +pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -13,8 +13,6 @@ if [ "$CBUILD" = "$CHOST" ]; then makedepends="$makedepends lua5.2-dev" fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz - 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch - 0001-update-return-errors-also-with-quiet.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -84,12 +82,6 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="c9515f2063d31e4dc7583e6b3d3b8ab0 apk-tools-2.6.0_rc1.tar.xz -b6ad09951c806fa6d2ca5d1f3c316dff 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch -fe789514899ba733580aac81fc88f346 0001-update-return-errors-also-with-quiet.patch" -sha256sums="41f87b45998bee0154a86d4e408ed014248abd713ca7d04b529b3d53b9af2fba apk-tools-2.6.0_rc1.tar.xz -01cedfd97bcbbeee309a1293c65a0e734c0b894f65b543330d564c648f91f3c4 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch -a4c93b5ef9810384a55d92d5e0611cf4323be60673283ee270fa0582723329e3 0001-update-return-errors-also-with-quiet.patch" -sha512sums="899706b2d440d4c28c3a8715514d3b32a0aea489ff48e5e1af658c167a2197f7d6e642182149f32744cd4c78d981ee4eb0f8588f07b365c6b8be04e1da3cf105 apk-tools-2.6.0_rc1.tar.xz -4e26becda63fd1664fb1625487eedc4cb1b7b8155a65ac317e7c0583e3e9f203fe7cab7498463e6f9552ac71d9dbac48c1eba5926dc1f29481cef7d9a691c1ed 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch -d50d4b7e6b4e8cc85526c86439d4e3a365e84a8581738bc942b4881f4158b6438e31c906170ec06a9d809a07ed7150449b771a0435a10f433cbb7b8650aad416 0001-update-return-errors-also-with-quiet.patch" +md5sums="e5442c116427a2cad23086de41e29e1e apk-tools-2.6.0_rc2.tar.xz" +sha256sums="0b2b6018d0b3e11e29bb3586c53b51393cc99d9bdacc6a77c60d9f261fe6f70d apk-tools-2.6.0_rc2.tar.xz" +sha512sums="d883c5f2d1371e633856cfc6315c88b54cf39d7ec3d333a2b25ae0e68ef2fc101ae8a254d4684b7c21754c87e72f4699d249977e27885dc4cead6db88ad0776b apk-tools-2.6.0_rc2.tar.xz" |