The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0886019bf853bd30b70aa4b8cdb059830ca6aaad
commit 0886019bf853bd30b70aa4b8cdb059830ca6aaad
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-08-25 21:41:52 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-08-25 21:41:52 +0000
caroot: Rename script and normalize license
MFC after: 1 week
Reviewed by: mandree, markj
Differential Revision: https://reviews.freebsd.org/D51775
---
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 d48285437f10..e0ef4623b498 100644
--- a/secure/caroot/Makefile
+++ b/secure/caroot/Makefile
@@ -13,5 +13,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 <mand...@freebsd.org>
-## All rights reserved.
-## Copyright (c) 2018, Allan Jude <allanj...@freebsd.org>
-## Copyright (c) 2025 Dag-Erling Smørgrav <d...@freebsd.org>
-##
-## 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 <mand...@freebsd.org>
+# Copyright (c) 2018 Allan Jude <allanj...@freebsd.org>
+# Copyright (c) 2025 Dag-Erling Smørgrav <d...@freebsd.org>
+#
+# 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;
