From nobody Wed Oct 01 12:36:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ccDtp2pWGz69XTJ; Wed, 01 Oct 2025 12:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccDtn5wygz3mTZ; Wed, 01 Oct 2025 12:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7r3jflXmnX1kuLYWH/Pj8kJn6wfgnD+wgnOp7FKbS8=; b=G3J/3d0Auwtw0Qc46PbQaBm2/Eyc6roRAqyNHkBTVZxriC4BiMzljsY0/DWjqOf0MXSPSB CE6Jnvt6j99U+MIQ6Jjc7p8ELdEeh4gCfsfbxEWB7po+u/ZuLrxt7J978DNkikWyyHepvO Cg/wD3qaaDa4OOgdbyisxHqTZ6mBgf26wOrCvKq3fgFA/mlftV6CKqPSth3rfWPvz0w+Wc YTcQfq8gSquRnYghM5ogD/dJZf8uYFV3wv4YK3/fRjQo9TYx9zvTZH0GN36O+7R8mIxZMz E9vwIMf3uWgW1W0nEKfnW+Y4z5UTnrTowhT+vV2EY1s6aLjCJqm8X+HwlW9kdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7r3jflXmnX1kuLYWH/Pj8kJn6wfgnD+wgnOp7FKbS8=; b=gorn9y7kob/qoD81JjOUviZaunpq+vHURMLWGFsNEh1bAETPZKhsSdOBCj9QYZ8f5BnvRt 4F353zrtAQViS0QBjCN3CRVE6OR7AoXw4mJsYSj3QrFp+j6jOF8ljTnBaZ80KIcMYQLRui 6RpvJgY9E0dj7zgIqtML0eAB3ciicDZWlUT/gTBqrFOKR5zY/O1mu1+kEmxbM4HlucTHl7 q4Aeb/mxU06ohrlP42n3UwDqSfg1wgs38IAa8bhogwD/SXhLs90dygiy3uSCPS+YUuNl7o BuzixeuX0M7xC9iky8uMXbrKOT5TMX7d4+/QxZQ1xJAC5jZgaH3lwuVB31n7rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759322178; a=rsa-sha256; cv=none; b=ANxq8ni8W3ZhmiMHn+X/BgUNXqEh/X8fnPNLC8oizlrg1pL5R/pS4B7OodNjba+ToERIRT h2E8t1ODrRyHDuekzpY2xgiaO0pLaNpSREVEG2oLiDYTdJ2Z15tsMQRs8L/uif5QcUShfC F6H8Br87SXA14FtsF0FnLEpknHCOVzFe3omN4x62vCJaJ77+WlEXPzsolRiYLMWKyXLcIb 4gySE9XTPumABt16UPmpaDoa1yZQdRASAcAfrqrqe4FLonwaVVcLwvnhn30qGjKi1m+HHT pvp0m+XUtzpMONAIkAzioHVDsM1H4a/p48vFV0L+hZB0AKrjK1VOdWK8k817hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ccDtn5SPvz76D; Wed, 01 Oct 2025 12:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 591CaHf3057798; Wed, 1 Oct 2025 12:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591CaHpC057795; Wed, 1 Oct 2025 12:36:17 GMT (envelope-from git) Date: Wed, 1 Oct 2025 12:36:17 GMT Message-Id: <202510011236.591CaHpC057795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: b580906afa66 - stable/15 - packages: Rename liblzma package to xz List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b580906afa6611cdc8a22132ce05d9910dabaf48 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b580906afa6611cdc8a22132ce05d9910dabaf48 commit b580906afa6611cdc8a22132ce05d9910dabaf48 Author: Lexi Winter AuthorDate: 2025-09-30 08:11:55 +0000 Commit: Lexi Winter CommitDate: 2025-10-01 10:36:15 +0000 packages: Rename liblzma package to xz Rename liblzma to xz, and use LIB_PACKAGE to create an xz-lib package for runtime libraries. MFC after: 1 day Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52791 (cherry picked from commit 9124ace751eb9c856c50c3698cf93ede45a9897d) --- lib/liblzma/Makefile | 4 +++- release/packages/ucl/{liblzma-all.ucl => xz-all.ucl} | 7 ++++--- usr.bin/lzmainfo/Makefile | 2 ++ usr.bin/xz/Makefile | 2 ++ usr.bin/xzdec/Makefile | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index 27e0521f5884..9c6ece74ffd0 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -1,4 +1,6 @@ -PACKAGE=lib${LIB} +PACKAGE= xz +LIB_PACKAGE= + LIB= lzma LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma diff --git a/release/packages/ucl/liblzma-all.ucl b/release/packages/ucl/xz-all.ucl similarity index 78% rename from release/packages/ucl/liblzma-all.ucl rename to release/packages/ucl/xz-all.ucl index d5698d48332a..16da8b76f0ac 100644 --- a/release/packages/ucl/liblzma-all.ucl +++ b/release/packages/ucl/xz-all.ucl @@ -16,11 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -comment = "XZ LZMA library" +comment = "LZMA2 data compression" desc = < +PACKAGE=xz + PROG= xz LINKS= ${BINDIR}/xz ${BINDIR}/unxz diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile index 7c43b2e03d78..6bf3dc07a408 100644 --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -1,3 +1,5 @@ +PACKAGE=xz + PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec