From e920ba77694c56bf4bf23c9c6c8227a4e1b241e1 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 31 Mar 2023 03:42:30 -0500
Subject: system/lz4: Update to 1.9.4

Multi-job `make check` is now explicitly supported upstream, so we can
remove -j1.
---
 system/lz4/APKBUILD            | 13 +++++--------
 system/lz4/CVE-2021-3520.patch | 22 ----------------------
 2 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 system/lz4/CVE-2021-3520.patch

(limited to 'system/lz4')

diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD
index 591fefe3b..3911e26f4 100644
--- a/system/lz4/APKBUILD
+++ b/system/lz4/APKBUILD
@@ -1,17 +1,15 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=lz4
-pkgver=1.9.3
-pkgrel=1
+pkgver=1.9.4
+pkgrel=0
 pkgdesc="LZ4: Extremely Fast Compression algorithm"
 url="https://github.com/lz4/lz4"
 arch="all"
 license="BSD-2-Clause GPL-2.0-only"
 checkdepends="diffutils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
-	CVE-2021-3520.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
 
 case "$CARCH" in
 armhf) options="!check" ;; # FIXME
@@ -26,12 +24,11 @@ build() {
 }
 
 check() {
-	make -j1 check
+	make check
 }
 
 package() {
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 }
 
-sha512sums="c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c  lz4-1.9.3.tar.gz
-29038d80c4399ded52b49e69d0f0d80bef8bf424e3540de366ef539706c8c1119784d6137c96130f131239d74a4c110dd9790cae5c9b17c102820446582c5637  CVE-2021-3520.patch"
+sha512sums="043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684  lz4-1.9.4.tar.gz"
diff --git a/system/lz4/CVE-2021-3520.patch b/system/lz4/CVE-2021-3520.patch
deleted file mode 100644
index 053958dfe..000000000
--- a/system/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;
-- 
cgit v1.2.3-60-g2f50