From nobody Thu Apr 30 15:04:17 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 4g5yBB5N3Sz6c4GN for ; Thu, 30 Apr 2026 15:04:18 +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 4g5yBB1YHzz41Fg for ; Thu, 30 Apr 2026 15:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777561458; 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=ZHVsJusDaLrpd6ih10qG9mFHj6u6j6PvLVT3l73hl0E=; b=RWSrvlwI6ptvr0++/JiE4mRCcwliHp2AisQGP0AqloetNvmaePusJLq3Qq2Q3eM9a3HMA3 IHHF1GpozfuYOSBvscbxaOI75hu+vrnoG8OJGhUQMzaKlkOkZgLAh/W9T2IiQZaHnxoZpB Q54jmyB+yzMHJ5qGuq6/kpEV+a77roGGe4pjGh55Rmt0txxURY0BqXZy0RGz2VseCuElfr osSO3VZFXHLTioR8WHeNnmEdzjONVT1JUeIQl5n+FGkZs0a6XMQSzIokQKL45748g9547W /CZjXtoforkplJXQBmkktt9hZXEXQmTNrbVJ+YcJcEc7HsIVJT297npsQmuAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777561458; a=rsa-sha256; cv=none; b=lDpI+rAcALHm+Wk8AU67dMaGXYQbIJWmv2mB1VIygYFc7z969NSJrDirMufi+qEDUd6XSj Nt2N8IivJfLYMX/foIQerCp+JVMunJS4SWGmJJgfcUQJfYp3gZXQbb+7EhnJRRvxkHRSRv EF1Z53wEPtNbPzktgbaESmhixP4wjiXXFHJ6+LUvJFuFVvjvJSdYaLpMFSiWmIQ1TjQ4+l MzvqNkWXDxvKZ8eO2W1o+7XbX8NYeWVgikuuMc378xHGvfpvmvYNltWng9KHwMgDl5nSX5 y5LvJhYTLyQhMtj89BLYG3eP57Ro3dU7ZwWsrSm1u/Z11bWI1j3iUVjPNT3cug== 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=1777561458; 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=ZHVsJusDaLrpd6ih10qG9mFHj6u6j6PvLVT3l73hl0E=; b=ZPtY9naOWjDoDmm038wrOfm1XvY8cA2zkdLWnzy5r9dYy5eDtUzitNq4uEN40v5b0ok3jW P1N2bE/nCwm4InP/L3iN+puSn6XsrSL5MuIz4bSOsLXAGgau1NN20jUrWZEDl8Ek+7Qv+k Y0irObs/LZ+EI7ScHPJrIb5zGNMIYUE6AZj5HYhtAwIS0mlBQq/zlXaGmCSt50cJJrEnoH DG97nRUJPrt3m+ttE6vroOQMMmhpsE5ZeyfYgOpV+s4LAR51kcWS82yEYTdMaQ1DO7EKdf 10ytRj6N4ENZGuNTUVGqi54KaWjzK1NswBRE4V7TRtNnzieVqh5UbzL3mzBBsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5yB95vcdz1wr for ; Thu, 30 Apr 2026 15:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffa1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 15:04:17 +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: 1c928d934875 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 1c928d934875b91925cde661889e6f98face08de Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 15:04:17 +0000 Message-Id: <69f36f71.3ffa1.32b61d49@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1c928d934875b91925cde661889e6f98face08de commit 1c928d934875b91925cde661889e6f98face08de Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 21:41:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-30 15:03:23 +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 21dd18fcbe35..7f4f08991a85 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}/blacklisted 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 cb2ca452e455..62cad584e3a8 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;