From nobody Thu Sep 25 01:01:34 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 4cXFm012djz68kCv; Thu, 25 Sep 2025 01:01:36 +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 4cXFlz10Hlz3b7S; Thu, 25 Sep 2025 01:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762095; 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=3N/N+vFUKRf+tONeUHsWOBacNfi1R2FlA5GYqJe/2go=; b=boOo2G7zD6FsxN7i236E21hb5tD8tw0hh7y/D5mZsVAXgoKEWkx6jUTzQbD2fGmOBxGIiV uu5cxnnUCUs76rJu+ZXb9fMRgx0thOaWGtdyZEdBmQNRJkVrSxOLRJiiB3QKePkpj+x85y 0d/5desB0xFurMXi4QCKj5GDK2s1TqfY2dZ3R5JR/IKXW2z8EMw/6+KRCWGPPunu9KxNzY Lid5kgdGq9zXlwcx90zQ0cwAZBgA5UL827PrtF+4kNi5mMdQdcId/3ccdwVZFyXk+nBOPR 0B0rEuxA7/QzQmaJ+d4oZ0iy13ikgTLH9h+A5sYO11ubvJKjDjh456zMIIqHdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762095; 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=3N/N+vFUKRf+tONeUHsWOBacNfi1R2FlA5GYqJe/2go=; b=QKMepVi2YD+/+lPGL+Oiyt5L0uzDBzRc0yJ2plxYeGFFeQNVIGy0RV5mDuK1KeZpA4eRU3 vF0yVa7z5ypmb2nIEHo98cWtFloK6+iHZs75Hd84fAujsYaCJN5e2/Rd0opNwvEVF1mAcX hj3JzP2ul9yw/rV9CzfSl0gQKcnoBA8enydUseupEzswNNwqn2AEg1Ubb5dQjBHKzgpL8H mjHX8rPApmPCG+I96+cRAEAllOIauKlkblzXkQ0apcNPZ1c+Rm1dZk5YheDdxM7a1Kmnk1 Xml3h0QEpk6G20udCeXxo2lnlcLUcz0C2Houj18CI3dt+1+Jj99FN+vs8u3uAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762095; a=rsa-sha256; cv=none; b=PTbLSHpjRpkD5VQcxPCTC3B8dwih30zTampbjg7HtHpKWIDRsUHYxKbC4UpxdP7TTXrkBh 1zBJW5Za9e/rUxs9dOK3cFUhveR0+TieHr79YllCQxWmAU9F7NXK8r4Sz8HvdenRBxhDCH w1OM2gdTQ/JvRB54LDXk0R3lBLTBDp410UZ/KWtxbIwZC8YCMktxknwWGp6ETkKVRAk/4M R0z9XNnHGO+IqMjhU4QTHRy+S2jcm42/zVYfxraWNl3ejwXf5SmjYPjXH6kuYZxhWsUQOx 9gGNDswOyIfXB5GA51oKw/Ua3J43lhnDXR+zuH8KSPcwoRIFL+qMVfb90fPjsA== 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 4cXFlz05HDzvr5; Thu, 25 Sep 2025 01:01:35 +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 58P11Yr8086737; Thu, 25 Sep 2025 01:01:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11YvG086734; Thu, 25 Sep 2025 01:01:34 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:34 GMT Message-Id: <202509250101.58P11YvG086734@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: 9f2493321188 - stable/15 - packages: Replace libbz2 package with a bzip2 package 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: 9f2493321188f9a980fcbded1b03e58e43884afe Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2493321188f9a980fcbded1b03e58e43884afe commit 9f2493321188f9a980fcbded1b03e58e43884afe Author: Lexi Winter AuthorDate: 2025-09-23 21:37:06 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:40 +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 (cherry picked from commit 61ca69110f2676b7dd3c7ff8dea899615d341e1e) --- UPDATING | 5 +++++ 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, 31 insertions(+), 6 deletions(-) diff --git a/UPDATING b/UPDATING index 1b691f57d9a1..127540ebed39 100644 --- a/UPDATING +++ b/UPDATING @@ -23,6 +23,11 @@ and/or ports. 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. + 20250918: The MANSPLITPKG knob has been turned off by default, so pkgbase builds will no longer generate "-man" subpackages; instead the manpages will 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 = <