mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 15:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-arch/lz4: Sync with Gentoo

Browse Source 
It's from Gentoo commit c23ff2a84ab7587f81fc236bd8b5413766d47e57.
This commit is contained in:
Krzesimir Nowak 2023-12-07 16:31:34 +01:00
parent df0ae0b62e
commit c665d24d0e
4 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/portage-stable/app-arch/lz4/Manifest vendored
View File

@ -1 +1 @@
DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c DIST lz4-1.9.4.tar.gz 354063 BLAKE2B 2289cdce36acd35283bf2f02ef4d6d8f4805563be6d5a3492f3d6ea7975fb6bd14e1ac2e505df9747776edf8bcf0da7ba4ae7084b150e3ec08a52a9885f92ad5 SHA512 043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684

22
sdk_container/src/third_party/portage-stable/app-arch/lz4/files/lz4-1.9.3-negative-memmove.patch vendored
View File

@ -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;

11
sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.3-r1.ebuild → sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.9.4.ebuild vendored
View File

@ -1,9 +1,8 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
CMAKE_ECLASS=cmake
inherit cmake-multilib inherit cmake-multilib
DESCRIPTION="Extremely Fast Compression algorithm" DESCRIPTION="Extremely Fast Compression algorithm"
@ -13,15 +12,11 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2 GPL-2" LICENSE="BSD-2 GPL-2"
# https://abi-laboratory.pro/tracker/timeline/lz4/ # https://abi-laboratory.pro/tracker/timeline/lz4/
SLOT="0/r132" 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" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="static-libs" IUSE="static-libs"
CMAKE_USE_DIR=${S}/build/cmake CMAKE_USE_DIR=${S}/build/cmake
PATCHES=(
"${FILESDIR}"/${P}-negative-memmove.patch
)
multilib_src_configure() { multilib_src_configure() {
local mycmakeargs=( local mycmakeargs=(
-DBUILD_STATIC_LIBS=$(usex static-libs) -DBUILD_STATIC_LIBS=$(usex static-libs)

2
sdk_container/src/third_party/portage-stable/app-arch/lz4/metadata.xml vendored
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<maintainer type="person"> <maintainer type="person">
<email>mgorny@gentoo.org</email> <email>mgorny@gentoo.org</email>