From 2809e50c1d19033ffd300e4b5697e98281da2935 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 31 Jan 2021 19:26:31 -0500
Subject: [PATCH] Update SA/EN templates for 12.1 EOL

Sponsored by:	The FreeBSD Foundation
---
 website/static/security/advisory-template.txt | 4 +---
 website/static/security/errata-template.txt   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt
index b9f1a329c1..8e63f61f09 100644
--- a/website/static/security/advisory-template.txt
+++ b/website/static/security/advisory-template.txt
@@ -10,10 +10,9 @@ Announced:      2021-XX-XX
 Credits:
 Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.1 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
 Corrected:      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 (releng/12.1, 12.1-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
@@ -117,7 +116,6 @@ Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
-releng/12.1/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------
diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt
index 27e996e8c1..0ae8e44b89 100644
--- a/website/static/security/errata-template.txt
+++ b/website/static/security/errata-template.txt
@@ -10,10 +10,9 @@ Announced:      2021-XX-XX
 Credits:
 Affects:        <affected versions>
                 <e.g., "All supported versions of FreeBSD.", "FreeBSD
-                12.1 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
+                12.2 and later.", "FreeBSD 12.x", or "FreeBSD 11.4">
 Corrected:      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 (releng/12.1, 12.1-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)
 
@@ -117,7 +116,6 @@ Branch/path                                                      Revision
 -------------------------------------------------------------------------
 stable/12/                                                        rXXXXXX
 releng/12.2/                                                      rXXXXXX
-releng/12.1/                                                      rXXXXXX
 stable/11/                                                        rXXXXXX
 releng/11.4/                                                      rXXXXXX
 -------------------------------------------------------------------------