aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2022-08-16 02:34:39 +0300
committerprspkt <prspkt@protonmail.com>2022-08-16 02:37:21 +0300
commit05c899b519320f707e45e749ca17b92a8f9b8802 (patch)
treea4bddf09e9e7332c2d9f782a8209206b09dacf46
parentc80900e488328ace4a53217c7092d68273109b19 (diff)
downloadaports-05c899b519320f707e45e749ca17b92a8f9b8802.tar.gz
aports-05c899b519320f707e45e749ca17b92a8f9b8802.tar.bz2
aports-05c899b519320f707e45e749ca17b92a8f9b8802.tar.xz
main/lz4: upgrade to 1.9.4
- Patch applied upstream, remove.
-rw-r--r--main/lz4/APKBUILD14
-rw-r--r--main/lz4/CVE-2021-3520.patch22
2 files changed, 5 insertions, 31 deletions
diff --git a/main/lz4/APKBUILD b/main/lz4/APKBUILD
index e7a0edc282..21bf213306 100644
--- a/main/lz4/APKBUILD
+++ b/main/lz4/APKBUILD
@@ -1,17 +1,15 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=lz4
-pkgver=1.9.3
-pkgrel=1
+pkgver=1.9.4
+pkgrel=0
pkgdesc="LZ4 is lossless compression algorithm with fast decoder @ multiple GB/s per core."
url="https://github.com/lz4/lz4"
arch="all"
license="BSD-2-Clause GPL-2.0-only"
checkdepends="diffutils"
subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-tests:tests"
-source="$pkgname-$pkgver.tar.gz::https://github.com/lz4/lz4/archive/v$pkgver.tar.gz
- CVE-2021-3520.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/lz4/lz4/archive/v$pkgver.tar.gz"
# secfixes:
# 1.9.3-r1:
@@ -24,8 +22,7 @@ build() {
}
check() {
- # https://github.com/lz4/lz4/issues/957
- make -j1 check
+ make check
}
tests() {
@@ -40,6 +37,5 @@ package() {
}
sha512sums="
-c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c lz4-1.9.3.tar.gz
-29038d80c4399ded52b49e69d0f0d80bef8bf424e3540de366ef539706c8c1119784d6137c96130f131239d74a4c110dd9790cae5c9b17c102820446582c5637 CVE-2021-3520.patch
+043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684 lz4-1.9.4.tar.gz
"
diff --git a/main/lz4/CVE-2021-3520.patch b/main/lz4/CVE-2021-3520.patch
deleted file mode 100644
index 053958dfe8..0000000000
--- a/main/lz4/CVE-2021-3520.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <j@jasper.la>
-Date: Fri, 26 Feb 2021 15:21:20 +0100
-Subject: [PATCH] Fix potential memory corruption with negative memmove() size
-
----
- lib/lz4.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/lz4.c b/lib/lz4.c
-index 5f524d01d..c2f504ef3 100644
---- a/lib/lz4.c
-+++ b/lib/lz4.c
-@@ -1749,7 +1749,7 @@ LZ4_decompress_generic(
- const size_t dictSize /* note : = 0 if noDict */
- )
- {
-- if (src == NULL) { return -1; }
-+ if ((src == NULL) || (outputSize < 0)) { return -1; }
-
- { const BYTE* ip = (const BYTE*) src;
- const BYTE* const iend = ip + srcSize;