[pkgsrc/trunk]: pkgsrc/archivers/lz4 lz4: updated to 1.9.4

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/archivers/lz4 lz4: updated to 1.9.4
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 18 Aug 2022 14:07:42 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/90349cf78574
branches:  trunk
changeset: 383257:90349cf78574
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Aug 16 13:02:56 2022 +0000

description:
lz4: updated to 1.9.4

v1.9.4:
perf : faster decoding speed (~+20%) on Apple Silicon platforms, by @zeux
perf : faster decoding speed (~+70%) for -BD4 setting in CLI
api : new function LZ4_decompress_safe_partial_usingDict() by @yawqi
api : lz4frame: ability to provide custom allocators at state creation
api : can skip checksum validation for improved decoding speed
api : new experimental unit lz4file for file i/o API, by @anjiahao1
api : new experimental function LZ4F_uncompressedUpdate(), by @alexmohr
cli : --list works on stdin input, by @Low-power
cli : --no-crc does not produce (compression) nor check (decompression) checksums
cli : fix: --test and --list produce an error code when parsing invalid input
cli : fix: support skippable frames when passed via stdin, reported by @davidmankin
build: fix: Makefile respects CFLAGS directives passed via environment variable
build: LZ4_FREESTANDING, new build macro for freestanding environments, by @t-mat
build: make and make test are compatible with -j parallel run
build: AS/400 compatibility, by @jonrumsey
build: Solaris 10 compatibility, by @pekdon
build: MSVC 2022 support, by @t-mat
build: improved meson script, by @eli-schwartz
doc : Updated LZ4 block format, provide an "implementation notes" section

diffstat:

 archivers/lz4/Makefile                        |   5 +-
 archivers/lz4/distinfo                        |  15 ++--
 archivers/lz4/patches/patch-Makefile.inc      |  10 +-
 archivers/lz4/patches/patch-lib_Makefile      |  74 +++++++++++++-------------
 archivers/lz4/patches/patch-lib_lz4.c         |  20 -------
 archivers/lz4/patches/patch-programs_Makefile |  34 ++++++------
 6 files changed, 69 insertions(+), 89 deletions(-)

diffs (254 lines):

diff -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/Makefile
--- a/archivers/lz4/Makefile    Tue Aug 16 12:46:55 2022 +0000
+++ b/archivers/lz4/Makefile    Tue Aug 16 13:02:56 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2022/07/25 11:12:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/08/16 13:02:56 adam Exp $
 
-DISTNAME=      lz4-1.9.3
-PKGREVISION=   1
+DISTNAME=      lz4-1.9.4
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lz4/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
diff -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/distinfo
--- a/archivers/lz4/distinfo    Tue Aug 16 12:46:55 2022 +0000
+++ b/archivers/lz4/distinfo    Tue Aug 16 13:02:56 2022 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 09:57:09 nia Exp $
+$NetBSD: distinfo,v 1.23 2022/08/16 13:02:56 adam Exp $
 
-BLAKE2s (lz4-1.9.3.tar.gz) = 5e5bec980cc673182dfedd9fbba6079184744c9e0ae0bf82e896c631ea7aea09
-SHA512 (lz4-1.9.3.tar.gz) = c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
-Size (lz4-1.9.3.tar.gz) = 320958 bytes
-SHA1 (patch-Makefile.inc) = 55d576430ed1a160709a56e104edc14cad88e5a9
-SHA1 (patch-lib_Makefile) = 8eda2146522bd2d5e418916fd99fb201810cb36d
-SHA1 (patch-lib_lz4.c) = 3bf75be43d585a613e56a21c1e7bdfff541371f4
-SHA1 (patch-programs_Makefile) = 671728182325f03164eb898d9d846fd2aa4353f7
+BLAKE2s (lz4-1.9.4.tar.gz) = 47eac8d4a549b2ab125e6b44d9c0acd1ed2c4d0e86054ecacc5f9704a0d4c208
+SHA512 (lz4-1.9.4.tar.gz) = 043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684
+Size (lz4-1.9.4.tar.gz) = 354063 bytes
+SHA1 (patch-Makefile.inc) = 7f27fb9d4cde9c14623c8fce167990bec0332161
+SHA1 (patch-lib_Makefile) = 64441f91217cf5832f122ed32a31007b4a8dc5f4
+SHA1 (patch-programs_Makefile) = bf3a8b296bfac8407c3e233c41fa037ba989876c
diff -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/patches/patch-Makefile.inc
--- a/archivers/lz4/patches/patch-Makefile.inc  Tue Aug 16 12:46:55 2022 +0000
+++ b/archivers/lz4/patches/patch-Makefile.inc  Tue Aug 16 13:02:56 2022 +0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-Makefile.inc,v 1.1 2019/04/30 09:17:38 adam Exp $
+$NetBSD: patch-Makefile.inc,v 1.2 2022/08/16 13:02:56 adam Exp $
 
 Unlock install target.
 
---- Makefile.inc.orig  2019-04-30 08:08:05.000000000 +0000
+--- Makefile.inc.orig  2022-08-15 22:45:31.000000000 +0000
 +++ Makefile.inc
-@@ -51,11 +51,7 @@ VOID  := /dev/null
+@@ -79,11 +79,7 @@ VOID  := /dev/null
    endif
  endif
  
--ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW% CYGWIN% MSYS%,$(shell uname)))
+-ifneq (,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD MINGW% CYGWIN% MSYS%,$(shell $(UNAME))))
  POSIX_ENV = Yes
 -else
 -POSIX_ENV = No
 -endif
  
- # Avoid symlinks when targetting Windows or building on a Windows host
+ # Avoid symlinks when targeting Windows or building on a Windows host
  ifeq ($(WINBASED),yes)
diff -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/patches/patch-lib_Makefile
--- a/archivers/lz4/patches/patch-lib_Makefile  Tue Aug 16 12:46:55 2022 +0000
+++ b/archivers/lz4/patches/patch-lib_Makefile  Tue Aug 16 13:02:56 2022 +0000
@@ -1,31 +1,31 @@
-$NetBSD: patch-lib_Makefile,v 1.10 2019/04/30 09:17:38 adam Exp $
+$NetBSD: patch-lib_Makefile,v 1.11 2022/08/16 13:02:56 adam Exp $
 
 Make portable. Unlock install target. Use pkgsrc install scripts.
 
---- lib/Makefile.orig  2019-04-23 17:18:40.000000000 +0000
+--- lib/Makefile.orig  2022-08-15 22:45:31.000000000 +0000
 +++ lib/Makefile
-@@ -33,9 +33,9 @@
- # ################################################################
+@@ -34,9 +34,9 @@
+ SED = sed
  
  # Version numbers
--LIBVER_MAJOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
--LIBVER_MINOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
--LIBVER_PATCH_SCRIPT:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_MAJOR_SCRIPT:=`$(SED) -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_MINOR_SCRIPT:=`$(SED) -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_PATCH_SCRIPT:=`$(SED) -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
 +LIBVER_MAJOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h`
 +LIBVER_MINOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h`
 +LIBVER_PATCH_SCRIPT:=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h`
  LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT)
  LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT))
  LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
-@@ -45,6 +45,7 @@ LIBVER  := $(shell echo $(LIBVER_SCRIPT)
+@@ -46,6 +46,7 @@ LIBVER  := $(shell echo $(LIBVER_SCRIPT)
  BUILD_SHARED:=yes
  BUILD_STATIC:=yes
  
 +OS ?= $(shell uname)
  CPPFLAGS+= -DXXH_NAMESPACE=LZ4_
+ CPPFLAGS+= $(MOREFLAGS)
  CFLAGS  ?= -O3
- DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-@@ -156,28 +157,23 @@ libdir      ?= $(LIBDIR)
+@@ -162,29 +163,24 @@ libdir      ?= $(LIBDIR)
  INCLUDEDIR  ?= $(prefix)/include
  includedir  ?= $(INCLUDEDIR)
  
@@ -39,47 +39,49 @@
  
  liblz4.pc: liblz4.pc.in Makefile
        @echo creating pkgconfig
--      $(Q)sed -e 's|@PREFIX@|$(prefix)|' \
+-      $(SED) -e 's|@PREFIX@|$(prefix)|' \
 -         -e 's|@LIBDIR@|$(libdir)|' \
 -         -e 's|@INCLUDEDIR@|$(includedir)|' \
 -         -e 's|@VERSION@|$(LIBVER)|' \
-+      $(Q)sed -e 's|@PREFIX@|$(prefix)|g' \
+-         -e 's|=${prefix}/|=$${prefix}/|' \
++      $(SED) -e 's|@PREFIX@|$(prefix)|g' \
 +         -e 's|@LIBDIR@|$(libdir)|g' \
 +         -e 's|@INCLUDEDIR@|$(includedir)|g' \
 +         -e 's|@VERSION@|$(LIBVER)|g' \
++         -e 's|=${prefix}/|=$${prefix}/|g' \
            $< >$@
  
  install: lib liblz4.pc
--      $(Q)$(INSTALL_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
--      $(Q)$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
-+      $(Q)$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
-+      $(Q)$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
-       @echo Installing libraries
+-      $(INSTALL_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
+-      $(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
++      $(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
+       @echo Installing libraries in $(DESTDIR)$(libdir)
    ifeq ($(BUILD_STATIC),yes)
--      $(Q)$(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
--      $(Q)$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
-+      $(Q)$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
-+      $(Q)$(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
+-      $(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
+-      $(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
++      $(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
++      $(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
    endif
    ifeq ($(BUILD_SHARED),yes)
- # Traditionnally, one installs the DLLs in the bin directory as programs
-@@ -187,15 +183,15 @@ install: lib liblz4.pc
-       $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir)
-       $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
+ # Traditionally, one installs the DLLs in the bin directory as programs
+@@ -194,15 +190,15 @@ install: lib liblz4.pc
+       $(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
      else
--      $(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
-+      $(Q)$(BSD_INSTALL_LIB) 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)
++      $(BSD_INSTALL_LIB) 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)
--      $(Q)$(INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
--      $(Q)$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
--      $(Q)$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
-+      $(Q)$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
-+      $(Q)$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
-+      $(Q)$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
+       @echo Installing headers in $(DESTDIR)$(includedir)
+-      $(INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
+-      $(INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
+-      $(INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
++      $(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h
++      $(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h
++      $(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
        @echo lz4 libraries installed
  
  uninstall:
diff -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/patches/patch-lib_lz4.c
--- a/archivers/lz4/patches/patch-lib_lz4.c     Tue Aug 16 12:46:55 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-lib_lz4.c,v 1.1 2021/08/06 05:08:50 kim Exp $
-
-Fix potential memory corruption with negative memmove() size
-Ref: https://github.com/lz4/lz4/pull/972
-
-Addresses CVE-2021-3520
-
-https://github.com/lz4/lz4/commit/7a966c1511816b53ac93aa2f2a2ff97e036a4a60.patch
-
---- lib/lz4.c
-+++ 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 -r 8d5ec12a77da -r 90349cf78574 archivers/lz4/patches/patch-programs_Makefile
--- a/archivers/lz4/patches/patch-programs_Makefile     Tue Aug 16 12:46:55 2022 +0000
+++ b/archivers/lz4/patches/patch-programs_Makefile     Tue Aug 16 13:02:56 2022 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-programs_Makefile,v 1.12 2019/04/30 09:17:39 adam Exp $
+$NetBSD: patch-programs_Makefile,v 1.13 2022/08/16 13:02:56 adam Exp $
 
 Unlock install target. Use pkgsrc install scripts.
 
---- programs/Makefile.orig     2019-04-23 17:18:40.000000000 +0000
+--- programs/Makefile.orig     2022-08-15 22:45:31.000000000 +0000
 +++ programs/Makefile
-@@ -140,20 +140,20 @@ BINDIR      ?= $(exec_prefix)/bin
+@@ -165,20 +165,20 @@ BINDIR      ?= $(exec_prefix)/bin
  bindir      ?= $(BINDIR)
  DATAROOTDIR ?= $(prefix)/share
  datarootdir ?= $(DATAROOTDIR)
@@ -15,17 +15,17 @@
  man1dir     ?= $(MAN1DIR)
  
  install: lz4
-       @echo Installing binaries
--      @$(INSTALL_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
--      @$(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
-+      @$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
-+      @$(BSD_INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
-       @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT)
-       @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT)
-       @$(LN_S) lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT)
-       @echo Installing man pages
--      @$(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
-+      @$(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
-       @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4c.1
-       @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4cat.1
-       @$(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/unlz4.1
+       @echo Installing binaries in $(DESTDIR)$(bindir)
+-      $(INSTALL_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
+-      $(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
++      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
++      $(BSD_INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
+       $(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/lz4c$(EXT)
+       $(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/lz4cat$(EXT)
+       $(LN_SF) lz4$(EXT) $(DESTDIR)$(bindir)/unlz4$(EXT)
+       @echo Installing man pages in $(DESTDIR)$(man1dir)
+-      $(INSTALL_DATA) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
++      $(BSD_INSTALL_MAN) lz4.1 $(DESTDIR)$(man1dir)/lz4.1
+       $(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4c.1
+       $(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/lz4cat.1
+       $(LN_SF) lz4.1 $(DESTDIR)$(man1dir)/unlz4.1
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/file to 5.42
Next by Date: [pkgsrc/trunk]: pkgsrc/www/php-glpi Upgrade www/php-glpi from 9.4.6 to 10.0.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/file to 5.42
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/php-glpi Upgrade www/php-glpi from 9.4.6 to 10.0.2
Indexes:
Home | Main Index | Thread Index | Old Index