From nobody Wed Jul 22 01:51:48 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 4h4cgZ2N63z6lLVX for ; Wed, 22 Jul 2026 01:51:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4cgZ1tbSz3cK5 for ; Wed, 22 Jul 2026 01:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784685114; 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=qyc7OYVy7aBXjSned35HCJFnWkmivMuEvKiXeQ3L3bs=; b=pOb8lGN0gGWW1mkP6EyWa7o6PTmJQDBFzVdnWikiimCSriWi0MhiDyONmBI7OgT8SV6Aze fFqsDpub+h/QYOcAv9CvAuDAAmwZCKafGrrCLiFo8nZDWr8Pivf7Jurk2MCS4eBieGU7ow qUZhYDdPXlvuv5Npc5r4JkohhiqgbaHTpjShOcmQkOQEaXjA+iqK6DHw1CJ8wciU+Wauoi 7DeSjokQTwMSXiwqvEw1+RMCFCtXhz5Eiud3EH5imAsD6ACcCyuZrpjmsCGnOv/pXuNJF5 WWN6mSCouldxLdUyDJSr+EgEiO3Nfn71rhDg+zom5oKQlYM+j4btrS4dBqTTCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784685114; a=rsa-sha256; cv=none; b=rn6LfrdgWCfFduyrtbdbau+3oxZJLcrPJO+GEHL4cVctwvirLIIF/gGMBjH8XwZ69orFuZ 9Di3xDJSINtyv362ni3rlLXOun1xvKTloZqpqPYmvZAKnw3zSYFWCW6L6rMS9Q8q3uY56Y FifYelVegEVlfai9Sr3vMz2vbZL1E0LhxYeUFmDAC4/tpUNoBjUfNCBg0SqWUYa2C/EVKB Obn6pzsUUSJ/oMnCd8ie729FQi3TaEAJEUODZvxJOAWA23P9qqzGTyJyREoUP8Sq+b8177 lfzIyrDaCbdpgpgpDP9Nd/59BYi8LC0x+XIUETp4eAqidN2XW02wSE4MifbkMw== 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=1784685114; 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=qyc7OYVy7aBXjSned35HCJFnWkmivMuEvKiXeQ3L3bs=; b=IXhrcAC7es3VOb7TYoioJeJJJj6WKnrB3FwRPzd34wD2C3BVebWfEiNpngVeU0va+bdkL5 4k7JfAKRMZHh6Dw/NxdCSgNtZLfWZ2Drma34pqgQ46xH+N8Sa9vV+JqT34rlwMEH4JArCW Z1U11tvzXAby0DmgLVSEbgM9aUYh8OStPSTq+KXuL6yH5pxXPCbwkCNT3NPT4wuU2uYKfz G6pBzSfpi5fe1vDga9S61zBxz3Wprj0+fZVdcmFEuSEUb6dJBPlL/FIu5jVirf46UcUFL9 tlYgNuEGyZlx7JnTjESxn6jQmfuwUYQxQHiiU0OTQSCv+ddD4xE7LcqxgVFWRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4cgZ0yfCz1D7R for ; Wed, 22 Jul 2026 01:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Jul 2026 01:51:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6433ec43c802 - main - contrib/libucl: Import libucl 0.9.4 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6433ec43c802d56ef615b44c435f8dd229d55695 Auto-Submitted: auto-generated Date: Wed, 22 Jul 2026 01:51:48 +0000 Message-Id: <6a602234.1f0fb.442dc904@gitrepo.freebsd.org> The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=6433ec43c802d56ef615b44c435f8dd229d55695 commit 6433ec43c802d56ef615b44c435f8dd229d55695 Merge: 5001af647b3b d7ea4aaa3e20 Author: Muhammad Moinur Rahman AuthorDate: 2026-07-22 01:49:53 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2026-07-22 01:49:53 +0000 contrib/libucl: Import libucl 0.9.4 Differential Revision: https://reviews.freebsd.org/D58333 Approved by: ivy MFC after: 3 days Changelog: https://github.com/vstakhov/libucl/releases/tag/0.9.4 contrib/libucl/FREEBSD-Xlist | 1 + contrib/libucl/FREEBSD-upgrade | 2 +- contrib/libucl/include/ucl.h | 23 +++++++++++++++++++++++ contrib/libucl/src/ucl_emitter.c | 12 +++++++++--- contrib/libucl/src/ucl_hash.c | 11 +++++++++++ contrib/libucl/src/ucl_hash.h | 6 ++++++ contrib/libucl/src/ucl_util.c | 31 +++++++++++++++++++++++++++---- contrib/libucl/tests/CMakeLists.txt | 12 ++++++++---- contrib/libucl/tests/basic/issue312.in | 4 ++++ contrib/libucl/tests/basic/issue312.res | 13 +++++++++++++ 10 files changed, 103 insertions(+), 12 deletions(-) diff --cc contrib/libucl/FREEBSD-Xlist index 6d8cb4ff8f5b,000000000000..ae8e77059488 mode 100644,000000..100644 --- a/contrib/libucl/FREEBSD-Xlist +++ b/contrib/libucl/FREEBSD-Xlist @@@ -1,40 -1,0 +1,41 @@@ +.github +.gitignore ++CLAUDE.md +CMakeLists.txt +ChangeLog.md +Makefile.am +Makefile.unix +Makefile.w32 +README.md +autogen.sh +configure.ac +doc/Makefile.am +doc/api.md +doc/lua_api.md +doc/pandoc.template +examples/ucl_cpp.cc +haskell/hucl.hs +libucl.pc.in +lua/Makefile.am +lua/libucl.rockspec.in +m4/.gitignore +m4/ax_lua.m4 +m4/gcov.m4 +python/MANIFEST.in +python/setup.py +python/src/uclmodule.c +python/tests/__init__.py +python/tests/compat.py +python/tests/test_dump.py +python/tests/test_example.py +python/tests/test_load.py +python/tests/test_validation.py +python/ucl.pyi +src/Makefile.am +stamp-h.in +tests/Makefile.am +utils/CMakeLists.txt +utils/Makefile.am +utils/chargen.c +utils/objdump.c +utils/ucl-tool.c diff --cc contrib/libucl/FREEBSD-upgrade index b80736d7877b,000000000000..6305899797f7 mode 100644,000000..100644 --- a/contrib/libucl/FREEBSD-upgrade +++ b/contrib/libucl/FREEBSD-upgrade @@@ -1,39 -1,0 +1,39 @@@ +# FreeBSD libucl import instruction +# +# At least the following ports are required when importing libucl: +# - devel/autoconf +# - devel/automake +# - devel/git +# - devel/gmake +# - devel/libtool +# +# 1. Vendor import +# +# $ git clone https://github.com/vstakhov/libucl.git /tmp/libucl +# $ cd /tmp/libucl +# $ git checkout +# $ cd /usr/src +# $ git checkout vendor/libucl +# $ rsync -va --delete --exclude=.git /tmp/libucl/ /usr/src/contrib/libucl/ +# $ git add . +# $ git commit -m "vendor import libucl " +# $ git tag -a vendor/libucl/ -m "vendor import libucl " +# $ git push --follow-tags freebsd vendor/libucl/ +# +# 2. Test +# +# $ cd /usr/src +# $ git checkout vendor/libucl/ +# $ ./autogen.sh +# $ ./configure +# $ gmake +# $ gmake check +# $ gmake clean +# +# 3. Merge vendor tree +# +# $ git subtree merge -P contrib/libucl vendor/libucl/ - # $ sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' ++# $ sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do git rm -rf ./$F ; done' +# +# Recheck if there were any new files were added which are not necessary in the +# contrib tree. If so, remove them and also add them to the FREEBSD-Xlist file. diff --cc contrib/libucl/tests/basic/issue312.in index 000000000000,ec46cbe804da..ec46cbe804da mode 000000,100644..100644 --- a/contrib/libucl/tests/basic/issue312.in +++ b/contrib/libucl/tests/basic/issue312.in diff --cc contrib/libucl/tests/basic/issue312.res index 000000000000,739174f9f230..739174f9f230 mode 000000,100644..100644 --- a/contrib/libucl/tests/basic/issue312.res +++ b/contrib/libucl/tests/basic/issue312.res