From dde2299e69810261c3f1e181ce82bf93c07397ae Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 2 May 2023 08:42:59 +0000
Subject: [PATCH 01/29] Updated log

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad1cbeb8..ab464ab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,11 @@
 ## Lynis 3.0.9 (not released yet)
 
 ### Changed
-- DBS-1820 - added newer style format for Mongo authorization setting
+- DBS-1820 - Added newer style format for Mongo authorization setting
+- FILE-6410 - Locations added for plocate
+- SSH-7408 - Only test Compression if sshd version < 7.4
+- Improved fetching timestamp
+- Minor changes such as typos
 
 ---------------------------------------------------------------------------------
 

From 87624e7c758dd3f208f40405863b198b3dd36080 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Tue, 2 May 2023 08:47:25 +0000
Subject: [PATCH 02/29] Release version 3.0.9

---
 CHANGELOG.md | 2 +-
 lynis        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab464ab6..eba36baf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Lynis Changelog
 
-## Lynis 3.0.9 (not released yet)
+## Lynis 3.0.9 (2023-05-02)
 
 ### Changed
 - DBS-1820 - Added newer style format for Mongo authorization setting
diff --git a/lynis b/lynis
index 3f6d3b84..2378b4cd 100755
--- a/lynis
+++ b/lynis
@@ -43,10 +43,10 @@
     PROGRAM_WEBSITE="https://cisofy.com/lynis/"
 
     # Version details
-    PROGRAM_RELEASE_DATE="2022-05-17"
-    PROGRAM_RELEASE_TIMESTAMP=1652791205
+    PROGRAM_RELEASE_DATE="2023-05-02"
+    PROGRAM_RELEASE_TIMESTAMP=1683017189
     PROGRAM_RELEASE_TYPE="release" # pre-release or release
-    PROGRAM_VERSION="3.0.8"
+    PROGRAM_VERSION="3.0.9"
 
     # Source, documentation and license
     PROGRAM_SOURCE="https://github.com/CISOfy/lynis"

From 6e3cea8c87c04dce721b8c7afa9027a810af5f96 Mon Sep 17 00:00:00 2001
From: rpmbuild <rpmbuild>
Date: Sun, 30 Jul 2023 09:37:10 +0200
Subject: [PATCH 03/29] use grep -E instead of egrep if possible

---
 include/binaries   | 9 +++++++++
 include/tests_time | 2 +-
 lynis              | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/binaries b/include/binaries
index 7aabba42..8b174eed 100644
--- a/include/binaries
+++ b/include/binaries
@@ -337,6 +337,15 @@
         Report "binaries_sgid_count=${SGID_BINARIES}"
         Report "binary_paths=${BINARY_PATHS_FOUND}"
 
+	# If grep is capable of extended regexp, use that instead of egrep to avoid annoying warning
+	if [ "${GREPBINARY:-}" ] ; then
+		${GREPBINARY} --help | ${GREPBINARY} -e "extended-regexp" > /dev/null
+		if [ $? -eq 0 ] ; then
+			EGREPBINARY="${GREPBINARY} -E"
+		fi
+	fi
+	
+
         # Test if the basic system tools are defined. These will be used during the audit.
         [ "${AWKBINARY:-}" ] || ExitFatal "awk binary not found"
         [ "${CAT_BINARY:-}" ] || ExitFatal "cat binary not found"
diff --git a/include/tests_time b/include/tests_time
index df9a86b7..f20beed8 100644
--- a/include/tests_time
+++ b/include/tests_time
@@ -164,7 +164,7 @@
                 FIND=$(echo "${J}" | ${EGREPBINARY} '/.placeholder$')
                 if [ -f "${J}" ] && [ -r "${J}" ] && [ -z "${FIND}" ]; then
                     LogText "Test: checking for ntpdate, rdate, sntp or ntpdig in ${J}"
-                    FIND=$("${EGREPBINARY}" "${CRONTAB_REGEX}" "${J}" | "${GREPBINARY}" -v "^#")
+                    FIND=$(${EGREPBINARY} "${CRONTAB_REGEX}" "${J}" | "${GREPBINARY}" -v "^#")
                     if [ -n "${FIND}" ]; then
                         FOUND=1; FOUND_IN_CRON=1; NTP_CONFIG_TYPE_SCHEDULED=1
                         LogText "Result: found ntpdate, rdate, sntp or ntpdig in ${J}"
diff --git a/lynis b/lynis
index 3f6d3b84..fd891d8e 100755
--- a/lynis
+++ b/lynis
@@ -217,10 +217,10 @@
 
     # Extract the short notation of the language (first two characters).
     if [ -x "$(command -v locale 2> /dev/null)" ]; then
-        LANGUAGE=$(locale | egrep "^LANG=" | cut -d= -f2 | cut -d_ -f1 | tr -d '"' | egrep "^[a-z]{2}$")
+        LANGUAGE=$(locale | grep -e "^LANG=" | cut -d= -f2 | cut -d_ -f1 | tr -d '"' | grep -E -e "^[a-z]{2}$")
         # Try locale command if shell variable had no value
         if [ -z "${DISPLAY_LANG}" ]; then
-            DISPLAY_LANG=$(locale | egrep "^LANG=" | cut -d= -f2)
+            DISPLAY_LANG=$(locale | grep -e "^LANG=" | cut -d= -f2)
         fi
     else
         LANGUAGE="en"

From e797d2d3bf59e9ab5bbdcd5cc7a5c1668500370f Mon Sep 17 00:00:00 2001
From: "Samuel Henrique (samueloph)" <samhn@amazon.com>
Date: Wed, 2 Aug 2023 17:19:58 +0000
Subject: [PATCH 04/29] Update Amazon Linux EOL dates and add Amazon Linux 2023

 Sources:
 AL2023 EOL: https://docs.aws.amazon.com/linux/al2023/release-notes/support-info-by-support-statement.html#support-info-by-support-statement-eol
 AL2 EOL: https://aws.amazon.com/amazon-linux-2/faqs/
 AL EOL: https://aws.amazon.com/blogs/aws/update-on-amazon-linux-ami-end-of-life/
---
 db/software-eol.db | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/db/software-eol.db b/db/software-eol.db
index f8242d35..ff33a056 100644
--- a/db/software-eol.db
+++ b/db/software-eol.db
@@ -28,8 +28,9 @@ os:Alpine 3.8:2020-05-01:1588305600
 # Amazon Linux
 #
 # Note: shortest entry is listed at end due to regular expression matching being used
-os:Amazon Linux 2:2023-06-26:1687730400:
-os:Amazon Linux:2020-06-30:1593468000:
+os:Amazon Linux 2023:2028-03-15:1836691200:
+os:Amazon Linux 2:2025-06-30:1751241600:
+os:Amazon Linux:2023-12-31:1703980800:
 #
 # Arch Linux
 #

From a23853eebd86573a3af9c889250cd7f916d2e3cd Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:24:18 +0200
Subject: [PATCH 05/29] Add STATUS_NOT_ACTIVE

---
 db/languages/en | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/en b/db/languages/en
index 3fc11069..52ace1f7 100644
--- a/db/languages/en
+++ b/db/languages/en
@@ -84,6 +84,7 @@ STATUS_NO="NO"
 STATUS_NO_UPDATE="NO UPDATE"
 STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="NONE"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 STATUS_NOT_DISABLED="NOT DISABLED"
 STATUS_NOT_ENABLED="NOT ENABLED"

From e1bcfe955e3ad5b1f339eb584f83a8aae6ad919b Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:24:47 +0200
Subject: [PATCH 06/29] Add STATUS_NOT_ACTIVE

---
 db/languages/az | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/az b/db/languages/az
index ffdf4254..24a0ca70 100644
--- a/db/languages/az
+++ b/db/languages/az
@@ -82,6 +82,7 @@ STATUS_FOUND="Tapıldı"
 #STATUS_MEDIUM="MEDIUM"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="Yox"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From c3bdaa1e08b9bec567558046f4205d1e52a8f258 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:25:13 +0200
Subject: [PATCH 07/29] Add STATUS_NOT_ACTIVE

---
 db/languages/cn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/cn b/db/languages/cn
index 76f181ca..11826db3 100644
--- a/db/languages/cn
+++ b/db/languages/cn
@@ -83,6 +83,7 @@ STATUS_FOUND="找到"
 #STATUS_MEDIUM="MEDIUM"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="没有"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 59d4261ab1c7e633eec70e4956634f9d58f13e09 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:25:30 +0200
Subject: [PATCH 08/29] Add STATUS_NOT_ACTIVE

---
 db/languages/da | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/da b/db/languages/da
index 21cac946..1bd77089 100644
--- a/db/languages/da
+++ b/db/languages/da
@@ -83,6 +83,7 @@ STATUS_FOUND="FUNDET"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="INGEN"
 STATUS_NO="NEJ"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 STATUS_NOT_ENABLED="IKKE AKTIVERET"

From 03bbf37faba788cabc4b86c01125a35fb2d2b955 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:25:47 +0200
Subject: [PATCH 09/29] Add STATUS_NOT_ACTIVE

---
 db/languages/de | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/de b/db/languages/de
index fad25db9..942693a3 100644
--- a/db/languages/de
+++ b/db/languages/de
@@ -84,6 +84,7 @@ STATUS_NO="NEIN"
 STATUS_NO_UPDATE="KEINE AKTUALISIERUNG"
 STATUS_NON_DEFAULT="NICHT STANDARD"
 STATUS_NONE="NICHTS"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NICHT KONFIGURIERT"
 STATUS_NOT_DISABLED="NICHT DEAKTIVIERT"
 STATUS_NOT_ENABLED="NICHT AKTIVIERT"

From ae1903ca2b0f75fae4de64ffd32bbb43c25b0188 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:26:14 +0200
Subject: [PATCH 10/29] Add STATUS_NOT_ACTIVE

---
 db/languages/es | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/es b/db/languages/es
index fceb261f..1ad53db5 100644
--- a/db/languages/es
+++ b/db/languages/es
@@ -85,6 +85,7 @@ STATUS_NO_UPDATE="SIN ACTUALIZACIÓN"
 STATUS_NO="NO"
 STATUS_NON_DEFAULT="NO POR DEFECTO"
 STATUS_NONE="NINGUNO"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NO CONFIGURADO"
 STATUS_NOT_DISABLED="NO DESHABILITADO"
 STATUS_NOT_ENABLED="NO HABILITADO"

From 2eb902c87e578d343941a74617692f9e0072e9b3 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:26:32 +0200
Subject: [PATCH 11/29] Add STATUS_NOT_ACTIVE

---
 db/languages/fi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/fi b/db/languages/fi
index 85e6593a..e8dc3564 100644
--- a/db/languages/fi
+++ b/db/languages/fi
@@ -83,6 +83,7 @@ STATUS_FOUND="LÖYTYNYT"
 STATUS_NO="EI"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="EI MITÄÄN"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 07864eb469d1a5605d43836a0913a231e053e291 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:26:51 +0200
Subject: [PATCH 12/29] Add STATUS_NOT_ACTIVE

---
 db/languages/fr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/fr b/db/languages/fr
index d85d643d..d0be5c99 100644
--- a/db/languages/fr
+++ b/db/languages/fr
@@ -84,6 +84,7 @@ STATUS_NO="NON"
 STATUS_NO_UPDATE="PAS DE MISE A JOUR"
 STATUS_NON_DEFAULT="PAS PAR DÉFAUT"
 STATUS_NONE="AUCUN"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NON CONFIGURÉ"
 STATUS_NOT_DISABLED="NON DESACTIVÉ"
 STATUS_NOT_ENABLED="NON ACTIVÉ"

From 5db08f896c69e1e0d74dbd7e35f9bb8fe05b49fb Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:27:08 +0200
Subject: [PATCH 13/29] Add STATUS_NOT_ACTIVE

---
 db/languages/gr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/gr b/db/languages/gr
index 8d285f96..15c3e509 100644
--- a/db/languages/gr
+++ b/db/languages/gr
@@ -82,6 +82,7 @@ STATUS_FOUND="ΒΡΕΘΗΚΕ"
 #STATUS_MEDIUM="MEDIUM"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="ΚΑΝΕΝΑ"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 7ada6c3166458285394c416033a595baaa7aae7c Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:27:25 +0200
Subject: [PATCH 14/29] Add STATUS_NOT_ACTIVE

---
 db/languages/he | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/he b/db/languages/he
index 83859123..9755bcf7 100644
--- a/db/languages/he
+++ b/db/languages/he
@@ -82,6 +82,7 @@ STATUS_FOUND="נמצא"
 #STATUS_MEDIUM="MEDIUM"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="אין כלל"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From f4b7556f6cd0b38e9194535c797aabad8ab3e900 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:27:40 +0200
Subject: [PATCH 15/29] Add STATUS_NOT_ACTIVE

---
 db/languages/hu | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/hu b/db/languages/hu
index 1d055bd8..90ae29e1 100644
--- a/db/languages/hu
+++ b/db/languages/hu
@@ -83,6 +83,7 @@ STATUS_FOUND="FOUND"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NO="NEM"
 STATUS_NONE="NONE"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 3d1969f3acf1155053b41fe3928d04a5ffb8bee4 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:27:55 +0200
Subject: [PATCH 16/29] Add STATUS_NOT_ACTIVE

---
 db/languages/it | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/it b/db/languages/it
index 3f3a8853..26ff3076 100644
--- a/db/languages/it
+++ b/db/languages/it
@@ -83,6 +83,7 @@ STATUS_FOUND="TROVATO"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="NESSUNO"
 STATUS_NO="NO"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NON CONFIGURATO"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 2538a02c97ebf0ba69b3200a8e0b2ccc39f75410 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:28:10 +0200
Subject: [PATCH 17/29] Add STATUS_NOT_ACTIVE

---
 db/languages/ja | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/ja b/db/languages/ja
index 3e3de50c..846b1eb1 100644
--- a/db/languages/ja
+++ b/db/languages/ja
@@ -83,6 +83,7 @@ STATUS_FOUND="見つかりました"
 STATUS_NO="いいえ"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="なし"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 98f8318256771c795ca145461f86ba3e0cea00cc Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:28:25 +0200
Subject: [PATCH 18/29] Add STATUS_NOT_ACTIVE

---
 db/languages/ko | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/ko b/db/languages/ko
index dba75b76..72d31d79 100644
--- a/db/languages/ko
+++ b/db/languages/ko
@@ -83,6 +83,7 @@ STATUS_FOUND="발견"
 STATUS_NO="아니오"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="없음"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 4c8af4da3b527746c0e04f6124da975321d3b3d4 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:28:41 +0200
Subject: [PATCH 19/29] Add STATUS_NOT_ACTIVE

---
 db/languages/nb-NO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/nb-NO b/db/languages/nb-NO
index 84ddf269..ea3e8832 100644
--- a/db/languages/nb-NO
+++ b/db/languages/nb-NO
@@ -83,6 +83,7 @@ STATUS_FOUND="FUNNET"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NO="NEI"
 STATUS_NONE="INGEN"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 0102139e256720ec0842ab0db1ce13119145ef00 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:28:53 +0200
Subject: [PATCH 20/29] Add STATUS_NOT_ACTIVE

---
 db/languages/nl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/nl b/db/languages/nl
index 4c22b9fe..cdb92423 100644
--- a/db/languages/nl
+++ b/db/languages/nl
@@ -83,6 +83,7 @@ STATUS_FOUND="GEVONDEN"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NO="NEE"
 STATUS_NONE="GEEN"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="NIET GECONFIGUREERD"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From 03e23ac43cad01355cec830d3f93f889e8128ec1 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:29:10 +0200
Subject: [PATCH 21/29] Add STATUS_NOT_ACTIVE

---
 db/languages/pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/pl b/db/languages/pl
index 200bac79..887d0a7d 100644
--- a/db/languages/pl
+++ b/db/languages/pl
@@ -83,6 +83,7 @@
 #STATUS_NON_DEFAULT="NON DEFAULT"
 #STATUS_NONE="NONE"
 #STATUS_NO="NO"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From e69f02e8357701db5ac0d591a3fd2599fa3df242 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:29:23 +0200
Subject: [PATCH 22/29] Add STATUS_NOT_ACTIVE

---
 db/languages/pt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/pt b/db/languages/pt
index 740fab6a..483fabd6 100644
--- a/db/languages/pt
+++ b/db/languages/pt
@@ -83,6 +83,7 @@ STATUS_FOUND="ENCONTRADO"
 STATUS_NO="NÃO"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="NENHUM"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From ead7df73fe92ffc5eafe76a5484fdca5df3983ed Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:29:39 +0200
Subject: [PATCH 23/29] Add STATUS_NOT_ACTIVE

---
 db/languages/ru | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/ru b/db/languages/ru
index c24603b6..55a4717b 100644
--- a/db/languages/ru
+++ b/db/languages/ru
@@ -82,6 +82,7 @@ STATUS_LOCAL_ONLY="ТОЛЬКО ЛОКАЛЬНО"
 STATUS_MEDIUM="СРЕДНИЙ"
 STATUS_NON_DEFAULT="НЕ ПО УМОЛЧАНИЮ"
 STATUS_NONE="Отсутствует"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 STATUS_NOT_CONFIGURED="НЕ СКОНФИГУРИРОВАНО"
 STATUS_NOT_DISABLED="НЕ ОТКЛЮЧЕНО"
 STATUS_NOT_ENABLED="НЕ ВКЛЮЧЕНО"

From e36fd3a5c0e60f3a53b233c77255f913937e0a6f Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:29:52 +0200
Subject: [PATCH 24/29] Add STATUS_NOT_ACTIVE

---
 db/languages/se | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/se b/db/languages/se
index d77717b4..e5a90859 100644
--- a/db/languages/se
+++ b/db/languages/se
@@ -83,6 +83,7 @@ STATUS_FOUND="HITTAD"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="INGEN"
 STATUS_NO="NEJ"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From e2ad42711523d6c939fadf7b8bdabea8d03490f9 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:30:05 +0200
Subject: [PATCH 25/29] Add STATUS_NOT_ACTIVE

---
 db/languages/sk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/sk b/db/languages/sk
index 7f021ade..45a18943 100644
--- a/db/languages/sk
+++ b/db/languages/sk
@@ -83,6 +83,7 @@ STATUS_FOUND="NÁJDENÉ"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="ŽIADNE"
 STATUS_NO="NIE"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From b2b6cd057eab9727ce8fc300e6b54e1021d81993 Mon Sep 17 00:00:00 2001
From: Amaury Korb <92906119+amkorb@users.noreply.github.com>
Date: Wed, 2 Aug 2023 23:30:17 +0200
Subject: [PATCH 26/29] Add STATUS_NOT_ACTIVE

---
 db/languages/tr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/languages/tr b/db/languages/tr
index 62dcb514..585cfed5 100644
--- a/db/languages/tr
+++ b/db/languages/tr
@@ -83,6 +83,7 @@ STATUS_FOUND="BULUNDU"
 STATUS_NO="HAYIR"
 #STATUS_NON_DEFAULT="NON DEFAULT"
 STATUS_NONE="YOK"
+STATUS_NOT_ACTIVE="NOT ACTIVE"
 #STATUS_NOT_CONFIGURED="NOT CONFIGURED"
 #STATUS_NOT_DISABLED="NOT DISABLED"
 #STATUS_NOT_ENABLED="NOT ENABLED"

From c65da1aec9894e18645d3e760fd3bf179278f770 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Thu, 3 Aug 2023 11:44:41 +0000
Subject: [PATCH 27/29] Release 3.0.9

---
 CHANGELOG.md | 2 +-
 lynis        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eba36baf..eb3a4677 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Lynis Changelog
 
-## Lynis 3.0.9 (2023-05-02)
+## Lynis 3.0.9 (2023-08-03)
 
 ### Changed
 - DBS-1820 - Added newer style format for Mongo authorization setting
diff --git a/lynis b/lynis
index 2378b4cd..d538deda 100755
--- a/lynis
+++ b/lynis
@@ -43,8 +43,8 @@
     PROGRAM_WEBSITE="https://cisofy.com/lynis/"
 
     # Version details
-    PROGRAM_RELEASE_DATE="2023-05-02"
-    PROGRAM_RELEASE_TIMESTAMP=1683017189
+    PROGRAM_RELEASE_DATE="2023-08-03"
+    PROGRAM_RELEASE_TIMESTAMP=1691062820
     PROGRAM_RELEASE_TYPE="release" # pre-release or release
     PROGRAM_VERSION="3.0.9"
 

From 5e8755c15f2e54d5d6f9500e14cc746bf8b05d82 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Thu, 3 Aug 2023 15:42:02 +0200
Subject: [PATCH 28/29] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb3a4677..248c1528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Lynis Changelog
 
+## Lynis 3.1.0 (not released yet)
+
+### Changed
+- STATUS_NOT_ACTIVE variable added to translation files
+
+---------------------------------------------------------------------------------
+
 ## Lynis 3.0.9 (2023-08-03)
 
 ### Changed

From 66d1e90bf4dd40bb5829c53e1d81676718d6d9f2 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Thu, 3 Aug 2023 23:43:36 +0200
Subject: [PATCH 29/29] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 248c1528..3612e209 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Lynis 3.1.0 (not released yet)
 
 ### Changed
+- Updated Amazon Linux EOL dates and addition of Amazon Linux 2023
 - STATUS_NOT_ACTIVE variable added to translation files
 
 ---------------------------------------------------------------------------------