diff mbox series

[meta-security] lynis: Add decoding OE and Poky

Message ID 20230503120638.943237-1-akuster808@gmail.com
State New
Headers show
Series [meta-security] lynis: Add decoding OE and Poky | expand

Commit Message

akuster808 May 3, 2023, 12:06 p.m. UTC 
Patch sent upstream.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...sdetection-add-OpenEmbedded-and-Poky.patch | 51 +++++++++++++++++++
 .../recipes-auditors/lynis/lynis_3.0.8.bb     |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 meta-security-compliance/recipes-auditors/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
diff mbox series

Patch

diff --git a/meta-security-compliance/recipes-auditors/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch b/meta-security-compliance/recipes-auditors/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
new file mode 100644
index 0000000..d365ec1
--- /dev/null
+++ b/meta-security-compliance/recipes-auditors/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
@@ -0,0 +1,51 @@ 
+From 4b1de197ee0dd259cc05d5faf7fd38b580d841d2 Mon Sep 17 00:00:00 2001
+From: Armin Kuster <akuster808@gmail.com>
+Date: Tue, 2 May 2023 16:22:13 -0400
+Subject: [PATCH] osdetection: add OpenEmbedded and Poky
+
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Upstream-Status: Pending
+https://github.com/CISOfy/lynis/pull/1390
+
+Signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+---
+ include/osdetection | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/include/osdetection b/include/osdetection
+index 989b1b3..e5974e5 100644
+--- a/include/osdetection
++++ b/include/osdetection
+@@ -308,6 +308,12 @@
+                             OS_REDHAT_OR_CLONE=1
+                             OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                         ;;
++                        "nodistro")
++                            LINUX_VERSION="openembedded"
++                            OS_NAME="OpenEmbedded"
++                            OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
++                            OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
++                        ;;
+                         "opensuse-tumbleweed")
+                             LINUX_VERSION="openSUSE Tumbleweed"
+                             # It's rolling release but has a snapshot version (the date of the snapshot)
+@@ -330,6 +336,14 @@
+                             OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                             OS_VERSION_FULL=$(grep "^PRETTY_NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
+                         ;;
++                        "poky")
++                            LINUX_VERSION="Poky"
++                            OS_NAME="openembedded"
++                            LINUX_VERSION_LIKE="openembedded"
++                            OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
++                            OS_VERSION_FULL=$(grep "^PRETTY_NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"')
++
++                        ;;
+                         "pop")
+                             LINUX_VERSION="Pop!_OS"
+                             LINUX_VERSION_LIKE="Ubuntu"
+-- 
+2.25.1
+
diff --git a/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.8.bb b/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.8.bb
index d38c17a..0a49812 100644
--- a/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.8.bb
+++ b/meta-security-compliance/recipes-auditors/lynis/lynis_3.0.8.bb
@@ -6,7 +6,9 @@  HOMEDIR = "https://cisofy.com/"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1"
 
-SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz"
+SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz \
+           file://0001-osdetection-add-OpenEmbedded-and-Poky.patch \
+          "
 
 SRC_URI[sha256sum] = "98373a4cc9d0471ab9bebb249e442fcf94b6bf6d4e9c6fc0b22bca1506646c63"