From nobody Wed Jun 25 13:46:42 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 4bS35G5jsVz603JT; Wed, 25 Jun 2025 13:46:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS35G4PlQz3FFZ; Wed, 25 Jun 2025 13:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750859202; 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=fOMFGWBlS1X26mr2ZU28KR/Vz2QQI7gUNpDc5qoERUg=; b=QZDAwMLVEGaiCGwx1pmNU4RqGWLjy7n0KcivEjm8k9uNunfkLeG/PSIj0tPVxF4sP8eISC WwLYYIXmSFwp/M+aeMra5LDpLYbbf4Y6BqRC7TzWfdqiKjUl1zyNL8r/4BkHm5ofxmOMlR MQl4fC5eCFSa/bDJnozFqtKhnONeSNu7kIr9VyU92Jvqsmk+Dzu7k0FQQU2XPG3C0K3osO 4LxAs89BRS3dx39PoR++IOxYlyMuXFnUIs60EFfWRteg9HualricGl13Lco0HBxuHhMd07 s8NMYJs6hWqAa2K6fFom7EKw05rH/1bfBGR7z5+o7IVWiweRuRd+24i3L0gUhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750859202; 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=fOMFGWBlS1X26mr2ZU28KR/Vz2QQI7gUNpDc5qoERUg=; b=WLKyKFGH0aKV1Z1EKXG+Swt0S8R2s+A3sTQN6MJvxMlvp7fT2oVZxAm4S4NygdIj2VsQze nWpE0KalFJOWYdy+h8gv1WPLZPQWRFM8rtdc/tNGS1B8YUL9bBadRONIfQN1RKoniSmvyw 4smPoZ0XyNPDVSwsjj4yvhuqIcdbMvndHVCPBqDOZyzkG3OpNaacLf4AOG/YXz/dJHhO/H 1TA/wNgJT53q8Ex/rUmztzmXFfd3KwE3+qf6hKWEyhk1ZIK5OfQC1L3LiFecwlIkTt64hC nCEwvddivccNgJ02QCoZJf0kQj78ofDp1QkKfPxKRnVCtHidi1gHSUTnqiC+EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750859202; a=rsa-sha256; cv=none; b=Uom7hhUXkqAgmCLjVqcM14tpTOVizDlg3kwaAv7+8misxXiN5ADjPABFRJdq20aAkeCjXq 5QuG/jQVbmwOUqaM8PpFm+ptOoboLEn0d1P7kwnyos7lVIE7RYZzIOdsCBPHoVdZr21rJC e5EMx/XRJnXDMKNSyPAybOju5BKHd2xOlyHcidheel8pl+SqfA+jpjP0TiPh2ITdLSR5t3 XyCZvxxD0LjLzosiM7/MZMlePoCgCmrNjghkv+9J7A2wjZuCKUf+4cOsd9KwZRyG1f2mcV O8v3ZO6lxOh+StltQintLIzWIkDeJrBLPaSw/2Gvsa5e+xlOhiaE2TFCVpmmJQ== 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 4bS35G3zN4z4jJ; Wed, 25 Jun 2025 13:46:42 +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 55PDkgew065307; Wed, 25 Jun 2025 13:46:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PDkgQi065304; Wed, 25 Jun 2025 13:46:42 GMT (envelope-from git) Date: Wed, 25 Jun 2025 13:46:42 GMT Message-Id: <202506251346.55PDkgQi065304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: df84bd484cb8 - main - release: Sort keys in generate-ucl.lua 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df84bd484cb813fc5ab76c81ac2c35fdd78c8235 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=df84bd484cb813fc5ab76c81ac2c35fdd78c8235 commit df84bd484cb813fc5ab76c81ac2c35fdd78c8235 Author: Mark Johnston AuthorDate: 2025-06-25 12:57:26 +0000 Commit: Mark Johnston CommitDate: 2025-06-25 13:46:31 +0000 release: Sort keys in generate-ucl.lua When writing out the UCL file containing a package's metadata, metadata values consisting of key-value pairs were not sorted. For instance, in the certctl package we could have either "deps": { "FreeBSD-openssl": { ... }, "FreeBSD-caroot": { ... }, } or "deps": { "FreeBSD-caroot": { ... }, "FreeBSD-openssl": { ... }, } This breaks reproducibility. Use the undocumented third parameter to libucl's to_format() to request recursive sorting of keys. Reviewed by: manu, bapt MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51021 --- release/packages/generate-ucl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index de52802913f8..ae6ee58dd84a 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -31,5 +31,5 @@ if not f then os.exit(1) end local obj = parser:get_object() -f:write(ucl.to_format(obj, 'ucl')) +f:write(ucl.to_format(obj, 'ucl', true)) f:close()