From nobody Fri Oct 22 19:39:43 2021 X-Original-To: dev-commits-doc-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 0C249180BC74 for ; Fri, 22 Oct 2021 19:39:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HbZRz6ldzz4bCb; Fri, 22 Oct 2021 19:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C7C96144E0; Fri, 22 Oct 2021 19:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19MJdhuI099084; Fri, 22 Oct 2021 19:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MJdh1Y099083; Fri, 22 Oct 2021 19:39:43 GMT (envelope-from git) Date: Fri, 22 Oct 2021 19:39:43 GMT Message-Id: <202110221939.19MJdh1Y099083@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: f930abd95b - main - SA/EN templates: prune 11.x and bump versions List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f930abd95b08b23ce80823cb9a3e93b3f375fac5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=f930abd95b08b23ce80823cb9a3e93b3f375fac5 commit f930abd95b08b23ce80823cb9a3e93b3f375fac5 Author: Glen Barber AuthorDate: 2021-10-22 19:36:29 +0000 Commit: Glen Barber CommitDate: 2021-10-22 19:36:29 +0000 SA/EN templates: prune 11.x and bump versions Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/static/security/advisory-template.txt | 12 +++++------- website/static/security/errata-template.txt | 9 +++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt index 838c4d4569..ef97d0d420 100644 --- a/website/static/security/advisory-template.txt +++ b/website/static/security/advisory-template.txt @@ -10,13 +10,12 @@ Announced: 2021-XX-XX Credits: Affects: + 13.0 and later.", "FreeBSD 12.x", or "FreeBSD 12.2"> Corrected: 2021-XX-XX XX:XX:XX UTC (stable/13, 13.0-STABLE) 2021-XX-XX XX:XX:XX UTC (releng/13.0, 13.0-RELEASE-pXX) - 2021-XX-XX XX:XX:XX UTC (stable/12, 12.2-STABLE) + 2021-XX-XX XX:XX:XX UTC (stable/12, 12.3-STABLE) + 2021-XX-XX XX:XX:XX UTC (releng/12.3, 12.3-BETAX) 2021-XX-XX XX:XX:XX UTC (releng/12.2, 12.2-RELEASE-pXX) - 2021-XX-XX XX:XX:XX UTC (stable/11, 11.4-STABLE) - 2021-XX-XX XX:XX:XX UTC (releng/11.4, 11.4-RELEASE-pXX) CVE Name: CVE-XXXX-XXXX For general information regarding FreeBSD Security Advisories, @@ -75,7 +74,7 @@ FreeBSD release branches. a) Download the relevant patch from the location below, and verify the detached PGP signature using your PGP utility. -[FreeBSD 11.4] +[FreeBSD 12.2] # fetch https://security.FreeBSD.org/patches/SA-XX:XX/XXXX.patch # fetch https://security.FreeBSD.org/patches/SA-XX:XX/XXXX.patch.asc # gpg --verify XXXX.patch.asc @@ -120,9 +119,8 @@ Branch/path Hash Revision stable/13/ XXXXXXXXXXXX stable/13-nXXXXXX releng/13.0/ XXXXXXXXXXXX releng/13.0-nXXXXXX stable/12/ rXXXXXX +releng/12.3/ rXXXXXX releng/12.2/ rXXXXXX -stable/11/ rXXXXXX -releng/11.4/ rXXXXXX ------------------------------------------------------------------------- For FreeBSD 13 and later: diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt index 9f8de907ad..272ee1c704 100644 --- a/website/static/security/errata-template.txt +++ b/website/static/security/errata-template.txt @@ -10,13 +10,11 @@ Announced: 2021-XX-XX Credits: Affects: + 13.0 and later.", "FreeBSD 12.x", or "FreeBSD 12.2"> Corrected: 2021-XX-XX XX:XX:XX UTC (stable/13, 13.0-STABLE) 2021-XX-XX XX:XX:XX UTC (releng/13.0, 13.0-RELEASE-pXX) 2021-XX-XX XX:XX:XX UTC (stable/12, 12.2-STABLE) 2021-XX-XX XX:XX:XX UTC (releng/12.2, 12.2-RELEASE-pXX) - 2021-XX-XX XX:XX:XX UTC (stable/11, 11.4-STABLE) - 2021-XX-XX XX:XX:XX UTC (releng/11.4, 11.4-RELEASE-pXX) For general information regarding FreeBSD Errata Notices and Security Advisories, including descriptions of the fields above, security @@ -75,7 +73,7 @@ FreeBSD release branches. a) Download the relevant patch from the location below, and verify the detached PGP signature using your PGP utility. -[FreeBSD 11.4] +[FreeBSD 12.2] # fetch https://security.FreeBSD.org/patches/EN-XX:XX/XXXX.patch # fetch https://security.FreeBSD.org/patches/EN-XX:XX/XXXX.patch.asc # gpg --verify XXXX.patch.asc @@ -120,9 +118,8 @@ Branch/path Hash Revision stable/13/ XXXXXXXXXXXX stable/13-nXXXXXX releng/13.0/ XXXXXXXXXXXX releng/13.0-nXXXXXX stable/12/ rXXXXXX +releng/12.3/ rXXXXXX releng/12.2/ rXXXXXX -stable/11/ rXXXXXX -releng/11.4/ rXXXXXX ------------------------------------------------------------------------- For FreeBSD 13 and later: