From nobody Thu Oct 2 08:20:56 2025 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 4ccl9j2SyYz69KZs; Thu, 02 Oct 2025 08:20:57 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccl9h5W31z4NK7; Thu, 02 Oct 2025 08:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393256; 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=51dEC1jJb1I3DOx24ZjekAJr0ti4MlR9tShmqAsiGIo=; b=p3JySHdAkUslJGHxNk6IeMj6KRM1o3kyyNQEClks84ziTsv8v/whus8bM6VXHoBk/dVZ8A BNWg5+gAZMbwtjoN7Y8LzkeGtx5d12bogp+qr5rTvPLYB+Cp6Ehdy2acCf2aKlJ1PjiLFY bAw7IEcD+snYNS1HdbxoUphwzjuFQ7GBNBwQH157KOjqxMZj7o/LFeXoy96Y9wfxWlhcbE Z6/tRxGYGMrWY58cX8HZFhgakMwp2EfzgGwPgdkFuBWvfatt5stpHWOS+w5kg2zL/jyc3b 64vjrtjRCAk3KY7gjfwLA34m5hn/KogOaLmTo6CLv88Vfyv4aLZSNdamf/5wEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393256; 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=51dEC1jJb1I3DOx24ZjekAJr0ti4MlR9tShmqAsiGIo=; b=Hwj37MYSxFVzUqsOkehDN8SRS+DNaynJhxDi9qSHyM3pxJbP+9jfzt9bGRW/jQ/VPL6DX5 dFQx8EoQhF2cIWKeDkaiD9imaKXyx9OnQ2zj0+5BK3g+Ql9liQq4D266+Cd4WYmQSsyehA fcUNGoP5H8cwl942jCCrjywgmDPrLuqMuYdtyXNvWFCYhK2vt0X5dcJcDskKmsiC8uYn8u XcbPwxn93QVVYLkYBkdCXaZNHV8hLwTLDA39ebd9dcHlH29wxM1tCYge48+/g069Ch6Hv2 bCnPPFQ7gbHIK6+f3u0onJDazpu+K/6mAnlXwXa3fI97zhFENREmc/tEG1eFqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759393256; a=rsa-sha256; cv=none; b=ubhHXDO+1tRq4e3Qsn8PTh7TexjZYz87X4U6fyra+VgO0rWBi7BjOq6EIMEWx1FBHQwm1I JtmiDojmxVjitFuR4zeEoRIVuD/inqUHTBaAEcxAaJ6kGnJiqJQOQtWAyJqHqKud6ApZZO TnSPTloUo+AY/LcOVka787yQJNGCl9pbs8fdWgjDbv9sIvNG1SjAiw2Vd6G2U1+i30BAVG e7zjnVpWwG0mc8sbq68N2WrSDX5GdjlHXAZta+OWvF3T67Ll10s77fZVb/zLvN1Kno788B kFj0UwoSTLUbErbRBeE1MrkggupKYuemf0rKtzyjSao9ea0zLl9LSgZrjpRjTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccl9h4WKYz10nw; Thu, 02 Oct 2025 08:20:56 +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 5928Kuu3023794; Thu, 2 Oct 2025 08:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5928KuOh023791; Thu, 2 Oct 2025 08:20:56 GMT (envelope-from git) Date: Thu, 2 Oct 2025 08:20:56 GMT Message-Id: <202510020820.5928KuOh023791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 817170736b8a - stable/13 - libucl: import snapshot 2024-02-06 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 817170736b8a6ab8340b2f8a193a8795d77239bf Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=817170736b8a6ab8340b2f8a193a8795d77239bf commit 817170736b8a6ab8340b2f8a193a8795d77239bf Author: Baptiste Daroussin AuthorDate: 2024-02-29 12:27:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-02 07:28:55 +0000 libucl: import snapshot 2024-02-06 (cherry picked from commit ddca081d382c7275bb6328c730182a007334c939) --- contrib/libucl/libucl.pc | 11 ++++ contrib/libucl/python/ucl.pyi | 15 +++++ .../libucl/tests/schema/definitions.json.disabled | 32 +++++++++ .../libucl/tests/schema/refRemote.json.disabled | 76 ++++++++++++++++++++++ 4 files changed, 134 insertions(+) diff --git a/contrib/libucl/libucl.pc b/contrib/libucl/libucl.pc new file mode 100644 index 000000000000..4878bebafcdd --- /dev/null +++ b/contrib/libucl/libucl.pc @@ -0,0 +1,11 @@ +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: LibUCL +Description: Universal configuration library +Version: 0.9.0 +Libs: -L${libdir} -lucl +Libs.private: +Cflags: -I${includedir}/ diff --git a/contrib/libucl/python/ucl.pyi b/contrib/libucl/python/ucl.pyi new file mode 100644 index 000000000000..79fa2901ba9f --- /dev/null +++ b/contrib/libucl/python/ucl.pyi @@ -0,0 +1,15 @@ +# Stubs for ucl (Python 3.6) +# +# NOTE: This dynamically typed stub was automatically generated by stubgen. + +UCL_EMIT_CONFIG = ... # type: int +UCL_EMIT_JSON = ... # type: int +UCL_EMIT_JSON_COMPACT = ... # type: int +UCL_EMIT_MSGPACK = ... # type: int +UCL_EMIT_YAML = ... # type: int + +def dump(*args, **kwargs): ... +def load(*args, **kwargs): ... +def validate(*args, **kwargs): ... + +class SchemaError(Exception): ... diff --git a/contrib/libucl/tests/schema/definitions.json.disabled b/contrib/libucl/tests/schema/definitions.json.disabled new file mode 100644 index 000000000000..1ab9b2163c44 --- /dev/null +++ b/contrib/libucl/tests/schema/definitions.json.disabled @@ -0,0 +1,32 @@ +[ + { + "description": "valid definition", + "schema": {"$ref": "http://highsecure.ru/ucl-schema/schema#"}, + "tests": [ + { + "description": "valid definition schema", + "data": { + "definitions": { + "foo": {"type": "integer"} + } + }, + "valid": true + } + ] + }, + { + "description": "invalid definition", + "schema": {"$ref": "http://highsecure.ru/ucl-schema/schema#"}, + "tests": [ + { + "description": "invalid definition schema", + "data": { + "definitions": { + "foo": {"type": 1} + } + }, + "valid": false + } + ] + } +] diff --git a/contrib/libucl/tests/schema/refRemote.json.disabled b/contrib/libucl/tests/schema/refRemote.json.disabled new file mode 100644 index 000000000000..067c666b0ec8 --- /dev/null +++ b/contrib/libucl/tests/schema/refRemote.json.disabled @@ -0,0 +1,76 @@ +[ + { + "description": "remote ref", + "schema": {"$ref": "http://highsecure.ru/ucl-schema/remotes/integer.json"}, + "tests": [ + { + "description": "remote ref valid", + "data": 1, + "valid": true + }, + { + "description": "remote ref invalid", + "data": "a", + "valid": false + } + ] + }, + { + "description": "fragment within remote ref", + "schema": {"$ref": "http://highsecure.ru/ucl-schema/remotes/subSchemas.json#/integer"}, + "tests": [ + { + "description": "remote fragment valid", + "data": 1, + "valid": true + }, + { + "description": "remote fragment invalid", + "data": "a", + "valid": false + } + ] + }, + { + "description": "ref within remote ref", + "schema": { + "$ref": "http://highsecure.ru/ucl-schema/remotes/subSchemas.json#/refToInteger" + }, + "tests": [ + { + "description": "ref within ref valid", + "data": 1, + "valid": true + }, + { + "description": "ref within ref invalid", + "data": "a", + "valid": false + } + ] + } +/* + { + "description": "change resolution scope", + "schema": { + "id": "http://highsecure.ru/ucl-schema/remotes/", + "items": { + "id": "folder/", + "items": {"$ref": "folderInteger.json"} + } + }, + "tests": [ + { + "description": "changed scope ref valid", + "data": [[1]], + "valid": true + }, + { + "description": "changed scope ref invalid", + "data": [["a"]], + "valid": false + } + ] + } +*/ +]