git: 6433ec43c802 - main - contrib/libucl: Import libucl 0.9.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Jul 2026 01:51:48 UTC
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 <bofh@FreeBSD.org>
AuthorDate: 2026-07-22 01:49:53 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
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 <REF_BRANCH_TO_BE_IMPORTED>
+# $ 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 <REF_BRANCH_TO_BE_IMPORTED>"
+# $ git tag -a vendor/libucl/<REF_BRANCH_TO_BE_IMPORTED> -m "vendor import libucl <REF_BRANCH_TO_BE_IMPORTED>"
+# $ git push --follow-tags freebsd vendor/libucl/<REF_BRANCH_TO_BE_IMPORTED>
+#
+# 2. Test
+#
+# $ cd /usr/src
+# $ git checkout vendor/libucl/<REF_BRANCH_TO_BE_IMPORTED>
+# $ ./autogen.sh
+# $ ./configure
+# $ gmake
+# $ gmake check
+# $ gmake clean
+#
+# 3. Merge vendor tree
+#
+# $ git subtree merge -P contrib/libucl vendor/libucl/<REF_BRANCH_TO_BE_IMPORTED>
- # $ 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