From nobody Tue Apr 21 15:44:26 2026 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 4g0RVf6q1mz6Wtmf for ; Tue, 21 Apr 2026 15:44:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g0RVf3wd7z3Plq for ; Tue, 21 Apr 2026 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776786266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Uyp0EASbOytx9YL/CP2tA00mFuIWpo7gALs/x2fPLE=; b=eYT4HTseS7ksfCjODiWsNoZI5YKHNiR/0RsNkwwX9moudsf4EXV9Q4WrU4Ii7SjEr1+ESn ChHXdbOTt9lUuIT9uSX/P0o62zoe5tnmfmBfcpbmtc+Z9LPXGEhH4uUohoaEc05GSpxTsA KyJVoXQVSZsTU3CRkAjKCnp2BoMj2XcigBrEhzOVrsHU/0rANotBCGNoVV4QYiO81mNTB8 KvrRJF3PK/d8ZSv6AcDtx+UyEHjU6JsTljj6oGWdS7XSYsam2Q8nqqgaaf0ZsBc7G0WpBX 0OZVb2CxYBxISyusOl37dTrtMo+gHW+KkBtKcxATZyW2/07jLHZznleVruFE1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776786266; a=rsa-sha256; cv=none; b=qIfCh1Tzp8ws8MyorM2T/8MXQOsrbCVv2FeCJoPt4dvETQpxzY2OELtFOmeT4h0JEpQcnu cVKhcXFouafMoCxvgwBvpbTLaAWDpU3h6dj6Sh4YuwoxcczVdos+hGBYUA3nlmkXjWZjtJ TdqR1YVAStFyUAhF+RmXae+wnkCwrRmwr54HHG+4FIq1x+M/6f91fIzQ3hpYinqwpTsmAR WT3CoIDnG3WfV/FU9ZfPVgPf869teNdl6ocHCV5jWgK15EoKE3vQR6zM8C+GO1H9Pom6qP hvU0p8Z3KSA6EEsX9fuR+2oDiXOW9YFEXCDR3sKE0Y/3ij+8Q5RMAB2pJbdj7A== 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=1776786266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Uyp0EASbOytx9YL/CP2tA00mFuIWpo7gALs/x2fPLE=; b=ZdBvWFe8wUv48Bz7cTS4//wW9bdwWcvdkA7+QEvPy9j6Y+6nk7LlhsxalIxdHNoqNHsy5+ lmoZG/HmMqfJCVHxpbxBdERnwfbbQZLpmJHUJyPE7tGLS24rt31VrDl0QQh7FRlMUFxWS+ 318IluVeL9yegnFUTJfkoL9ANVXxQhcYEDkziXLO2bYERiuhGjwx8LPp6qhJPxB6UadUgy W1YSJEHqMPX/Taz0UlSHJTsj2jbV1qH2QDkayChpw1VfKunnhqmMOW+M5EAkvq49qLIGrj j78Hlq21mHf9XJE7ScrSG85Rae5GWgsUKaJ7ExiTWGu7cuE4TGZzmP27hXKw9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0RVf3R8lzqQ7 for ; Tue, 21 Apr 2026 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34072 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 15:44:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lexi Winter From: Mark Johnston Subject: git: f3bbb238daa1 - releng/15.0 - packages: Fix build with libucl 0.9.3 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f3bbb238daa17cad6a5a6d562686c2e10e9768e5 Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 15:44:26 +0000 Message-Id: <69e79b5a.34072.70f1e08b@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f3bbb238daa17cad6a5a6d562686c2e10e9768e5 commit f3bbb238daa17cad6a5a6d562686c2e10e9768e5 Author: Lexi Winter AuthorDate: 2026-04-06 17:11:22 +0000 Commit: Mark Johnston CommitDate: 2026-04-15 19:02:38 +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(). Approved by: so Security: FreeBSD-EN-26:07.pkgbase 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) (cherry picked from commit 976b2ebf43094076d52e34c8dbeabae032caa6ad) --- 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.