LZ4 1.9.4 is a maintenance release, featuring minor fixes and
improvements. The stable portion of liblz4 API is unmodified, making
this release a drop-in replacement for existing features. Changelog can
be found at https://github.com/lz4/lz4/releases/tag/v1.9.4.
Minor of liblz4 has been bumped as a new symbol has been added.
All tests pass on amd64.
Comments/OK?
diff --git Makefile Makefile
index 0787b060a3d..a4fa93efab8 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@ COMMENT= fast BSD-licensed data compression
GH_ACCOUNT= lz4
GH_PROJECT= lz4
-GH_TAGNAME= v1.9.3
-REVISION= 0
+GH_TAGNAME= v1.9.4
-SHARED_LIBS= lz4 3.1
+SHARED_LIBS= lz4 3.2
CATEGORIES= archivers
diff --git distinfo distinfo
index 139e2f3b18d..f59c77f2113 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (lz4-1.9.3.tar.gz) = AwZE30YRAH/33JYtmB85A2HmyXo05cvDk9374Bn/4sE=
-SIZE (lz4-1.9.3.tar.gz) = 320958
+SHA256 (lz4-1.9.4.tar.gz) = Cw46oHyMBj3fQLCCvffjehVivaQKD/UnKVfz6Yfg5Us=
+SIZE (lz4-1.9.4.tar.gz) = 354063
diff --git patches/patch-lib_Makefile patches/patch-lib_Makefile
index c96f55f7b42..5bb75ad82bf 100644
--- patches/patch-lib_Makefile
+++ patches/patch-lib_Makefile
@@ -1,12 +1,12 @@
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -187,8 +187,6 @@ install: lib liblz4.pc
- $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
+@@ -195,8 +195,6 @@ install: lib liblz4.pc
+ $(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
else
- $(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
-- $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
-- $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
+ $(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
+- $(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
+- $(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
endif
endif
- @echo Installing headers in $(includedir)
+ @echo Installing headers in $(DESTDIR)$(includedir)
diff --git patches/patch-lib_lz4_c patches/patch-lib_lz4_c
deleted file mode 100644
index a158428bb43..00000000000
--- patches/patch-lib_lz4_c
+++ /dev/null
@@ -1,14 +0,0 @@
-CVE-2021-3520
-
-Index: lib/lz4.c
---- lib/lz4.c.orig
-+++ 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;
