From nobody Mon Aug 25 21:42:44 2025 X-Original-To: dev-commits-src-main@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 4c9kmP1hG1z65hJr; Mon, 25 Aug 2025 21:42:45 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9kmP0m58z3S9x; Mon, 25 Aug 2025 21:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756158165; 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=1uNvo+NEB1+FHe8IfPv1F+xzr7u+t5J9EAN2ciWSIA0=; b=h5qMeVJC0atb9ZOT5nOQbWF/OCxtbPdipVduIWkAK66nMJkKFHiMUvgspl9pIpyt30zmx0 x+PAmN4CmbkggkSwIj38Chx/RpbBREF1axQ2Ko/aBPBF2f2cxTLadpfNUkIhuQYVOrT/91 oi+h/oMbIWs27f5K+2u83fbp1alvySuFHitg6/QX1pZotGM1v4g3Y5wFzfkI+TKpu/rU5H qT8l1LndAEQnx7yEBFHe1s7N5bozTdjPzJBhrj2Hv1tfImbEOhj5TZBN7jlPWXT0Ik7ozJ U/wvJNfki4cBjjeLntyLUf1Yx09Bk+Xh61+5pvUlepANdwT+AvrvzqPAckMajg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756158165; 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=1uNvo+NEB1+FHe8IfPv1F+xzr7u+t5J9EAN2ciWSIA0=; b=gpHq8AIuqp0EtiKouWj9e+gtQ2dApJuqHbt1W/xVf7fvDF+81HjSrVOB+PDJqiZL/RqszD 3IqKfobULEL86VONMQWsbFUKs5eItRr7cOFMONxw9yH8x/8Wwe/hF+5Zi+SrsNqRZT2CQA PU1Mex6vRqyHKDp72HskmpGQmL9+sXaxUAZ49BQVwVx0RhPxZ+YedAsU90Ak5vYy1NXFX2 NFNA3xPQ8gzWhGm1N6Ze+trL4j93LpatJMyHUBdIcAEW4fUyjUp9seQeImu9dLLzZ9AjBz t5v0/cq2texAuhUL1bldQTsk88Zc2vktlNzZIvN6Y5vt16z35sw+Wp4cma02Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756158165; a=rsa-sha256; cv=none; b=u7txLbaJiDbvFtkyLtcW+gmSafqDeLmfI9k4rF2u6Z/mBLcXAeCT1nbOFk+0H+Kqs/v4h3 J7Qb6zig6aWqKddEJIOqS6HlwomnwRAa1GZzLucmwbfnbe+27GC//ea0aaL+9gcx+WtuPy /stzNhsMaomUxdCAmKe++zpv9gt++3KN+ju9tqOd4xVKp1S+3VyL3Xoep+uHIxXSapHZiw N+YbI6aY8un5n2TdT/eMToL1XtUgqHW7gHzg7PV+llAc6HLgjTH9U3EIOQc9fHnfzfBFxK kQvMRLuXriQp5o9DjcyFDd7MCvx2/a+JsYMMvIxxigt3XHhiEkKW1SltsLG46g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c9kmP0Hzfz1699; Mon, 25 Aug 2025 21:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PLgiWZ068722; Mon, 25 Aug 2025 21:42:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PLgiIC068719; Mon, 25 Aug 2025 21:42:44 GMT (envelope-from git) Date: Mon, 25 Aug 2025 21:42:44 GMT Message-Id: <202508252142.57PLgiIC068719@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 0886019bf853 - main - caroot: Rename script and normalize license List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0886019bf853bd30b70aa4b8cdb059830ca6aaad Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0886019bf853bd30b70aa4b8cdb059830ca6aaad commit 0886019bf853bd30b70aa4b8cdb059830ca6aaad Author: Dag-Erling Smørgrav AuthorDate: 2025-08-25 21:41:52 +0000 Commit: Dag-Erling Smørgrav 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 -## 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;