<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2d2ba7875d221d0be204113786e3f675a66d4f11">https://github.com/macports/macports-ports/commit/2d2ba7875d221d0be204113786e3f675a66d4f11</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2d2ba7875d221d0be204113786e3f675a66d4f11
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 18 23:43:53 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> lz4: Update to 1.9.4
</span>---
archivers/lz4/Portfile | 17 ++++++++---------
archivers/lz4/files/CVE-2021-3520.patch | 20 --------------------
archivers/lz4/files/gen_manual.patch | 8 ++++----
3 files changed, 12 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/Portfile b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22738bf9641..e8f7b684177 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,15 @@ PortGroup github 1.0
</span> PortGroup muniversal 1.0
PortGroup clang_dependency 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lz4 lz4 1.9.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lz4 lz4 1.9.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ffdb34223ccd0516278a9fcc494d89d51a196e1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 354063
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories archivers
maintainers {ryandesign @ryandesign} openmaintainer
license BSD GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description Extremely Fast Compression algorithm
long_description LZ4 is a very fast lossless compression algorithm, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +24,9 @@ long_description LZ4 is a very fast lossless compression algorithm, \
</span> systems.
homepage http://www.lz4.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eb4044b51231dbcbc00b804f524a909a38cefc36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fbc4711bbad8b61eaa716acba0cde14afa1301fe06dd8f2abb268f3763370c98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 321018
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles gen_manual.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVE-2021-3520.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles gen_manual.patch
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/files/CVE-2021-3520.patch b/archivers/lz4/files/CVE-2021-3520.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cfc3090ec9f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lz4/files/CVE-2021-3520.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jasper Lievisse Adriaanse <j@jasper.la>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 26 Feb 2021 15:21:20 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix potential memory corruption with negative memmove() size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/lz4.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/lz4.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/lz4.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1665,7 +1665,7 @@ LZ4_decompress_generic(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const size_t dictSize /* note : = 0 if noDict */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (src == NULL) { return -1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((src == NULL) || (outputSize < 0)) { return -1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { const BYTE* ip = (const BYTE*) src;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const BYTE* const iend = ip + srcSize;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/files/gen_manual.patch b/archivers/lz4/files/gen_manual.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c0261beb45e..195af5d9e38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lz4/files/gen_manual.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lz4/files/gen_manual.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> Don't use -arch flags when building gen_manual. It will be run on the
build machine so it needs to be built for the build machine's arch.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- contrib/gen_manual/Makefile.orig 2020-11-15 22:59:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ contrib/gen_manual/Makefile 2021-01-12 00:24:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- contrib/gen_manual/Makefile.orig 2022-08-15 17:45:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ contrib/gen_manual/Makefile 2022-08-18 23:40:55.000000000 -0500
</span> @@ -34,6 +34,7 @@
CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS += $(MOREFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS = $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
</span> +FLAGS := $(filter-out -arch^%,$(subst -arch ,-arch^,$(FLAGS)))
LZ4API = ../../lib/lz4.h
</pre><pre style='margin:0'>
</pre>