Merge branch 'master' into netbsd-eol

CHANGELOG.md

@@ -135,10 +135,11 @@ Using the relevant options, the scan will change base on the intended goal.
 - Use only locations from PATH environment variable, unless it is not defined
 - Show tip to use 'lynis generate hostids' when host IDs are missing
 - The 'show changelog' command works again for newer versions
-- Improved screen output in several tests
 - Several code cleanups, simplification of commands, and code standardization
 - Tests using lsof may ignore individual threads (if supported)
+- Corrected end-of-life detection for CentOS 7 and CentOS 8
 - Do not show tool tips when quiet option is used
+- Improved screen output in several tests
 - Extended output of 'lynis update info'
 - Test if profiles are readable
 - systemd service file adjusted

db/software-eol.db

@@ -4,13 +4,14 @@
 # This file has 4 fields:
 # 1) category
 # 2) name
-# 3) date (human-readable)
-# 4) converted date (seconds since epoch)
+# 3) date (human-readable) or empty
+# 4) converted date (seconds since epoch) or -1
 #
 # Date can be converted on Linux using: date "+%s" --date=2020-01-01
 #
-# Note: For rolling releases or releases that do not (currently have an
-#       EOL date, leave field three empty and set field four to -1.
+# Notes:
+# For rolling releases or releases that do not (currently have an EOL date, leave field three empty and set field four to -1.
+# Full string for CentOS can be something like 'CentOS Linux 8 (Core)'. As this does not correctly match, shorter string is used for matching.
 #
 # Amazon Linux
 #
@@ -25,8 +26,8 @@ os:Arch Linux::-1:
 #
 os:CentOS release 5:2017-03-31:1490911200:
 os:CentOS release 6:2020-11-30:1606690800:
-os:CentOS Linux release 7:2024-06-30:1719698400:
-os:CentOS Linux 7 (Core):2024-06-30:1719698400:
+os:CentOS Linux 7:2024-06-30:1719698400:
+os:CentOS Linux 8:2029-05-31:1874872800:
 #
 # Debian - https://wiki.debian.org/DebianReleases#Production_Releases
 #