From nobody Tue Apr 7 11:27:02 2026 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 4fqkS73fH6z6Y4Hx for ; Tue, 07 Apr 2026 11:27:03 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqkS65sXZz4Mp6 for ; Tue, 07 Apr 2026 11:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561222; 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=pb3a3J4cNF8HtvWubc6SlZzj3m1SR2ONvuzUy8SSP5A=; b=HqQxrUrO74Gz8/Lv6Qo6x8JZiguSOsQkUCc160uoT9SPFDVuJeyRpQ143X3G9OOsvlFudp 1IO138dkKUI43LK8Pg4blegOT2g1zCIwPHOrb8XOwnAqdlXbJEycU+EDBkrU/sUU4xmWVW b4NCpluun+tt3/iE0Jcxyal0iCB6K8WKpYtZAwZO0ZrWKQfrXX5i6WVpn19rzJ9JRt+vfr C74bLLbWk6x4xk1wtX3T34LUDqDrNcXIcNRxi/XIq+4ykMGDY2iKYLZGINeV0xi28IljKs slHzsQC7iuAVWJCTNBF9psJqtUyhLg0zTncuFkYjI3zlf4RskaHg8Pxh0W7mKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775561222; a=rsa-sha256; cv=none; b=Fd9rVdkVmC/UYFlpvD+lUu3cEZixRowps36L+UfWBO4brLIegeudPCLzxS95CTZNJzIFw3 /sm/KDEXNV0nqAMXRFkYlHlDlU54iHEpTldCzXNv5B6Hp4QSfA+eH0C1uo2jzcpLS1NLZb k0/KfFVIxcyXx3fZBDB0RAyc0BPKz9jZVrdeE+qfbf5mRfq6PGNWTxd2VUpSEoFDfr3ql6 3e7nh2o4WomBBbhSAE6703+zfivKicgOWhcvyAoGAHWnJLDKB95ZSHQLjoJ6JuQJgUuiZ1 rXXEYZaizdd5hY/Xs0QauAh8TDL8KSQjA+3t+dgQkNe4PgArEjj3pY3WzGdQ6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775561222; 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=pb3a3J4cNF8HtvWubc6SlZzj3m1SR2ONvuzUy8SSP5A=; b=IUhZvy174FsV8NFzZc9oJvxrKPVMfXn26tfxrPhy/D1ni6jRzRCjOb25f+10g6SqmA+K/z urTQA9I57eIGrzz0qmSVQtsuEYcSNas5b4TtNijYekI69yIm1Ra9ui7p81/mGB/6Ta88AR wYTaYGvWrQAfkq69cgKEReF3P94sq/wdrik7svDyC4eqbq3EE99OlUretFk0kFC2jWKIMU HduPIO0672KGGF8rvfNkpNTldgz59dYjmr0SwNqgKGqFDMRBT38stCzielhtzFPFy0ILp9 8xcKUNzqGMMQIOUo/hVpVMN5Ug3G3fY56foh+nTq2DbcQRcAUj4WDeCqdSdrZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqkS65NK6zf0c for ; Tue, 07 Apr 2026 11:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:27:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 976b2ebf4309 - stable/15 - packages: Fix build with libucl 0.9.3 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 976b2ebf43094076d52e34c8dbeabae032caa6ad Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:27:02 +0000 Message-Id: <69d4ea06.22b03.30cebafb@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=976b2ebf43094076d52e34c8dbeabae032caa6ad commit 976b2ebf43094076d52e34c8dbeabae032caa6ad Author: Lexi Winter AuthorDate: 2026-04-06 17:11:22 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:49:51 +0000 packages: Fix build with libucl 0.9.3 In libucl 0.9.3, macros and includes are disabled by default when creating a new UCL parser. This breaks the package build, which relies on includes. Fix this by explicitly passing zero flags to ucl.parser(). MFC after: 3 days Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3") Reviewed by: kevans, bapt Reported by: freebsd@walstatt-de.de Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56266 (cherry picked from commit 63d0e3e3aa2483420f828686336d6615616363d5) --- release/packages/generate-set-ucl.lua | 2 +- release/packages/generate-ucl.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua index 9ba7026b75df..7a1cddda7be1 100755 --- a/release/packages/generate-set-ucl.lua +++ b/release/packages/generate-set-ucl.lua @@ -16,7 +16,7 @@ substituted as UCL variables. local ucl = require("ucl") -- This parser is the output UCL we want to build. -local parser = ucl.parser() +local parser = ucl.parser(0) if #arg < 1 then io.stderr:write(arg[0] .. ": missing template filename\n") diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index 19a9a95d5d38..aaaa4375dd4d 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -124,7 +124,7 @@ local pkgprefix = nil local pkgversion = nil -- This parser is the output UCL we want to build. -local parser = ucl.parser() +local parser = ucl.parser(0) -- Set any $VARIABLES from the command line in the parser. This causes ucl to -- automatically replace them when we load the source ucl.