From 724acf1be5c2cad92c9ca9ea6e7be0cbdc3a32e5 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Fri, 20 Mar 2020 19:33:10 +0100 Subject: [PATCH 1/3] Added CentOS 8 end-of-life --- db/software-eol.db | 1 + 1 file changed, 1 insertion(+) diff --git a/db/software-eol.db b/db/software-eol.db index d0452616..a3aaa93c 100644 --- a/db/software-eol.db +++ b/db/software-eol.db @@ -24,6 +24,7 @@ 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 8 (Core):2029-05-31:1874872800: # # Debian - https://wiki.debian.org/DebianReleases#Production_Releases # From af03c07d9fd81225d8c975c62e352d01e4c88e9a Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Fri, 20 Mar 2020 19:39:49 +0100 Subject: [PATCH 2/3] Shortened CentOS 7/8 strings to allow match and added note --- db/software-eol.db | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/db/software-eol.db b/db/software-eol.db index a3aaa93c..eb5353ff 100644 --- a/db/software-eol.db +++ b/db/software-eol.db @@ -9,6 +9,9 @@ # # Date can be converted on Linux using: date "+%s" --date=2020-01-01 # +# Note: Full string for CentOS can be something like 'CentOS Linux 8 (Core)'. +# As this does not properly match, shorter string is used for matching. +# # Amazon Linux # os:Amazon Linux:2020-06-30:1593468000: @@ -22,9 +25,8 @@ os:Arch Linux:2286-11-20:9999999999: # 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 8 (Core):2029-05-31:1874872800: +os:CentOS Linux 7:2024-06-30:1719698400: +os:CentOS Linux 8:2029-05-31:1874872800: # # Debian - https://wiki.debian.org/DebianReleases#Production_Releases # From 6356b3adb180d05f71514ea91455d513586ae71e Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Fri, 20 Mar 2020 19:43:18 +0100 Subject: [PATCH 3/3] Updated log --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 135200bb..cb92e253 100644 --- a/CHANGELOG.md +++ b/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