From 33363cedbf75f106c12f44b014b3122826e7654f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 6 Mar 2024 15:28:12 +0100
Subject: split CentOS/Clones, add EOL date for C8 and F38

---
 wizard/index.php | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'wizard')

diff --git a/wizard/index.php b/wizard/index.php
index 1fd29215..7cc0d0c9 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -20,9 +20,12 @@ $osvers = [
     'RHEL 9'    => ['8.0', '8.1'],
     'RHEL 8'    => ['7.4', '8.0'],
     'RHEL 7'    => '5.4',
-    'CentOS 9'  => ['8.0', '8.1'],
-    'CentOS 8'  => ['7.4', '8.0'],
+    'CentOS 9'  => ['8.0', '8.1', '8.2'],
+    'CentOS 8'  => ['7.4', '8.0', '8.2'],
     'CentOS 7'  => '5.4',
+    'EL 9'      => ['8.0', '8.1'],
+    'EL 8'      => ['7.4', '8.0'],
+    'EL 7'      => '5.4',
     'Fedora 40' => '8.3',
     'Fedora 39' => '8.2',
     'Fedora 38' => '8.2',
@@ -34,6 +37,9 @@ $osmin = [
     'CentOS 9'  => '7.4',
     'CentOS 8'  => '5.6',
     'CentOS 7'  => '5.4',
+    'EL 9'      => '7.4',
+    'EL 8'      => '5.6',
+    'EL 7'      => '5.4',
     'Fedora 40' => '7.4',
     'Fedora 39' => '7.4',
     'Fedora 38' => '7.4',
@@ -45,6 +51,9 @@ $osminbase = [
     'CentOS 9'  => '7.4',
     'CentOS 8'  => '7.2',
     'CentOS 7'  => '5.4',
+    'EL 9'      => '7.4',
+    'EL 8'      => '7.2',
+    'EL 7'      => '5.4',
     'Fedora 40' => '7.4',
     'Fedora 39' => '7.4',
     'Fedora 38' => '7.4',
@@ -56,6 +65,9 @@ $osmax = [
     'CentOS 9'  => '8.3',
     'CentOS 8'  => '8.3',
     'CentOS 7'  => '8.3',
+    'EL 9'      => '8.3',
+    'EL 8'      => '8.3',
+    'EL 7'      => '8.3',
     'Fedora 40' => '8.3',
     'Fedora 39' => '8.3',
     'Fedora 38' => '8.3',
@@ -65,10 +77,14 @@ $osname = [
 		'RHEL 9'    => 'RHEL 9.3',
 		'RHEL 8'    => 'RHEL 8.9',
 		'RHEL 7'    => 'RHEL 7.9 (maintained until June 2024)',
-	':centos'		=> 'CentOS Stream, CentOS Linux, Alma Linux, Rocky Linux and other clones',
-		'CentOS 9'  => 'EL 9',
-		'CentOS 8'  => 'EL 8',
-		'CentOS 7'  => 'EL 7 (maintained until June 2024)',
+	':centos'		=> 'CentOS Stream, CentOS Linux',
+		'CentOS 9'  => 'CentOS Stream 9', //  (maintained until Mai 2027)
+		'CentOS 8'  => 'CentOS Stream 8 (maintained until June 2024)',
+		'CentOS 7'  => 'CentOS 7 (maintained until June 2024)',
+	':clone'		=> 'Alma Linux, Rocky Linux and other clones',
+		'EL 9'      => 'EL 9',
+		'EL 8'      => 'EL 8',
+		'EL 7'      => 'EL 7 (maintained until June 2024)',
 	':fedora'		=> 'Fedora Linux',
 		'Fedora 40' => 'Fedora 40 (Development version)',
 		'Fedora 39' => 'Fedora 39',
@@ -210,8 +226,10 @@ if ($os) {
     } else if (($dist == 'Fedora' && $ver>=FC_DEV) || ($dist != 'Fedora' && $ver>=EL_DEV)) {
         printf("<li><img src='notice.png'> <b>WARNING: %s</b> is a <b>development</b> version, not ready for production.</li><br />", $os);
 
-    } else if ($ver == 7 || $ver == 37) {
-	    $days = ($ver == 7 ? mktime(0,0,0,6,30,2024) : mktime(0,0,0,12,7,2023));
+    } else if ($ver == 7 || $ver == 38 || ($dist=="CentOS" && $ver == 8)) {
+		if ($ver == 38)     $days = mktime(0,0,0,5,14,2024);
+		else if ($ver == 9) $days = mktime(0,0,0,5,31,2027);
+		else /* 7 and 9 */  $days = mktime(0,0,0,6,30,2024);
 		$eol  = date("F Y", $days);
         $days = (int)(($days - time()) / (60 * 60 * 24));
 		$weeks = round($days/7);
-- 
cgit