Module Name: src
Committed By: christos
Date: Wed Oct 30 18:09:19 UTC 2024
Modified Files:
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/manhtml: mi
src/distrib/sets/lists/tests: mi
src/doc: 3RDPARTY CHANGES
src/external/bsd: Makefile
src/external/bsd/file: Makefile.inc
src/external/bsd/file/include: config.h
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/zstd/usr.bin: Makefile
src/lib: Makefile
src/tests/lib/libarchive: Makefile
Log Message:
Hook zstd to the build and enable it for libarchive and file.
To generate a diff of this commit:
cvs rdiff -u -r1.1353 -r1.1354 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.991 -r1.992 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2477 -r1.2478 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.356 -r1.357 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.451 -r1.452 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.351 -r1.352 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1788 -r1.1789 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/manhtml/mi
cvs rdiff -u -r1.1344 -r1.1345 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2058 -r1.2059 src/doc/3RDPARTY
cvs rdiff -u -r1.3109 -r1.3110 src/doc/CHANGES
cvs rdiff -u -r1.77 -r1.78 src/external/bsd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/include/config.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.17 -r1.18 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/zstd/usr.bin/Makefile
cvs rdiff -u -r1.302 -r1.303 src/lib/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tests/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1353 src/distrib/sets/lists/base/mi:1.1354
--- src/distrib/sets/lists/base/mi:1.1353 Thu Sep 12 05:43:56 2024
+++ src/distrib/sets/lists/base/mi Wed Oct 30 14:09:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1353 2024/09/12 09:43:56 riastradh Exp $
+# $NetBSD: mi,v 1.1354 2024/10/30 18:09:16 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -901,6 +901,7 @@
./usr/bin/unvis base-util-bin
./usr/bin/unxz base-util-bin
./usr/bin/unzip base-util-bin
+./usr/bin/unzstd base-util-bin
./usr/bin/uptime base-util-bin
./usr/bin/usbhidaction base-util-bin
./usr/bin/usbhidctl base-util-bin
@@ -957,6 +958,11 @@
./usr/bin/zless base-util-bin
./usr/bin/zmore base-util-bin
./usr/bin/znew base-util-bin
+./usr/bin/zstd base-util-bin
+./usr/bin/zstdcat base-util-bin
+./usr/bin/zstdgrep base-util-bin
+./usr/bin/zstdless base-util-bin
+./usr/bin/zstdmt base-util-bin
./usr/bin/ztest base-zfs-bin zfs
./usr/games base-games-usr
./usr/games/hide base-games-usr
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.991 src/distrib/sets/lists/base/shl.mi:1.992
--- src/distrib/sets/lists/base/shl.mi:1.991 Tue Sep 24 17:34:41 2024
+++ src/distrib/sets/lists/base/shl.mi Wed Oct 30 14:09:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.991 2024/09/24 21:34:41 christos Exp $
+# $NetBSD: shl.mi,v 1.992 2024/10/30 18:09:16 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -952,6 +952,9 @@
./usr/lib/libzpool.so base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0.0 base-zfs-shlib compatfile,zfs
+./usr/lib/libzstd.so base-sys-shlib compatfile
+./usr/lib/libzstd.so.0 base-sys-shlib compatfile
+./usr/lib/libzstd.so.0.0 base-sys-shlib compatfile
./usr/lib/lua/5.1/gpio.so base-obsolete obsolete
./usr/lib/lua/5.1/sqlite.so base-obsolete obsolete
./usr/lib/lua/5.1/syslog.so base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2477 src/distrib/sets/lists/comp/mi:1.2478
--- src/distrib/sets/lists/comp/mi:1.2477 Mon Oct 28 13:55:11 2024
+++ src/distrib/sets/lists/comp/mi Wed Oct 30 14:09:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2477 2024/10/28 17:55:11 nia Exp $
+# $NetBSD: mi,v 1.2478 2024/10/30 18:09:16 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3783,7 +3783,10 @@
./usr/include/wctype.h comp-c-include
./usr/include/wordexp.h comp-c-include
./usr/include/zconf.h comp-c-include
+./usr/include/zdict.h comp-c-include
./usr/include/zlib.h comp-c-include
+./usr/include/zstd.h comp-c-include
+./usr/include/zstd_errors.h comp-c-include
./usr/lib base-sys-usr compatdir
./usr/lib/clang/13.0.0/include/sanitizer/allocator_interface.h comp-cxx-include llvm
./usr/lib/clang/13.0.0/include/sanitizer/asan_interface.h comp-cxx-include llvm
@@ -4395,6 +4398,8 @@
./usr/lib/libzfs_p.a comp-zfs-proflib compatfile,zfs,profile
./usr/lib/libzpool.a comp-zfs-lib compatfile,zfs
./usr/lib/libzpool_p.a comp-zfs-proflib compatfile,zfs,profile
+./usr/lib/libzstd.a comp-c-lib compatfile
+./usr/lib/libzstd_p.a comp-c-proflib compatfile,profile
./usr/lib/pkgconfig comp-c-lib
./usr/lib/pkgconfig/atf-c++.pc comp-atf-lib atf,share
./usr/lib/pkgconfig/atf-c.pc comp-atf-lib atf,share
@@ -4409,6 +4414,7 @@
./usr/lib/pkgconfig/liblzma.pc comp-c-lib share
./usr/lib/pkgconfig/libssl.pc comp-crypto-lib share
./usr/lib/pkgconfig/libuv.pc comp-obsolete share,obsolete
+./usr/lib/pkgconfig/libzstd.pc comp-c-lib
./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share
./usr/lib/pkgconfig/openssl.pc comp-crypto-lib share
./usr/lib/pkgconfig/sqlite3.pc comp-c-lib
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.356 src/distrib/sets/lists/comp/shl.mi:1.357
--- src/distrib/sets/lists/comp/shl.mi:1.356 Tue Jul 9 09:29:02 2024
+++ src/distrib/sets/lists/comp/shl.mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.356 2024/07/09 13:29:02 rin Exp $
+# $NetBSD: shl.mi,v 1.357 2024/10/30 18:09:17 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -296,6 +296,7 @@
./usr/lib/libzfs_core_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libzfs_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libzpool_pic.a comp-zfs-piclib compatfile,picinstall,zfs
+./usr/lib/libzstd_pic.a comp-c-piclib compatfile,picinstall
./usr/libexec/liblto_plugin.so comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0 comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0.1 comp-c-bin gcc
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.451 src/distrib/sets/lists/debug/mi:1.452
--- src/distrib/sets/lists/debug/mi:1.451 Wed Oct 9 09:02:53 2024
+++ src/distrib/sets/lists/debug/mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.451 2024/10/09 13:02:53 kre Exp $
+# $NetBSD: mi,v 1.452 2024/10/30 18:09:17 christos Exp $
#
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
@@ -282,6 +282,7 @@
./usr/lib/libzfs_core_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libzfs_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libzpool_g.a comp-c-debuglib debuglib,compatfile,zfs
+./usr/lib/libzstd_g.a comp-c-debuglib debuglib,compatfile
./usr/libdata/debug/bin/cat.debug comp-util-debug debug
./usr/libdata/debug/bin/chio.debug comp-util-debug debug
./usr/libdata/debug/bin/chmod.debug comp-util-debug debug
@@ -903,6 +904,7 @@
./usr/libdata/debug/usr/bin/ypcat.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/bin/ypmatch.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/bin/ypwhich.debug comp-nis-debug yp,debug
+./usr/libdata/debug/usr/bin/zstd.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/ztest.debug comp-zfs-debug zfs,debug
./usr/libdata/debug/usr/games/adventure.debug comp-games-debug debug
./usr/libdata/debug/usr/games/arithmetic.debug comp-games-debug debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.351 src/distrib/sets/lists/debug/shl.mi:1.352
--- src/distrib/sets/lists/debug/shl.mi:1.351 Tue Sep 24 17:34:41 2024
+++ src/distrib/sets/lists/debug/shl.mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.351 2024/09/24 21:34:41 christos Exp $
+# $NetBSD: shl.mi,v 1.352 2024/10/30 18:09:17 christos Exp $
#
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/lib/libgcc_eh_g.a comp-c-debuglib debuglib,compatfile,gcc
@@ -318,6 +318,7 @@
./usr/libdata/debug/usr/lib/libzfs.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libzfs_core.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libzpool.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
+./usr/libdata/debug/usr/lib/libzstd.so.0.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/named/filter-aaaa.so.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/npf/ext_log.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
./usr/libdata/debug/usr/lib/npf/ext_normalise.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1788 src/distrib/sets/lists/man/mi:1.1789
--- src/distrib/sets/lists/man/mi:1.1788 Sun Oct 20 10:22:37 2024
+++ src/distrib/sets/lists/man/mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1788 2024/10/20 14:22:37 mlelstv Exp $
+# $NetBSD: mi,v 1.1789 2024/10/30 18:09:17 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.man man-sys-root
@@ -692,6 +692,7 @@
./usr/share/man/cat1/unvis.0 man-util-catman .cat
./usr/share/man/cat1/unxz.0 man-util-catman .cat
./usr/share/man/cat1/unzip.0 man-util-catman .cat
+./usr/share/man/cat1/unzstd.0 man-util-catman .cat
./usr/share/man/cat1/uptime.0 man-util-catman .cat
./usr/share/man/cat1/usbhidaction.0 man-util-catman .cat
./usr/share/man/cat1/usbhidctl.0 man-util-catman .cat
@@ -750,6 +751,11 @@
./usr/share/man/cat1/zless.0 man-util-catman .cat
./usr/share/man/cat1/zmore.0 man-util-catman .cat
./usr/share/man/cat1/znew.0 man-util-catman .cat
+./usr/share/man/cat1/zstd.0 man-util-catman .cat
+./usr/share/man/cat1/zstdcat.0 man-util-catman .cat
+./usr/share/man/cat1/zstdgrep.0 man-util-catman .cat
+./usr/share/man/cat1/zstdless.0 man-util-catman .cat
+./usr/share/man/cat1/zstdmt.0 man-util-catman .cat
./usr/share/man/cat1/ztest.0 man-zfs-catman zfs,.cat
./usr/share/man/cat3/atari/ahdi_buildlabel.0 man-obsolete obsolete
./usr/share/man/cat3/atari/ahdi_checklabel.0 man-obsolete obsolete
@@ -4252,6 +4258,7 @@
./usr/share/man/man1/unvis.1 man-util-man .man
./usr/share/man/man1/unxz.1 man-util-man .man
./usr/share/man/man1/unzip.1 man-util-man .man
+./usr/share/man/man1/unzstd.1 man-util-man .man
./usr/share/man/man1/uptime.1 man-util-man .man
./usr/share/man/man1/usbhidaction.1 man-util-man .man
./usr/share/man/man1/usbhidctl.1 man-util-man .man
@@ -4310,6 +4317,11 @@
./usr/share/man/man1/zless.1 man-util-man .man
./usr/share/man/man1/zmore.1 man-util-man .man
./usr/share/man/man1/znew.1 man-util-man .man
+./usr/share/man/man1/zstd.1 man-util-man .man
+./usr/share/man/man1/zstdcat.1 man-util-man .man
+./usr/share/man/man1/zstdgrep.1 man-util-man .man
+./usr/share/man/man1/zstdless.1 man-util-man .man
+./usr/share/man/man1/zstdmt.1 man-util-man .man
./usr/share/man/man1/ztest.1 man-zfs-man zfs,.man
./usr/share/man/man3/atari/ahdi_buildlabel.3 man-obsolete obsolete
./usr/share/man/man3/atari/ahdi_checklabel.3 man-obsolete obsolete
Index: src/distrib/sets/lists/manhtml/mi
diff -u src/distrib/sets/lists/manhtml/mi:1.10 src/distrib/sets/lists/manhtml/mi:1.11
--- src/distrib/sets/lists/manhtml/mi:1.10 Sun Oct 20 10:22:37 2024
+++ src/distrib/sets/lists/manhtml/mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.10 2024/10/20 14:22:37 mlelstv Exp $
+# $NetBSD: mi,v 1.11 2024/10/30 18:09:17 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -633,6 +633,7 @@
./usr/share/man/html1/unvis.html man-util-htmlman html
./usr/share/man/html1/unxz.html man-util-htmlman html
./usr/share/man/html1/unzip.html man-util-htmlman html
+./usr/share/man/html1/unzstd.html man-util-htmlman html
./usr/share/man/html1/uptime.html man-util-htmlman html
./usr/share/man/html1/usbhidaction.html man-util-htmlman html
./usr/share/man/html1/usbhidctl.html man-util-htmlman html
@@ -688,6 +689,11 @@
./usr/share/man/html1/zless.html man-util-htmlman html
./usr/share/man/html1/zmore.html man-util-htmlman html
./usr/share/man/html1/znew.html man-util-htmlman html
+./usr/share/man/html1/zstd.html man-util-htmlman html
+./usr/share/man/html1/zstdcat.html man-util-htmlman html
+./usr/share/man/html1/zstdgrep.html man-util-htmlman html
+./usr/share/man/html1/zstdless.html man-util-htmlman html
+./usr/share/man/html1/zstdmt.html man-util-htmlman html
./usr/share/man/html1/ztest.html man-zfs-htmlman zfs,html
./usr/share/man/html3/eddsa_pk_new.html man-util-htmlman html
./usr/share/man/html3/es256_pk_new.html man-util-htmlman html
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1344 src/distrib/sets/lists/tests/mi:1.1345
--- src/distrib/sets/lists/tests/mi:1.1344 Fri Oct 18 19:24:52 2024
+++ src/distrib/sets/lists/tests/mi Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1344 2024/10/18 23:24:52 christos Exp $
+# $NetBSD: mi,v 1.1345 2024/10/30 18:09:17 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2638,6 +2638,7 @@
./usr/tests/lib/libarchive/test_compat_zip_7.xps.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_compat_zip_8.zip.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_compat_zstd_1.tar.zst.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_compat_zstd_2.tar.zst.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_fuzz.cab.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_fuzz.lzh.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_fuzz_1.iso.Z.uu tests-lib-tests compattestfile,atf
@@ -2702,8 +2703,13 @@
./usr/tests/lib/libarchive/test_read_format_7zip_malformed.7z.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_7zip_malformed2.7z.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_7zip_ppmd.7z.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_7zip_solid_zstd.7z.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_7zip_symbolic_name.7z.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_7zip_win_attrib.7z.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_7zip_zstd.7z.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_7zip_zstd_arm.7z.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_7zip_zstd_bcj.7z.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_7zip_zstd_nobcj.7z.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_ar.ar.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_cab_1.cab.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_cab_2.cab.uu tests-lib-tests compattestfile,atf
@@ -2886,6 +2892,8 @@
./usr/tests/lib/libarchive/test_read_format_zip_xz_multi.zipx.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_zip_zip64a.zip.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_format_zip_zip64b.zip.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_zip_zstd.zipx.uu tests-lib-tests compattestfile,atf
+./usr/tests/lib/libarchive/test_read_format_zip_zstd_multi.zipx.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_large_splitted_rar_aa.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_large_splitted_rar_ab.uu tests-lib-tests compattestfile,atf
./usr/tests/lib/libarchive/test_read_large_splitted_rar_ac.uu tests-lib-tests compattestfile,atf
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.2058 src/doc/3RDPARTY:1.2059
--- src/doc/3RDPARTY:1.2058 Wed Oct 30 04:41:18 2024
+++ src/doc/3RDPARTY Wed Oct 30 14:09:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.2058 2024/10/30 08:41:18 kre Exp $
+# $NetBSD: 3RDPARTY,v 1.2059 2024/10/30 18:09:17 christos Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1504,6 +1504,19 @@ Notes:
Imported to src/common/dist/zlib and shared by the kernel and userland.
Remember to run cleantags
+Package: zstd
+Version: 1.5.6
+Current Vers: 1.5.6
+Maintainer: Meta
+Archive Site: https://github.com/facebook/zstd
+Home Page: https://github.com/facebook/zstd
+Date: 2024-09-22
+Mailing List:
+Responsible: christos
+License: BSD (3-clause)/GPLv2
+Location: external/bsd/zlib
+Notes:
+
Package: services, protocols
Version: 2021-04-07 (services), 2021-02-26 (protocols)
Current Vers: 2021-04-07 (services), 2021-02-26 (protocols)
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3109 src/doc/CHANGES:1.3110
--- src/doc/CHANGES:1.3109 Tue Oct 29 17:39:35 2024
+++ src/doc/CHANGES Wed Oct 30 14:09:18 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3109 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3110 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -569,4 +569,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
[skrll 20241023]
mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 2559.1.1
[christos 20241026]
+ ztd(1): import 1-5.6 [christos 20241028]
tzdata: Updated to 2024b (using 2024bgtz) [kre 20241029]
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.77 src/external/bsd/Makefile:1.78
--- src/external/bsd/Makefile:1.77 Mon Sep 23 09:00:30 2024
+++ src/external/bsd/Makefile Wed Oct 30 14:09:18 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.77 2024/09/23 13:00:30 christos Exp $
+# $NetBSD: Makefile,v 1.78 2024/10/30 18:09:18 christos Exp $
.include <bsd.own.mk>
SUBDIR= acpica am-utils bc byacc cron dhcpcd elftoolchain/common \
ekermit elftosb fetch file flex ${EXTERNAL_JEMALLOC_SUBDIR} less \
libarchive libevent libfido2 liblzf libpcap mdocml \
- ntp openresolv tcpdump tmux top tre wpa
+ ntp openresolv tcpdump tmux top tre wpa zstd
.if (${MKATF} != "no")
SUBDIR+= atf
Index: src/external/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.7 src/external/bsd/file/Makefile.inc:1.8
--- src/external/bsd/file/Makefile.inc:1.7 Tue Dec 17 13:59:39 2019
+++ src/external/bsd/file/Makefile.inc Wed Oct 30 14:09:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2019/12/17 18:59:39 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2024/10/30 18:09:18 christos Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -23,6 +23,7 @@ CPPFLAGS+= -I${.CURDIR}/../include -I${D
.PATH: ${DIST}/src ${DIST}/doc
DPLIBS+= lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib
+DPLIBS+= zstd ${NETBSDSRCDIR}/external/bsd/zstd/lib
DPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
DPLIBS+= z ${NETBSDSRCDIR}/lib/libz
Index: src/external/bsd/file/include/config.h
diff -u src/external/bsd/file/include/config.h:1.19 src/external/bsd/file/include/config.h:1.20
--- src/external/bsd/file/include/config.h:1.19 Fri Aug 18 15:00:11 2023
+++ src/external/bsd/file/include/config.h Wed Oct 30 14:09:18 2024
@@ -103,7 +103,7 @@
#define HAVE_LIBZ 1
/* Define to 1 if you have the `zstd' library (-lzstd). */
-/* #undef HAVE_LIBZSTD */
+#define HAVE_LIBZSTD 1
/* Define to 1 if you have the `localtime_r' function. */
#define HAVE_LOCALTIME_R 1
@@ -287,10 +287,10 @@
#define HAVE_ZLIB_H 1
/* Define to 1 if you have the <zstd_errors.h> header file. */
-/* #undef HAVE_ZSTD_ERRORS_H */
+#define HAVE_ZSTD_ERRORS_H 1
/* Define to 1 if you have the <zstd.h> header file. */
-/* #undef HAVE_ZSTD_H */
+#define HAVE_ZSTD_H 1
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
@@ -445,7 +445,7 @@
#define ZLIBSUPPORT 1
/* Enable zstdlib compression support */
-/* #undef ZSTDLIBSUPPORT */
+#define ZSTDLIBSUPPORT 1
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.14 src/external/bsd/libarchive/include/config_netbsd.h:1.15
--- src/external/bsd/libarchive/include/config_netbsd.h:1.14 Thu Oct 17 12:42:09 2024
+++ src/external/bsd/libarchive/include/config_netbsd.h Wed Oct 30 14:09:18 2024
@@ -699,7 +699,7 @@
/* #undef HAVE_LIBXML_XMLWRITER_H */
/* Define to 1 if you have the `zstd' library (-lzstd). */
-/* #undef HAVE_LIBZSTD */
+#define HAVE_LIBZSTD 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@@ -1255,11 +1255,11 @@
#define HAVE_ZLIB_H 1
/* Define to 1 if you have the <zstd.h> header file. */
-/* #undef HAVE_ZSTD_H */
+#define HAVE_ZSTD_H 1
/* Define to 1 if you have the `zstd' library (-lzstd) with compression
support. */
-/* #undef HAVE_ZSTD_compressStream */
+#define HAVE_ZSTD_compressStream 1
/* Define to 1 if you have the `_fseeki64' function. */
/* #undef HAVE__FSEEKI64 */
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.17 src/external/bsd/libarchive/lib/libarchive/Makefile:1.18
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.17 Sun Jun 9 15:47:56 2024
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Wed Oct 30 14:09:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/06/09 19:47:56 christos Exp $
+# $NetBSD: Makefile,v 1.18 2024/10/30 18:09:18 christos Exp $
.include <bsd.init.mk>
@@ -10,6 +10,7 @@ LIB= archive
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
+ zstd ${NETBSDSRCDIR}/external/bsd/zstd/lib \
lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
z ${NETBSDSRCDIR}/lib/libz
Index: src/external/bsd/zstd/usr.bin/Makefile
diff -u src/external/bsd/zstd/usr.bin/Makefile:1.1 src/external/bsd/zstd/usr.bin/Makefile:1.2
--- src/external/bsd/zstd/usr.bin/Makefile:1.1 Sun Oct 27 18:48:51 2024
+++ src/external/bsd/zstd/usr.bin/Makefile Wed Oct 30 14:09:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/10/27 22:48:51 christos Exp $
+# $NetBSD: Makefile,v 1.2 2024/10/30 18:09:18 christos Exp $
.include <bsd.own.mk>
@@ -26,8 +26,12 @@ LDFLAGS+=-pthread
PROGDPLIBS= zstd ${.CURDIR}/../lib
SYMLINKS+= ${BINDIR}/zstd ${BINDIR}/zstdcat
SYMLINKS+= ${BINDIR}/zstd ${BINDIR}/zstdmt
+SYMLINKS+= ${BINDIR}/zstd ${BINDIR}/unzstd
SCRIPTSDIR= /usr/bin
SCRIPTS= zstdgrep zstdless
+MAN+= zstdgrep.1 zstdless.1
+MLINKS+= zstd.1 zstdmt.1 zstd.1 zstdcat.1 zstd.1 unzstd.1
+
.include <bsd.prog.mk>
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.302 src/lib/Makefile:1.303
--- src/lib/Makefile:1.302 Mon Sep 23 09:00:46 2024
+++ src/lib/Makefile Wed Oct 30 14:09:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.302 2024/09/23 13:00:46 christos Exp $
+# $NetBSD: Makefile,v 1.303 2024/10/30 18:09:18 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -202,7 +202,8 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
SUBDIR+= ../external/apache2/llvm/librt
.endif
-SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz
+SUBDIR+= ../external/bsd/zstd/lib
+SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz, zstd
SUBDIR+= ../external/bsd/file/lib # depends on libz, libbz2, libxz
Index: src/tests/lib/libarchive/Makefile
diff -u src/tests/lib/libarchive/Makefile:1.13 src/tests/lib/libarchive/Makefile:1.14
--- src/tests/lib/libarchive/Makefile:1.13 Thu Oct 17 12:51:20 2024
+++ src/tests/lib/libarchive/Makefile Wed Oct 30 14:09:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2024/10/17 16:51:20 christos Exp $
+# $NetBSD: Makefile,v 1.14 2024/10/30 18:09:19 christos Exp $
NOMAN=
@@ -21,8 +21,6 @@ DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBB
LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
SRCS.h_libarchive= \
-test_main.c \
-test_utils.c \
read_open_memory.c \
test_acl_nfs4.c \
test_acl_pax.c \
@@ -92,6 +90,7 @@ test_filter_count.c \
test_fuzz.c \
test_gnutar_filename_encoding.c \
test_link_resolver.c \
+test_main.c \
test_open_failure.c \
test_open_fd.c \
test_open_file.c \
@@ -214,6 +213,7 @@ test_tar_filenames.c \
test_tar_large.c \
test_ustar_filename_encoding.c \
test_ustar_filenames.c \
+test_utils.c \
test_warn_missing_hardlink_target.c \
test_write_disk.c \
test_write_disk_appledouble.c \
@@ -349,6 +349,8 @@ test_compat_zip_6.zip.uu \
test_compat_zip_7.xps.uu \
test_compat_zip_8.zip.uu \
test_compat_zstd_1.tar.zst.uu \
+test_compat_zstd_1.tar.zst.uu \
+test_compat_zstd_2.tar.zst.uu \
test_fuzz.cab.uu \
test_fuzz.lzh.uu \
test_fuzz_1.iso.Z.uu \
@@ -413,8 +415,13 @@ test_read_format_7zip_lzma2_arm.7z.uu \
test_read_format_7zip_malformed.7z.uu \
test_read_format_7zip_malformed2.7z.uu \
test_read_format_7zip_ppmd.7z.uu \
+test_read_format_7zip_solid_zstd.7z.uu \
test_read_format_7zip_symbolic_name.7z.uu \
test_read_format_7zip_win_attrib.7z.uu \
+test_read_format_7zip_zstd.7z.uu \
+test_read_format_7zip_zstd_arm.7z.uu \
+test_read_format_7zip_zstd_bcj.7z.uu \
+test_read_format_7zip_zstd_nobcj.7z.uu \
test_read_format_ar.ar.uu \
test_read_format_cab_1.cab.uu \
test_read_format_cab_2.cab.uu \
@@ -597,6 +604,8 @@ test_read_format_zip_with_invalid_tradit
test_read_format_zip_xz_multi.zipx.uu \
test_read_format_zip_zip64a.zip.uu \
test_read_format_zip_zip64b.zip.uu \
+test_read_format_zip_zstd.zipx.uu \
+test_read_format_zip_zstd_multi.zipx.uu \
test_read_large_splitted_rar_aa.uu \
test_read_large_splitted_rar_ab.uu \
test_read_large_splitted_rar_ac.uu \
