From nobody Thu Apr 2 21:43: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 4fmwN50nnTz6YpSs for ; Thu, 02 Apr 2026 21:43:49 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmwN46q1tz3w47 for ; Thu, 02 Apr 2026 21:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775166229; 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=dv/yaMElX3XfpShf13AZTIGkbj2SqObxXTmVYcsAJy8=; b=ufvSCNkHkWSkzkykF1uUXP6yJxWasaeTWSnwKeUSxmnzv5ZSBxHWm2iuqNI8QkTfBJCoAa wH05sMCSSJdMOt+zv3MKSiVelGddGYq/rjR0DHNaby9hyep2X64wxIRmml+APuZeEhiueM HdQ8//YtNbLmp8mA1QyxvPdYLA0cK1Z5/adebpW4dGqnJxnI1MunBZoQbFUG4XHRzWhJkH nGTpT2pekf2In6GTbf5NEhwzUaDDMHDGn+Jvwj6UwCicQ/nebmGeKf07wmDYajNuQVLs6d pHwlbmHXnZbVp8Un+Jo8SvoKyO2KgvCAkO71Jkd14N8V8OWwxJXTsIeRfAU9ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775166229; a=rsa-sha256; cv=none; b=PgO4v2h1MExBG0k20iQ9HZqmeMPX7Lc3OGqnbMW/ICicEtiLfU0pUNuzzoxw38gLEVXDvD hUl1SO+WpIrV8fnNqVDM6TopYgv0mAUblv4C8SNNTIlWfUUbbHJbNf/uNxpIDxCigtnVPZ nDfrMIGaT2iNwlOIfOWdf1JXpYsJdmQVwcc1vLTyYpMxRNiunztXhVLO3Wt1Zf9mJJcY9o M0fyD5fxCyARDSQLV5Vy3tqDbin0z1k7iOyMDoS0Rt81i06yK1CmEFT17V315xvctawkGm ZzhRRSYTxo9Xrgvhubs4viPvNi5xwSkx+VWRacjdGehVRifuwRa5RR/OTNmoYg== 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=1775166229; 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=dv/yaMElX3XfpShf13AZTIGkbj2SqObxXTmVYcsAJy8=; b=aDm0ipEdK2X31yndyBAn7fGZGA2Bp3QtisZATVq2cUSigh4DYAf1HAn5KerZKl1jd+6T6Y TkKBh9nmjeNuKn29O+TNsuXaAfpbX+uG69lyMo2cG7kaKBaB6ZxWvpJHyyWueGrjD/pKWb oJhW2ud8KIxiWG66am1PuRI0int0nzozBmfysxB6FQEFU/ycsZ3JUDLTQ3r9lSJjNoaSqC tdKVjPj6fiPfDyESyd3p7fXQMcCEu3TULPzaDDwhUESpF9t0X/NtTzmGNSw7aH6CFqODKK 4ZQQK3V6cgfCL4SH0M+D0g4ks3g7VaKF2qi4L5AHo3chFaL4PSd0QRl9OdVpQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmwN46PqDz3xX for ; Thu, 02 Apr 2026 21:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 21:43:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d7259292ae0b - main - release: Restore licenses for kyua and ncurses 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/main X-Git-Reftype: branch X-Git-Commit: d7259292ae0b9c2aef4bdc1b8bd62674c38f7ad4 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 21:43:48 +0000 Message-Id: <69cee314.40d03.6bc9abf2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d7259292ae0b9c2aef4bdc1b8bd62674c38f7ad4 commit d7259292ae0b9c2aef4bdc1b8bd62674c38f7ad4 Author: Dag-Erling Smørgrav AuthorDate: 2026-04-02 21:42:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 21:42:47 +0000 release: Restore licenses for kyua and ncurses These were modified to avoid triggering a libucl bug which is now fixed. MFC after: 1 week Reviewed by: ivy, kevans Differential Revision: https://reviews.freebsd.org/D52824 --- release/packages/ucl/kyua-all.ucl | 60 +++++++++++++++++------------------- release/packages/ucl/ncurses-all.ucl | 26 ++++++++++++++-- 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/release/packages/ucl/kyua-all.ucl b/release/packages/ucl/kyua-all.ucl index 2b38efc30d96..f273b7c133de 100644 --- a/release/packages/ucl/kyua-all.ucl +++ b/release/packages/ucl/kyua-all.ucl @@ -1,35 +1,33 @@ /* - NB: Using the normal block comment style here triggers a UCL parsing bug. - - SPDX-License-Identifier: BSD-3-Clause - - Copyright 2011 The Kyua Authors. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright 2011 The Kyua Authors. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Google Inc. nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ comment = "Testing framework for infrastructure software" diff --git a/release/packages/ucl/ncurses-all.ucl b/release/packages/ucl/ncurses-all.ucl index 3963eb98aa72..007ab15084f3 100644 --- a/release/packages/ucl/ncurses-all.ucl +++ b/release/packages/ucl/ncurses-all.ucl @@ -1,10 +1,32 @@ /* + * SPDX-License-Identifier: X11 + * * Copyright 2018-2023,2024 Thomas E. Dickey * Copyright 1998-2017,2018 Free Software Foundation, Inc. * - * SPDX-License-Identifier: X11 + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, distribute with modifications, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * See contrib/ncurses/COPYING for the full license text. + * Except as contained in this notice, the name(s) of the above copyright + * holders shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization. */ comment = "ncurses terminal control library"