Commit 2fa868f5 authored by Natanael Copa's avatar Natanael Copa

main/apk-tools: fix error message for apk fetch

parent 1bf1a70f
From 947baeea1860a4eb44bb8636e1db295a7bc1d259 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 10 Jan 2019 09:29:35 +0100
Subject: [PATCH] fetch: fix error message for --recursive
Give error message for `apk fetch --recursive missing`
---
src/fetch.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/fetch.c b/src/fetch.c
index e745d84..9a7c46a 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -229,8 +229,10 @@ static void mark_name_flags(struct apk_database *db, const char *match, struct a
if (!IS_ERR_OR_NULL(name)) {
name->auto_select_virtual = 1;
apk_deps_add(&ctx->world, &dep);
- } else
+ } else {
ctx->errors++;
+ mark_error(ctx, match, name);
+ }
}
static void mark_names_recursive(struct apk_database *db, struct apk_string_array *args, void *pctx)
--
2.20.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.10.3
pkgrel=0
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
......@@ -13,6 +13,7 @@ if [ "$CBUILD" = "$CHOST" ]; then
makedepends="$makedepends lua5.2-dev"
fi
source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
0001-fetch-fix-error-message-for-recursive.patch
"
url="https://git.alpinelinux.org/cgit/apk-tools/"
......@@ -82,4 +83,5 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
}
sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz"
sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz
0fe8d05d6d1c3f6ed5c86d5a5a9aca4fd5246579ed346adb990b8fba6dcac0033056a655181659b4e12a8c934d27df512d29e4e134889a4eafcfbf80e60da2a5 0001-fetch-fix-error-message-for-recursive.patch"
This diff is collapsed.
From f38d1f74af7a5ef0ccee2029be0d8036b9020f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Tue, 30 Oct 2018 18:26:10 +0200
Subject: fix xattr hash to be sha1
The hash type was accidentally changed in previous commit. Currently
csum->data cannot hold longer hash, so fix the hash.
---
src/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/io.c b/src/io.c
index 0295807..382fd1b 100644
--- a/src/io.c
+++ b/src/io.c
@@ -632,7 +632,7 @@ void apk_fileinfo_hash_xattr_array(struct apk_xattr_array *xattrs, const EVP_MD
qsort(xattrs->item, xattrs->num, sizeof(xattrs->item[0]), cmp_xattr);
- EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL);
+ EVP_DigestInit_ex(mdctx, EVP_sha1(), NULL);
foreach_array_item(xattr, xattrs) {
hash_len_data(mdctx, strlen(xattr->name), xattr->name);
hash_len_data(mdctx, xattr->value.len, xattr->value.ptr);
--
cgit v1.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment