From nobody Thu Oct 30 16:15:34 2025 X-Original-To: dev-commits-src-branches@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 4cy8NR2mVzz6FCNc; Thu, 30 Oct 2025 16:15:35 +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 4cy8NR0RqRz3x0r; Thu, 30 Oct 2025 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840935; 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=ikXXEvPFNs1FXJ9IRxRJIUi22G3pl0ukY2mbNGhv2qA=; b=bRJdd30yiGbKsJdRVtse4r2M8zA4Ypp+76ymyXv3SADnJZ12X996oKb32X+mKmr2NmZ8vD QSInWm4WfVW5GscZrMG3FxvfQGiYFVtDJvjZbEQuDhpVvS4dqcm0Ssni+R9V6YjL7VtE9i lLax4ZP3zmx1svsBRdzDcbvMwV26i20gS11FcPcMzzYh+CMtN4F68lN96xqEZDBj3ihAR5 82mara1lJSHtS4g0z+PowRf49thxz6xytjtZKgfOR/KZC+r8NSZowz38dQYUxs5UbG0E9w g5kQaOSYWTFnJST/h0+pM2WuPNAdebMEdFByciEDig2/mhYfaM0/eUp3xH2wkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761840935; 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=ikXXEvPFNs1FXJ9IRxRJIUi22G3pl0ukY2mbNGhv2qA=; b=lNa+PO2jy0vSBA95akXRDOZRcEhpYw4SZDYRbYXEpM8jSf/p69HcwlVWJGmLW1L2QbJHZA 5wM9NjUy7wUjg1wtJ3a2JcD37Ue0tBxw6RIwN7V0OVzp7v6Qnzn/PiOA60j6a4HbbfsCgY 3lcC3N+Nz3pa8uneME+9sgvZWpu2CyYRwURvd0F+cc5XodOB3Ub7rHsLYmr5eZyvU09xKY R+Wx5Jt1otLGhgjzo38K1dkXw1zvLRw4j6WDuohzjjy3qynMckuRMKMRJ+v28wUQlLrGnl 1nYmRlxu0Dc3eYyzMNEigwDnM3oe7GL9AuuuLbbzUYNbJG2b0zCbaLkIT+ltTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761840935; a=rsa-sha256; cv=none; b=vovv92srW9ZYkyQm79geNwNbWbOmGllX0fiqDaFlqR6R0jSZcVFCOa9+EoRd1iHo13fVfx YBpQYJ7rOidyJ+RzGtd56mfkjAZHSjx+qP/SS29W40l6eO7HIgWuKHJQbBxHEiGBIOzuUP yLMFRdkvFSIi23sD4A3qNwbdY9pq0mjPLozO4704aDGSS9veooYlfRewl6V6RY7UXV+Odg KAYSb159dHLxQsqcFtb+hc+jLzFWkFBRWGsQohXSq4vZJXs6vFwz9xojvFjEt98DoQnww6 gj4Xr8pOMKKl0ccwY7uzokwU4kIZxYp4Lpz8qJV4+pl/WUn6KffO0aWINRzhNA== 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 4cy8NQ74SVzTqm; Thu, 30 Oct 2025 16:15:34 +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 59UGFYXr023235; Thu, 30 Oct 2025 16:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UGFYgh023232; Thu, 30 Oct 2025 16:15:34 GMT (envelope-from git) Date: Thu, 30 Oct 2025 16:15:34 GMT Message-Id: <202510301615.59UGFYgh023232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ac849c0a1e5d - releng/15.0 - flua: Move to a new flua package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ac849c0a1e5d5dadf4e168029e2dfb58d788f91e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac849c0a1e5d5dadf4e168029e2dfb58d788f91e commit ac849c0a1e5d5dadf4e168029e2dfb58d788f91e Author: Lexi Winter AuthorDate: 2025-10-25 17:21:37 +0000 Commit: Colin Percival CommitDate: 2025-10-30 16:15:09 +0000 flua: Move to a new flua package flua is a standalone third-party component that deserves its own package. In particular, this means things can use flua without having to depend on FreeBSD-utilities, which will be useful as more base utilities use flua. This saves ~500kB in FreeBSD-utilities for systems which don't need flua. Approved by: re (cperciva) MFC after: 3 days Reviewed by: kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53161 (cherry picked from commit 957715f877b57a17545ead94d27ea8fd3ff4932a) (cherry picked from commit e4ef33391705db53568b69f44a54a6f2b86fb5ed) --- UPDATING | 6 ++++++ libexec/flua/Makefile | 2 ++ libexec/flua/Makefile.inc | 2 ++ release/packages/ucl/bsdinstall.ucl | 5 +++++ release/packages/ucl/flua-all.ucl | 32 ++++++++++++++++++++++++++++++++ release/packages/ucl/nuageinit-all.ucl | 7 +++++++ release/packages/ucl/tests.ucl | 27 +++++++++++++++++++++++++++ 7 files changed, 81 insertions(+) diff --git a/UPDATING b/UPDATING index 67bcbe9d5cd9..0d6ccdf8ea56 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. +20251030: + flua(1) has moved to the new FreeBSD-flua package. If you use flua, + you may want to install this package if it's not otherwise installed + as a dependency of something else. This change only affects pkgbase + users. + 20251023: Bump __FreeBSD_version to 1500068 for LinuxKPI. An embedded struct has changed size and might possibly be an issue otherwise. diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 86d27c0653d4..0b870817331c 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= flua + SUBDIR+= libfreebsd SUBDIR+= libhash SUBDIR+= libjail diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc index 34505d54d7df..0ccb1a62f4cb 100644 --- a/libexec/flua/Makefile.inc +++ b/libexec/flua/Makefile.inc @@ -1,3 +1,5 @@ +PACKAGE= flua + SHLIBDIR?= ${LIBDIR}/flua CFLAGS+= \ diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl index 7fe8898b9427..96ff220bfb54 100644 --- a/release/packages/ucl/bsdinstall.ucl +++ b/release/packages/ucl/bsdinstall.ucl @@ -21,4 +21,9 @@ deps { "runtime" { version = "${VERSION}" }, + + # the pkgbase script requires flua + "flua" { + version = "${VERSION}" + }, } diff --git a/release/packages/ucl/flua-all.ucl b/release/packages/ucl/flua-all.ucl new file mode 100644 index 000000000000..7488e2e36839 --- /dev/null +++ b/release/packages/ucl/flua-all.ucl @@ -0,0 +1,32 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * 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 = "Private Lua implementation" + +desc = < + * + * 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. + */ + + +deps { + # Quite a few tests require flua. + "flua" { + version = "${VERSION}" + }, +} + +