The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9c401bf14854ef20e5e187395a686b0d1b7bcb5f
commit 9c401bf14854ef20e5e187395a686b0d1b7bcb5f Author: Lexi Winter <[email protected]> AuthorDate: 2026-01-06 04:23:22 +0000 Commit: Lexi Winter <[email protected]> CommitDate: 2026-01-06 04:24:59 +0000 zstd: Move to a new zstd package Zstd is a discrete, self-contained system component. To match how we package zlib, bzip2 and xz, move it to its own package, with a separate lib package. Add the new package to the minimal set, since this is a core component that users expect to be installed. This change adds a new package to the system so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. MFC after: never Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53603 --- UPDATING | 6 ++++++ lib/libzstd/Makefile | 4 +++- release/packages/ucl/zstd-all.ucl | 30 ++++++++++++++++++++++++++++++ usr.bin/zstd/Makefile | 2 ++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index ee035c3d7615..5029bf086bdd 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20260106: + Zstd has moved to the new "zstd" package. If you have set-minimal + installed, this package will be installed automatically, otherwise + you might want to install it manually. This change only affects + pkgbase users. + 20251222: Commit 9f49f436a9ec changed the internal KAPI between the NFS modules. As such, nfscommon, nfscl and nfsd must all be rebuilt diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 0e25f01d4881..4a1557a14517 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -1,3 +1,6 @@ +PACKAGE= zstd +LIB_PACKAGE= + LIB= zstd SRCS= entropy_common.c \ error_private.c \ @@ -43,7 +46,6 @@ LIBADD= pthread CFLAGS+= -DZSTD_DISABLE_ASM PRIVATELIB= yes -PACKAGE= runtime ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ diff --git a/release/packages/ucl/zstd-all.ucl b/release/packages/ucl/zstd-all.ucl new file mode 100644 index 000000000000..ada125444b68 --- /dev/null +++ b/release/packages/ucl/zstd-all.ucl @@ -0,0 +1,30 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter <[email protected]> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Fast, lossless compression algorithm" + +desc = <<EOD +Zstandard, also called zstd, is a fast data compression algorithm developed +by Meta Platforms, Inc. and standardised by the IETF in RFC 8478. Zstd is +designed to offer a compression ratio comparable to DEFLATE (zlib), but with +performance suitable for real-time compression applications. +EOD + +annotations { + set = "minimal,minimal-jail" +} diff --git a/usr.bin/zstd/Makefile b/usr.bin/zstd/Makefile index 0e73e2eb0dd2..6b8ebd8cdf3d 100644 --- a/usr.bin/zstd/Makefile +++ b/usr.bin/zstd/Makefile @@ -1,3 +1,5 @@ +PACKAGE= zstd + PROG= zstd SRCS= \ benchfn.c \
