From nobody Tue Sep 23 22:07:01 2025 X-Original-To: dev-commits-src-main@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 4cWYx215z8z681sh; Tue, 23 Sep 2025 22:07:02 +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 4cWYx15rQSz3nlT; Tue, 23 Sep 2025 22:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758665221; 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=HPcmOXSSL9//FryJGcR16w8JfrrIbzelJJNyGE/VQRE=; b=xCc0g+tr64AheaVV9eHSlm6ugngEmJsSITl8vtBTuW1Mxd3Ho5m9VoiVYwVrwZboDAxwBj qUMNh+RuwhfdtKboJ3IMB6NOoyeGlZgR72UlRnRKnfM39Xo8+yzNBtEyiH4ybIFlw9NeUC kFUhsjgbR08qPy397p9zmPNWHftGlvcGJxNZloqSqUEmloJ614rN70YQ7q9eaNIWPQ+QGg vDeMY2mVSsDN1B0R13nT7Y9iXApVtyNZCKL1KrE8HL1rRAOmpOCPhfoalI5/jgn98cdhGU tuPyePqh708c9tB2074/Q9uRo29Mjw3lu9geAHN00i4XteG5KH3JcdKZLdoZ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758665221; 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=HPcmOXSSL9//FryJGcR16w8JfrrIbzelJJNyGE/VQRE=; b=PC935KiiOvorHYmBCqw+lus5iJa963XyRJR5+OkDJlKrRKv/XzlylQtSGMnwHmxAXpuxXQ 6A88DKwqQSsXP6DUDfN0gDpKyGx4BQxTNewRyIPo3IQjQ6jZRXSpgwQNqG6Kllu100QXhM WybeQsusl0SxzoPTfU/YZ6c+Dbt5Fsvm+b2ucr1XDRZAnX2SGcuQfvu8duNG0bihUj9b1/ kMSV3dliRQCkdmPCeZ8xNzD6EaFUVZYXY2BosnpxyIsReP448QFxkGKEipE6750ah9URQx zk4LD82hsf+0ZSaJMWK34GnJG6O6BiBPd522GUkrEyph97BtcocMw37BGBT9+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758665221; a=rsa-sha256; cv=none; b=nl9P6yB5ElnSb3fecuCFJaICPbDxxM5NKUIUD4tj8AdM6bAY+OEGXFvCfWiCPhfL+eXkJR V0/pmQJSs9Ax1D42rbXhMnS2a189OSPkmhOr8SZsH/YDf10zIR7RMPNaDjI58mqedx3wbH 8oHMVUua31GhranSk1zDeqVtJ1YfuDefTtgwiFSCHPnLFtrJSCTb4cfAVQXaZwqkY8rse4 /SVwYwYniwbY6jPnqULvKuRDovA0gz+3xzvRXEn7572mKJVE4/oMOg9taALloFTWzJgGHV 9sK5FneGj8c16anzv5+1y11etpWXRojCvo6/UGZDOLRagGm/rLljkMF6TCFUzA== 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 4cWYx151k5z13X4; Tue, 23 Sep 2025 22:07:01 +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 58NM71Iw043409; Tue, 23 Sep 2025 22:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NM714e043405; Tue, 23 Sep 2025 22:07:01 GMT (envelope-from git) Date: Tue, 23 Sep 2025 22:07:01 GMT Message-Id: <202509232207.58NM714e043405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 61ca69110f26 - main - packages: Replace libbz2 package with a bzip2 package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 61ca69110f2676b7dd3c7ff8dea899615d341e1e Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=61ca69110f2676b7dd3c7ff8dea899615d341e1e commit 61ca69110f2676b7dd3c7ff8dea899615d341e1e Author: Lexi Winter AuthorDate: 2025-09-23 21:37:06 +0000 Commit: Lexi Winter CommitDate: 2025-09-23 22:06:33 +0000 packages: Replace libbz2 package with a bzip2 package Currently libbz2 is in the libbz2 package, while bzip2 itself is in -utilities, which is inconsistent. Move both the library and the utility to a new -bzip2 package, and use LIB_PACKAGE to create a separate -bzip2-lib package for runtime dependencies. Add the bzip2 package to the minimal set, and since newsyslogd uses bzip2 for logfile compression, add a dependency from there. MFC after: 1 day Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D52663 --- UPDATING | 7 +++++++ lib/libbz2/Makefile | 4 +++- release/packages/ucl/bzip2-all.ucl | 12 ++++++++++++ release/packages/ucl/libbz2-all.ucl | 5 ----- release/packages/ucl/newsyslog.ucl | 7 +++++++ usr.bin/bzip2/Makefile | 2 ++ usr.bin/bzip2recover/Makefile | 2 ++ 7 files changed, 33 insertions(+), 6 deletions(-) diff --git a/UPDATING b/UPDATING index f6412666564a..73d3eddc2941 100644 --- a/UPDATING +++ b/UPDATING @@ -38,6 +38,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: FreeBSD-pmc package. If you use these, you may want to install the package. + The libbz2 package has been renamed to bzip2, and /usr/bin/bzip2 has + been moved to the new package. If you have set-minimal installed, + the new package will be added automatically, otherwise you may want + to manually install it. + + This only affects pkgbase users. + 20250918: mandoc (including /usr/bin/man) has been moved to a new package, FreeBSD-mandoc. If you have the minimal set installed, this package diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile index f7ea21b1a085..d773f202dd67 100644 --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,4 +1,6 @@ -PACKAGE= lib${LIB} +PACKAGE= bzip2 +LIB_PACKAGE= + BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/release/packages/ucl/bzip2-all.ucl b/release/packages/ucl/bzip2-all.ucl new file mode 100644 index 000000000000..5bf1ef0c70fa --- /dev/null +++ b/release/packages/ucl/bzip2-all.ucl @@ -0,0 +1,12 @@ +comment = "A block-sorting data compressor" + +desc = <