aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLexi Winter <ivy@FreeBSD.org>2026-01-06 04:23:22 +0000
committerLexi Winter <ivy@FreeBSD.org>2026-04-07 10:57:28 +0000
commit8c61751d078e433ceaee7161716a7e77eb38f14b (patch)
treec9d1789b68f0aac946cd6a45b06b0e2a3924582c
parent976b2ebf43094076d52e34c8dbeabae032caa6ad (diff)
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. [stable/15: MFC under the re@ pkgbase policy for 15.1] MFC after: never Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53603 (cherry picked from commit 9c401bf14854ef20e5e187395a686b0d1b7bcb5f)
-rw-r--r--UPDATING6
-rw-r--r--lib/libzstd/Makefile4
-rw-r--r--release/packages/ucl/zstd-all.ucl30
-rw-r--r--usr.bin/zstd/Makefile2
4 files changed, 41 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index ae28504cdfd3..749f59a30101 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,12 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20260407:
+ 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.
+
20251123:
Commit f27afc476551 changed the internal KAPI between the NFS
modules. As such. all must be recompiled from sources.
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 <ivy@FreeBSD.org>
+ *
+ * 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 \