[gentoo-commits] repo/gentoo:master commit in: app-arch/lz4/, app-arch/lz4/files/

[gentoo-commits] repo/gentoo:master commit in: app-arch/lz4/, app-arch/lz4/files/

[Michał Górny]

commit:     f063d9e1dcac596d0a15fab50c8d89c4d8a9d0e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 11:34:45 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 11:42:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f063d9e1

app-arch/lz4: Backport memory corruption fix (CVE-2021-3520)

Bug: https://bugs.gentoo.org/791952
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../lz4/files/lz4-1.9.3-negative-memmove.patch     | 22 ++++++++++++++++++++++
 .../lz4/{lz4-1.9.3.ebuild => lz4-1.9.3-r1.ebuild}  |  4 ++++
 2 files changed, 26 insertions(+)

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 00000000000..053958dfe87
--- /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.ebuild b/app-arch/lz4/lz4-1.9.3-r1.ebuild
similarity index 93%
rename from app-arch/lz4/lz4-1.9.3.ebuild
rename to app-arch/lz4/lz4-1.9.3-r1.ebuild
index 02eac78fb6d..2282b90c9bc 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3-r1.ebuild
@@ -18,6 +18,10 @@ 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)

[gentoo-commits] repo/gentoo:master commit in: app-arch/lz4/, app-arch/lz4/files/

[Michał Górny]

commit:     c95df977cbb4d26802beb376b1004659593e53b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 10:04:42 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 10:04:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95df977

app-arch/lz4: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-arch/lz4/Manifest                              |  1 -
 .../lz4/files/lz4-1.9.3-negative-memmove.patch     | 22 ----------------
 app-arch/lz4/lz4-1.9.3-r1.ebuild                   | 30 ----------------------
 3 files changed, 53 deletions(-)

diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 835409a3a225..dfd1e824e657 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,2 +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

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
deleted file mode 100644
index 053958dfe872..000000000000
--- a/app-arch/lz4/files/lz4-1.9.3-negative-memmove.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;

diff --git a/app-arch/lz4/lz4-1.9.3-r1.ebuild b/app-arch/lz4/lz4-1.9.3-r1.ebuild
deleted file mode 100644
index b2070d474c30..000000000000
--- a/app-arch/lz4/lz4-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~loong ~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
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/lz4/, app-arch/lz4/files/

[Fabian Groffen]

commit:     e496d625bae691cc79b5b1c9f8c301a17c5cd46f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 06:54:19 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 06:55:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e496d625

app-arch/lz4-1.10.0-r1: add upstream approved patch for meson build

Disable forced C99 compiler mode, for it breaks on certain setups.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../files/1.10.0-meson-do-not-force-c99-mode.patch | 44 ++++++++++++++++++++++
 app-arch/lz4/lz4-1.10.0-r1.ebuild                  |  1 +
 2 files changed, 45 insertions(+)

diff --git a/app-arch/lz4/files/1.10.0-meson-do-not-force-c99-mode.patch b/app-arch/lz4/files/1.10.0-meson-do-not-force-c99-mode.patch
new file mode 100644
index 000000000000..0d056b98833a
--- /dev/null
+++ b/app-arch/lz4/files/1.10.0-meson-do-not-force-c99-mode.patch
@@ -0,0 +1,44 @@
+https://github.com/lz4/lz4/pull/1485
+
+From bce6a94c25a9077fdcd7c94079a24f9713b192e1 Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Tue, 30 Jul 2024 21:50:06 +0200
+Subject: [PATCH] meson: do not force c99 mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On Solaris/OpenIndiana hosts forcing (old) C99 means disabling POSIX
+2001 functionality, resulting in errors like
+
+In file included from ../../../net/ptah/export/gentoo/working-repos/lz4/programs/bench.c:39:
+../../../net/ptah/export/gentoo/working-repos/lz4/programs/util.h: In function  UTIL_getOpenFileSize’:
+../../../net/ptah/export/gentoo/working-repos/lz4/programs/util.h:156:23: error: implicit declaration of function ‘fileno’ [-Wimplicit-function-declaration]
+  156 | #  define UTIL_fileno fileno
+      |                       ^~~~~~
+../../../net/ptah/export/gentoo/working-repos/lz4/programs/util.h:325:10: note: in expansion of macro ‘UTIL_fileno’
+  325 |     fd = UTIL_fileno(file);
+      |          ^~~~~~~~~~~
+
+These can be fixed either by forcing a standard to be applied in programs/platform.h or by not forcing the compiler to use an old standard.
+
+Since CMake and Makefile don't force C99 by default either, just drop it from
+meson.build.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+---
+ build/meson/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build/meson/meson.build b/build/meson/meson.build
+index fc6408af6..7e1696802 100644
+--- a/build/meson/meson.build
++++ b/build/meson/meson.build
+@@ -16,7 +16,6 @@ project(
+   'c',
+   license: 'BSD-2-Clause-Patent AND GPL-2.0-or-later',
+   default_options: [
+-    'c_std=c99',
+     'buildtype=release',
+     'warning_level=3'
+   ],

diff --git a/app-arch/lz4/lz4-1.10.0-r1.ebuild b/app-arch/lz4/lz4-1.10.0-r1.ebuild
index 7cbc02aadc78..c2b55ff90609 100644
--- a/app-arch/lz4/lz4-1.10.0-r1.ebuild
+++ b/app-arch/lz4/lz4-1.10.0-r1.ebuild
@@ -19,6 +19,7 @@ EMESON_SOURCE=${S}/build/meson
 
 PATCHES=(
 	"${FILESDIR}/${PV}-fix-freestanding-test.patch"
+	"${FILESDIR}/${PV}-meson-do-not-force-c99-mode.patch"
 )
 
 multilib_src_configure() {