From nobody Wed Oct 21 04:43: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 4j8c9K18RGz6wFMJ for ; Wed, 21 Oct 2026 04:43: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j8c9K0QZSz4GwS for ; Wed, 21 Oct 2026 04:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792557797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6OvyOPcQk71SlmMYRbDoZ8jqwvSs5gTiyUv4lubeog=; b=CtVHu5CIQ6sUCu0BifaqOFpE9PmHoKuoz77XyP3krSc4weiEEhy00asQ6lBe9hn7pCr4+S RdeP+dZ0bLd1xR0b80tFDJQzfGQAoziCketJJJB/xmvM4/+bL25WipkTly5YlK6qkejjgf 93XDlwBLvgfNlPAfDwZjIQICJrAo7TiuolT+ZunkYMKCuAjJLimuLipgInuJa+Ej3zC+tD apyek9TnI+YAkN+wAaeK52CCoHN5RKC4RS0XlRd6qWBStsGs13PBC4yWRSeFWTmUP4gwjo ZedPjO/KAHAv1VIn+lkA8sciRYZ2RqXPAPx94wnktw1hC7poqkGf8L8uLwTlQw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792557797; b=vK4xF95aMR1MMcXCcLOGA0vxUGbUYtXBEWy3vsH21CgWABz9u92HoT7Uda0zJboWr0a+2c 5EguhlmRL3KE9HWJ72Kz2IA6y9l88bGPEqp5Fnst8gpn8BPNyB7EA4I+l32Mn15xBKn/k1 nC7pQUsWKFJfHlqxhw7GyajA1MU+QWOtq/jGmj+iKstPdHFRHX0MdfRHDuPRdqP1IHMMqP HWXjZcP3ozhXEWtsMGtiWeEPJFThBie9BJlS8D04uuKpEx5iR9qAxdkSsYbNF7YcG+UyXH SoTPa31S6KK0XnFZbVW3oUkhAoEVKIQky/Ys8DcCmlfdKOGN1zFRAfIuO5m6ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792557797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6OvyOPcQk71SlmMYRbDoZ8jqwvSs5gTiyUv4lubeog=; b=qJ9K0JosHV2g/MyFCtoraVSfY7CAxfe1WydVWRn4XlpKrhrpHnU4nvRjJQaXrsYnP7V2fF yMZn/1+swRlyYsczOU1p4dWpAUs/FpZnfSUyHgOP93+SFdcU7xDVLSWAG0hudeBkJpkyAt eA/7LWf6E8Mdcc+yqkFotcPocQwHKsQF+yJqCuSPvWuM5pvsN6HksJmo1cWKXL6DbqOMJm f7FFQBwoDffnfMQgMWB8qSfBdXCtUvbT87/mkbat4py6zsekM0ZIvowhqNXwrPzyYghUNQ FN1xS1nFFB19214mjC+uJrFIzLktV06DTwDaJK5nFJ9VOu8XfNGj8g6e0j6Aig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j8c9K04bRzglc for ; Wed, 21 Oct 2026 04:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 307a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Oct 2026 04:43:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Mark Johnston Subject: git: 1258151af59c - releng/14.4 - caroot: Rename script and normalize license List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 1258151af59c5cef797b685b7f7c55131c73fb55 Auto-Submitted: auto-generated Date: Wed, 21 Oct 2026 04:43:16 +0000 Message-Id: <6ad842e4.307a0.37101a50@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1258151af59c5cef797b685b7f7c55131c73fb55 commit 1258151af59c5cef797b685b7f7c55131c73fb55 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 21:41:52 +0000 Commit: Mark Johnston CommitDate: 2026-10-20 20:39:36 +0000 caroot: Rename script and normalize license Approved by: so Security: FreeBSD-SA-26:73.caroot MFC after: 1 week Reviewed by: mandree, markj Differential Revision: https://reviews.freebsd.org/D51775 (cherry picked from commit 0886019bf853bd30b70aa4b8cdb059830ca6aaad) (cherry picked from commit dbf17ec890795af131fd9274d38a94be74b7f092) --- 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;