aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2022-02-14 20:32:06 +0200
committerTimo Teräs <timo.teras@iki.fi>2022-02-14 20:32:06 +0200
commit6a528d0bdbd1dc3aac4c1ec1f6c841765bc6ae75 (patch)
treed68c22e58958293134144cec26f3af9329d3dda1
parent11fc59c760dc207f6bfb001abbc835974667feab (diff)
downloadaports-6a528d0bdbd1dc3aac4c1ec1f6c841765bc6ae75.tar.gz
aports-6a528d0bdbd1dc3aac4c1ec1f6c841765bc6ae75.tar.bz2
aports-6a528d0bdbd1dc3aac4c1ec1f6c841765bc6ae75.tar.xz
main/apk-tools: backport fix for long lines in index
ref #13523
-rw-r--r--main/apk-tools/0001-io-Handle-really-long-lines.patch38
-rw-r--r--main/apk-tools/APKBUILD7
2 files changed, 43 insertions, 2 deletions
diff --git a/main/apk-tools/0001-io-Handle-really-long-lines.patch b/main/apk-tools/0001-io-Handle-really-long-lines.patch
new file mode 100644
index 0000000000..0ae4c7c26c
--- /dev/null
+++ b/main/apk-tools/0001-io-Handle-really-long-lines.patch
@@ -0,0 +1,38 @@
+From 9d71b61c5ca8222fba170fd5f7c5be18e0cde322 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl <oliver@schinagl.nl>
+Date: Tue, 19 Jan 2021 20:32:07 +0100
+Subject: [PATCH] io: Handle really long lines
+
+While commit 18b0b45 (io: Handle long lines, Thu Jan 7 17:25:23 2021
++0100) did attempt to address this issue, the buffer really is still to
+small when dealing with big-big dependency lists.
+
+Lets make it sufficiently large for now, until the new APKINDEX format
+can support multi-line dependencies, making this not needed any more.
+
+[TT: Originally the buffer size was conservative to run on resource
+constrained embedded platforms. But since the available memory on those
+has also increased much, the adjustment to 128kB makes sense also to
+increase performance a little bit. Backported to 2.10-stable.]
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+---
+ src/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/io.c b/src/io.c
+index 47f34bf..414e4e2 100644
+--- a/src/io.c
++++ b/src/io.c
+@@ -213,7 +213,7 @@ struct apk_istream_bstream {
+ struct apk_bstream bs;
+ struct apk_istream *is;
+ apk_blob_t left;
+- char buffer[8*1024];
++ char buffer[128*1024];
+ };
+
+ static void is_bs_get_meta(struct apk_bstream *bs, struct apk_file_meta *meta)
+--
+2.35.1
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 38a43ff33f..f94a07c215 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.10.8
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
arch="all"
url="https://gitlab.alpinelinux.org/alpine/apk-tools"
@@ -14,7 +14,9 @@ if [ "$CBUILD" = "$CHOST" ]; then
subpackages="$subpackages lua5.3-apk:luaapk"
makedepends="$makedepends lua5.3-dev"
fi
-source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
+source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
+ 0001-io-Handle-really-long-lines.patch
+ "
builddir="$srcdir/$pkgname-v$pkgver"
# secfixes:
@@ -85,4 +87,5 @@ luaapk() {
sha512sums="
865772688b93343361d82847e3fc0846a52062304c2370e8da5c5a86a23ce37edf44b213174c85b27f1c392b0ac4851e0b8b44e90fc371412458e0b9321a82e1 apk-tools-v2.10.8.tar.gz
+03165e0efe3da78d67f1539a0e97e566d4c4366a4bbae38c2b6caa6a98c081e109e10aae1be57e4bce47a7147501ceccf43990a3fc6aa6be58a95b407ef2b13b 0001-io-Handle-really-long-lines.patch
"