From nobody Thu Apr 30 15:04:16 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 4g5yB901J9z6c4GF for ; Thu, 30 Apr 2026 15:04:17 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5yB84gDRz41CT for ; Thu, 30 Apr 2026 15:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777561456; 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=YP3wH9Q7hv3tK/oyeg0JdZGZIgXoqHZjk+UfNK0bUuA=; b=B5e+0VodkjQUywysYHqWtLHT7hh7ZyxAA6G2GjIFat7xPQ9XCVH4ussLDqO9q6sKg2X9FX rAIckKaG46odDhK0CsKJSc1tDmp7GgQghdPibi1t+ojyf+ELU1Zu4B89gAheO4yX5MjTcB aS/GRd1rphIMfcrykSZcSmE/pDlMcpq4VHClyXgfpHdGPRPD2zvOnimLbKIjSPV6nDw9Cn E+8+82Bk5Gkra8vV1Ync3eqf0366mW7yuqMRnxKk5a3pCHf4sndvrePS/O1mfedp8pzcex ubfe6tsaJmBs19QjcH+8omS2hgHI692ET3n1RxFH77KsHtOMWe7/lrF9jEMwwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777561456; a=rsa-sha256; cv=none; b=MIDKisB4I7K1WMh8DyJZ2PIHJXfQLeQnkRh3beLMyAR6IWGr3gZjyJhTIkz4SG7A/AlHO/ K5MYoD6kQ/JyvvAORHqcWt7kqLw03EiQzWCdJoozVu37TIbPAjM//2GdP/IWMBDQsgAOIf j1eA8cvaDfu33HUiXmEKOlXzHH17MZsVCL5SvJYYMl6DnKFrLRy8I2DPvFep2js3n8xrIs vfcv+RmB5bjaETVJoGvV8CeE5qUcaCHTDX13QN16W+tkrqsoqJmXDY7P0TR5LooqbqwsxR oRfq9hhhaZnNN84uCojhv9v2IR1gsJWNg8SuzXqu7h/S+DnHufW7m8/Ex2Cpdg== 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=1777561456; 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=YP3wH9Q7hv3tK/oyeg0JdZGZIgXoqHZjk+UfNK0bUuA=; b=VkBOVXfkQWJR73VXYsITMBUVV5FWBI0e4iMsQWW7HSZAxh8Xmsnt0c7ayFrYfwCrDvM+go Ok2W72HbUMQ5fpzcTugCpPxonZmAC7Ps3bE9Ebacz8yk9gEXcMNJYjjlKkcGBKC326TILL nCfmgvkIUE5YFPvlPGg5KxgV98AnUdVCFbS2dxoQxaYlp4tHdROI8v9rY9x7pcLHCc3Eqt u7V49N5AkZGDzCgkFbObgm4IqOSCoEEfOp6d1X5LPP5VJ/JAT4mPZI2w6dM72YExHxsfp6 AWzLIphwB5/KDvNRBJaTEcO4x+D3Hj1TERk0jaVzsn4GUfxo8Bc5q4FecpzoVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5yB84C83z2B8 for ; Thu, 30 Apr 2026 15:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 15:04:16 +0000 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=B8rg?=rav Subject: git: dbf17ec89079 - stable/14 - caroot: Rename script and normalize license 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/14 X-Git-Reftype: branch X-Git-Commit: dbf17ec890795af131fd9274d38a94be74b7f092 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 15:04:16 +0000 Message-Id: <69f36f70.3eb63.3eff8186@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf17ec890795af131fd9274d38a94be74b7f092 commit dbf17ec890795af131fd9274d38a94be74b7f092 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 21:41:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-30 15:03:09 +0000 caroot: Rename script and normalize license MFC after: 1 week Reviewed by: mandree, markj Differential Revision: https://reviews.freebsd.org/D51775 (cherry picked from commit 0886019bf853bd30b70aa4b8cdb059830ca6aaad) --- secure/caroot/Makefile | 2 +- secure/caroot/{MAca-bundle.pl => ca-extract.pl} | 68 ++++++++++++------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index a50624c10306..fc50d54bae10 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -14,5 +14,5 @@ cleancerts: .PHONY @${MAKE} -C ${.CURDIR}/trusted ${.TARGET} updatecerts: .PHONY cleancerts fetchcerts - perl ${.CURDIR}/MAca-bundle.pl -i certdata.txt \ + perl ${.CURDIR}/ca-extract.pl -i certdata.txt \ -t ${.CURDIR}/trusted -u ${.CURDIR}/untrusted diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/ca-extract.pl similarity index 76% rename from secure/caroot/MAca-bundle.pl rename to secure/caroot/ca-extract.pl index 411d00b9bb61..75f8352e384e 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/ca-extract.pl @@ -1,38 +1,38 @@ #!/usr/bin/env perl -## -## MAca-bundle.pl -- Regenerate ca-root-nss.crt from the Mozilla certdata.txt -## -## Rewritten in September 2011 by Matthias Andree to heed untrust -## - -## Copyright (c) 2011, 2013 Matthias Andree -## All rights reserved. -## Copyright (c) 2018, Allan Jude -## Copyright (c) 2025 Dag-Erling Smørgrav -## -## 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. -## -## 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 HOLDER 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-2-Clause +# +# Copyright (c) 2011, 2013 Matthias Andree +# Copyright (c) 2018 Allan Jude +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. 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. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. +# +# +# ca-extract.pl -- Extract trusted and untrusted certificates from +# Mozilla's certdata.txt. +# +# Rewritten in September 2011 by Matthias Andree to heed untrust +# use strict; use warnings;