CVS commit: pkgsrc/archivers/zstd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov  9 15:54:57 UTC 2026

Modified Files:
        pkgsrc/archivers/zstd: distinfo
        pkgsrc/archivers/zstd/patches:
            patch-lib_decompress_huf__decompress__amd64.S
Added Files:
        pkgsrc/archivers/zstd/patches:
            patch-lib_decompress_huf__decompress__amd64.S.orig
            patch-programs_fileio.c patch-programs_fileio.c.orig

Log Message:
zstd: fix build with lz4 1.11.

>From upstream bug report.

https://github.com/meta/zstd/issues/4897

regen patch while here.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/archivers/zstd/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S.orig \
    pkgsrc/archivers/zstd/patches/patch-programs_fileio.c \
    pkgsrc/archivers/zstd/patches/patch-programs_fileio.c.orig

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/zstd/distinfo
diff -u pkgsrc/archivers/zstd/distinfo:1.38 pkgsrc/archivers/zstd/distinfo:1.39
--- pkgsrc/archivers/zstd/distinfo:1.38 Thu Feb 20 08:10:34 2025
+++ pkgsrc/archivers/zstd/distinfo      Mon Nov  9 15:54:56 2026
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.38 2025/02/20 08:10:34 adam Exp $
+$NetBSD: distinfo,v 1.39 2026/11/09 15:54:56 wiz Exp $
 
 BLAKE2s (zstd-1.5.7.tar.gz) = eb293ab7578d2ce89a6b7de7c0aa57146d8005091e6e6f39c5eacb3a8d080431
 SHA512 (zstd-1.5.7.tar.gz) = 26e441267305f6e58080460f96ab98645219a90d290a533410b1b0b1d2f870721c95f8384e342ee647c5e968385a5b7e30c2d04340c37f59b3e6d86762c3260c
 Size (zstd-1.5.7.tar.gz) = 2451884 bytes
 SHA1 (patch-Makefile) = 191425fc04c43161710c3bb03f34047e2827b327
 SHA1 (patch-lib_Makefile) = 22ce3c9d44e230777075de29cc9f6d2cf110e027
-SHA1 (patch-lib_decompress_huf__decompress__amd64.S) = 199d101b3ff03248c24aac662f7948820bf8e2b8
+SHA1 (patch-lib_decompress_huf__decompress__amd64.S) = c611ff04f2123118a4381867e4d6bf570f4b5a28
+SHA1 (patch-programs_fileio.c) = 6c6aac2a2d223069eeaedec3ab2f803c022edf88
 SHA1 (patch-tests_Makefile) = b4aa7bd0bf1b3e7df231a32dadc6cce4ab78ac9e
 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec

Index: pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S
diff -u pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S:1.3 pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S:1.4
--- pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S:1.3     Thu Feb 20 08:10:34 2025
+++ pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S Mon Nov  9 15:54:56 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_decompress_huf__decompress__amd64.S,v 1.3 2025/02/20 08:10:34 adam Exp $
+$NetBSD: patch-lib_decompress_huf__decompress__amd64.S,v 1.4 2026/11/09 15:54:56 wiz Exp $
 
 Move the stack marking stuff inside the ifdef, as it doesn't necessarily
 work on non-amd64.
@@ -13,12 +13,12 @@ work on non-amd64.
  #if defined(__ELF__) && defined(__GNUC__)
  /* Stack marking
   * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
-@@ -38,8 +39,6 @@
- 
+@@ -37,8 +38,6 @@
  #endif
  
--#if ZSTD_ENABLE_ASM_X86_64_BMI2
+ #endif
 -
+-#if ZSTD_ENABLE_ASM_X86_64_BMI2
+ 
  /* Calling convention:
   *
-  * %rdi (or %rcx on Windows) contains the first argument: HUF_DecompressAsmArgs*.

Added files:

Index: pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S.orig
diff -u /dev/null pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S.orig:1.1
--- /dev/null   Mon Nov  9 15:54:57 2026
+++ pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S.orig    Mon Nov  9 15:54:57 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_decompress_huf__decompress__amd64.S.orig,v 1.1 2026/11/09 15:54:57 wiz Exp $
+
+Move the stack marking stuff inside the ifdef, as it doesn't necessarily
+work on non-amd64.
+
+--- lib/decompress/huf_decompress_amd64.S.orig 2025-02-19 00:04:24.000000000 +0000
++++ lib/decompress/huf_decompress_amd64.S
+@@ -10,6 +10,7 @@
+ 
+ #include "../common/portability_macros.h"
+ 
++#if ZSTD_ENABLE_ASM_X86_64_BMI2
+ #if defined(__ELF__) && defined(__GNUC__)
+ /* Stack marking
+  * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
+@@ -38,8 +39,6 @@
+ 
+ #endif
+ 
+-#if ZSTD_ENABLE_ASM_X86_64_BMI2
+-
+ /* Calling convention:
+  *
+  * %rdi (or %rcx on Windows) contains the first argument: HUF_DecompressAsmArgs*.
Index: pkgsrc/archivers/zstd/patches/patch-programs_fileio.c
diff -u /dev/null pkgsrc/archivers/zstd/patches/patch-programs_fileio.c:1.1
--- /dev/null   Mon Nov  9 15:54:57 2026
+++ pkgsrc/archivers/zstd/patches/patch-programs_fileio.c       Mon Nov  9 15:54:57 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-programs_fileio.c,v 1.1 2026/11/09 15:54:57 wiz Exp $
+
+Compatibility with lz4 1.11.0.
+https://github.com/meta/zstd/issues/4897
+
+--- programs/fileio.c.orig     2026-11-09 15:52:03.790967007 +0000
++++ programs/fileio.c
+@@ -65,7 +65,6 @@ UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
+ 
+ #define LZ4_MAGICNUMBER 0x184D2204
+ #if defined(ZSTD_LZ4COMPRESS) || defined(ZSTD_LZ4DECOMPRESS)
+-#  define LZ4F_ENABLE_OBSOLETE_ENUMS
+ #  include <lz4frame.h>
+ #  include <lz4.h>
+ #endif
+@@ -1389,6 +1388,7 @@ FIO_compressLzmaFrame(cRess_t* ress,
+ 
+ #if LZ4_VERSION_NUMBER <= 10600
+ #define LZ4F_blockLinked blockLinked
++#define LZ4F_contentChecksum_t contentChecksum_t
+ #define LZ4F_max64KB max64KB
+ #endif
+ 
+@@ -1421,7 +1421,7 @@ FIO_compressLz4Frame(cRess_t* ress,
+     prefs.compressionLevel = compressionLevel;
+     prefs.frameInfo.blockMode = LZ4F_blockLinked;
+     prefs.frameInfo.blockSizeID = LZ4F_max64KB;
+-    prefs.frameInfo.contentChecksumFlag = (contentChecksum_t)checksumFlag;
++    prefs.frameInfo.contentChecksumFlag = (LZ4F_contentChecksum_t)checksumFlag;
+ #if LZ4_VERSION_NUMBER >= 10600
+     prefs.frameInfo.contentSize = (srcFileSize==UTIL_FILESIZE_UNKNOWN) ? 0 : srcFileSize;
+ #endif