From 92eb59888ef3952c510e1bcc7f60eb67ab27a6f5 Mon Sep 17 00:00:00 2001
From: Jacques Vidrine
Date: Sat, 3 Apr 2004 15:23:54 +0000
Subject: [PATCH] Add text explaining new guidelines for the lifetimes of
security branches. `Early adopter' branches will be supported 6+ months,
`Normal' branches will be supported 12+ months, and `Extended' branches will
be supported 24+ months.
Mark RELENG_4_8 as an `Extended' support branch and extend its
Estimated EoL accordingly.
While here, also extend RELENG_5_2 through the end of 2004.
(I was reminded that RELENG_4_8 had expired a few days ago by
cperciva@.)
---
en/security/security.sgml | 54 +++++++++++++++++++++++++++------------
1 file changed, 38 insertions(+), 16 deletions(-)
diff --git a/en/security/security.sgml b/en/security/security.sgml
index dc2025634c..2aad58f8d0 100644
--- a/en/security/security.sgml
+++ b/en/security/security.sgml
@@ -1,11 +1,11 @@
-
+
%includes;
]>
-
+
&header;
@@ -190,40 +190,62 @@ The corresponding builds have names like FreeBSD
Each branch is supported by the Security Officer for a limited time
-only, typically through 12 months after the release. The estimated
-lifetimes of the currently supported branches are given below. The
-Estimated EoL (end-of-life) column gives the earliest date on
-which that branch is likely to be dropped. Please note that these dates
-may be extended into the future, but only extenuating circumstances
-would lead to a branch's support being dropped earlier than the date
-listed.
+only, and is designated as one of `Early adopter',
+`Normal', or `Extended'. The designation is used as a
+guideline for determining the lifetime of the branch as follows.
+
+
+ - Early adopter
+ - Releases which are published from the -CURRENT branch will be
+ supported by the Security Officer for a minimum of 6 months after
+ the release.
+ - Normal
+ - Releases which are published from the -STABLE branch will be
+ supported by the Security Officer for a minimum of 12 months after the
+ release.
+ - Extended
+ - Selected releases will be supported by the Security Officer for a
+ minimum of 24 months after the release.
+
+
+The current designation and estimated lifetimes of the currently
+supported branches are given below. The Estimated EoL
+(end-of-life) column gives the earliest date on which that branch
+is likely to be dropped. Please note that these dates may be extended
+into the future, but only extenuating circumstances would lead to a
+branch's support being dropped earlier than the date listed.
Branch |
Release |
+ Type |
Estimated EoL |
RELENG_4 |
n/a |
- October 31, 2004 |
+ n/a |
+ March 31, 2005 |
RELENG_4_8 |
4.8-RELEASE |
- March 31, 2004 |
+ Extended |
+ March 31, 2005 |
+
+
+ RELENG_5_2 |
+ 5.2.1-RELEASE |
+ Early adopter |
+ December 31, 2004 |
RELENG_4_9 |
4.9-RELEASE |
+ Normal |
October 31, 2004 |
-
- RELENG_5_2 |
- 5.2-RELEASE |
- July 31, 2004 |
-
Older releases are not maintained and users are strongly encouraged