git: f930abd95b - main - SA/EN templates: prune 11.x and bump versions

Glen Barber <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/doc/commit/?id=f930abd95b08b23ce80823cb9a3e93b3f375fac5

commit f930abd95b08b23ce80823cb9a3e93b3f375fac5
Author:     Glen Barber <[email protected]>
AuthorDate: 2021-10-22 19:36:29 +0000
Commit:     Glen Barber <[email protected]>
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:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                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:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                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:
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.