From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 15 Jun 2021 14:57:03 +0100
Subject: gentoo resync : 15.06.2021

---
 app-arch/lz4/Manifest                              |  3 ++-
 .../lz4/files/lz4-1.9.3-negative-memmove.patch     | 22 +++++++++++++++
 app-arch/lz4/lz4-1.9.3-r1.ebuild                   | 31 ++++++++++++++++++++++
 app-arch/lz4/lz4-1.9.3.ebuild                      | 27 -------------------
 4 files changed, 55 insertions(+), 28 deletions(-)
 create mode 100644 app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
 create mode 100644 app-arch/lz4/lz4-1.9.3-r1.ebuild
 delete mode 100644 app-arch/lz4/lz4-1.9.3.ebuild

(limited to 'app-arch/lz4')

diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 6921e0024e1e..0954d65b2476 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,3 +1,4 @@
+AUX lz4-1.9.3-negative-memmove.patch 740 BLAKE2B 8b13944ca6236ae50e4cf6b6bc42035a5e15ce6a63b3a1bed832d0a0c189240be4b9678badd267161bf36161ac5be6083287b2343c35798675195f49d90d1e80 SHA512 29038d80c4399ded52b49e69d0f0d80bef8bf424e3540de366ef539706c8c1119784d6137c96130f131239d74a4c110dd9790cae5c9b17c102820446582c5637
 DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
-EBUILD lz4-1.9.3.ebuild 770 BLAKE2B ccec090ad61d3899c4a0ac87feb1bf7e88bc8861f50d1ec0be672c5f7b6f400b81374f524c1edf072fb4eb472fdd76b0bf6ba5a017764d2e1f0816ff00d2d4f9 SHA512 144cea4029471a28d26511608095f4cf32cefa80c0a059a2c61c50227bf4744e1fbd7adaf8460fdef8f8377c97657df4ee5bc29a7d5a1db2e1b208a22957676a
+EBUILD lz4-1.9.3-r1.ebuild 826 BLAKE2B 33dece0f1646035b5c83166185aa8b8cdb84bb26f974e9fd1164f79d22f551d49138ef8b34cc61dadf55b786d794bb2b83030d49666f7ce067d9c1f9845fda93 SHA512 8b30b7dd7472d2c0a2997593ceb911c183da801aa880d8050c78efc05dc3aae58905b3d7833c5a4d8a00f16bc52f4293477144609d6de40dc4d3e95562b0fc89
 MISC metadata.xml 488 BLAKE2B ffeed518b26856fcf19099ec33e1f9e93d302411504037c2eea791dddcb64e7fbc13b425a6797bba3386dc69810c021b32c66223dda4838bb710d5a2a86e725e SHA512 bc9e9b477dd0fbf300efd55ce4c31350fee375ded0b3f463116488fd4e66ee685b55464a46338abae47e0ee845333019dfba9ee2e459dc0dd91b640d42bd4902
diff --git a/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch b/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
new file mode 100644
index 000000000000..053958dfe872
--- /dev/null
+++ b/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch
@@ -0,0 +1,22 @@
+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;
diff --git a/app-arch/lz4/lz4-1.9.3-r1.ebuild b/app-arch/lz4/lz4-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..2282b90c9bcc
--- /dev/null
+++ b/app-arch/lz4/lz4-1.9.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r132"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/build/cmake
+
+PATCHES=(
+	"${FILESDIR}"/${P}-negative-memmove.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
deleted file mode 100644
index 02eac78fb6dd..000000000000
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r132"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/build/cmake
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3