Commit 61592185 authored by Natanael Copa's avatar Natanael Copa

core/apk-tools: another fix for a regression introduced in latest patch

parent ca234242
From bfabf8f8d966ab8305212b9730db8fc5eb5e1094 Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@iki.fi>
Date: Wed, 15 Jul 2009 08:38:30 +0300
Subject: [PATCH] pkg: fix package scanner to read whole archive
otherwise we don't get chechksum anymore after the changes to
support partial gzip checksumming.
---
src/package.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/package.c b/src/package.c
index bb37317..6c050cf 100644
--- a/src/package.c
+++ b/src/package.c
@@ -372,7 +372,7 @@ static int read_info_entry(void *ctx, const struct apk_file_info *ae,
if (strcmp(ae->name, ".INSTALL") == 0) {
apk_warning("Package '%s-%s' contains deprecated .INSTALL",
pkg->name->name, pkg->version);
- return 1;
+ return 0;
}
} else if (strncmp(ae->name, "var/db/apk/", 11) == 0) {
/* APK 1.0 format */
@@ -407,7 +407,7 @@ static int read_info_entry(void *ctx, const struct apk_file_info *ae,
ri->has_install = 1;
} else if (ri->version == 2) {
/* All metdata of version 2.x package handled */
- return 1;
+ return 0;
} else {
/* Version 1.x packages do not contain installed size
* in metadata, so we calculate it here */
--
1.6.3.3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0_pre14
pkgrel=1
pkgrel=2
pkgdesc="Alpine Package Keeper - package manager for alpine"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
0001-io-move-csumming-away-from-bstream-to-gunzip.patch"
0001-io-move-csumming-away-from-bstream-to-gunzip.patch
0002-pkg-fix-package-scanner-to-read-whole-archive.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
......@@ -15,8 +17,10 @@ license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
patch -p1 < ../0001-io-move-csumming-away-from-bstream-to-gunzip.patch \
|| return 1
for i in ../*.patch; do
msg "Applying $i..."
patch -p1 < $i || return 1
done
make || return 1
make DESTDIR="$pkgdir" install
......@@ -30,4 +34,5 @@ build() {
}
md5sums="1a00b5fefddd652ed06bc5602e73e409 apk-tools-2.0_pre14.tar.bz2
8350b25dadf4a2574654af477e7283d2 0001-io-move-csumming-away-from-bstream-to-gunzip.patch"
8350b25dadf4a2574654af477e7283d2 0001-io-move-csumming-away-from-bstream-to-gunzip.patch
d0a6358024cb54f79d779a3c8ec4387a 0002-pkg-fix-package-scanner-to-read-whole-archive.patch"
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