From nobody Wed Mar 27 08:26:40 2024 X-Original-To: dev-commits-src-branches@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 4V4KX047b7z5Gj6J; Wed, 27 Mar 2024 08:26:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V4KX03fnGz4DXS; Wed, 27 Mar 2024 08:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711528000; 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=MVaqqRS8f9WAVL0e1NFouVY66qHzwpfl8+r2eauFP4A=; b=pdwk5O+C6oYktN0YxqLO7WiXjR5cup3gawoLEjD7XmbQ4E5o0MabRDf5cBjWwK92kraWRi T2tr5f0KXP5ZOTjQytC9hwQ/3eicWM6egF1/aN/McwQB2q01xyFqeuO56c83ORjHkPCd5M 6zf7igy6m3+O810IfdwISHKHBerWoFiAaEgCWumfTskINK2bWFx/HULaRIi/ATqlkWa1Dh vcxwmuuIw5LbVB6OQFngwUGX+wDSGfpRmbhGaAo3tI56n/hmz2meI6/QGcYtvlTrpxp/SZ dLDSHN0Bk9Dkq44tP63AqRp5fepdB4f8+7158rOE5F7qAyuoxt7B6yGx9T6AGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711528000; a=rsa-sha256; cv=none; b=f0hu9pPtZICEpB1ozWeFWvrfHyJCZTkzTEacIhjBEWHFSPfYjorc9POizDo3CIUYNOxxD1 jPAlykvrIBRkBj7BpN6VDX4eYwKCRV4vFhcPvfmwRhIPhCucqCeqRAtakXqH/a5C27cdnX stL2h0xBmTFa/p5KVzhPsVQyB/8IS+Yn9dTPJcjIS4vL+YLuRp5Ipteb6bDsO/EPD1TU3M ORu/fL5d5B+RJyTTRjle4ROkK5L8nxoyzPua66Rn+Wn9cTwiVNrALrsq2ojp+BTDZt1Ula RX4i3WMKG8Ca1IHWYJ7Y3aP71ebXK3qL/szT7S4OZNFIASNt2QoX1sFcVpyA/Q== 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=1711528000; 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=MVaqqRS8f9WAVL0e1NFouVY66qHzwpfl8+r2eauFP4A=; b=UI9smyFfb8W1yrD0OkbUTfsANUVqU9L2uDwfaqbHrgEIxoujAJHyYvV2CAXptdBw5vUUDL jZwDGzabfsN3MAgjmHWYO6Bq8CU+n7Hjjky/WtO3z7RaBpqz2oU6RaOBdKw/qRLEVyvTiK bRAiwPrjy9wldCX9dIehYvu8DO24kbLrGRQK+2vuYLMAAhglAZXvL81+j4UT+wVjg9SIh3 sWF1CdhTwwPt70YSRcssKlAm4A4YVuu3o/o+fFIs8OMjB6uL1ubDoKSEVjmAHfLxuXrm4M GtVt3dDK+onvjxrdvrRJMmacIlfBuQMnHH9LPIPhsdwCxs7x9nWnup/oPEHSCw== 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 4V4KX03G6GzcFX; Wed, 27 Mar 2024 08:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42R8QecQ096080; Wed, 27 Mar 2024 08:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42R8Qeh8096077; Wed, 27 Mar 2024 08:26:40 GMT (envelope-from git) Date: Wed, 27 Mar 2024 08:26:40 GMT Message-Id: <202403270826.42R8Qeh8096077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ad8c850830f3 - stable/14 - libucl: import snapshot 2024-02-06 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad8c850830f3b8044ec162c30420509764ba21a1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ad8c850830f3b8044ec162c30420509764ba21a1 commit ad8c850830f3b8044ec162c30420509764ba21a1 Author: Baptiste Daroussin AuthorDate: 2024-02-29 12:27:03 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-27 08:18:47 +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 + } + ] + } +*/ +]