diff mbox series

[meta-security] lynis: upgrade 3.0.9 -> 3.1.1

Message ID 1713330759-18425-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-security] lynis: upgrade 3.0.9 -> 3.1.1 | expand

Commit Message

Mingyu Wang (Fujitsu) April 17, 2024, 5:12 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-osdetection-add-OpenEmbedded-and-Poky.patch
removed since it's included in 3.1.1.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...sdetection-add-OpenEmbedded-and-Poky.patch | 51 -------------------
 .../lynis/{lynis_3.0.9.bb => lynis_3.1.1.bb}  |  6 +--
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
 rename recipes-compliance/lynis/{lynis_3.0.9.bb => lynis_3.1.1.bb} (88%)
diff mbox series

Patch

diff --git a/recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch b/recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
deleted file mode 100644
index d365ec1..0000000
--- a/recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
-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/recipes-compliance/lynis/lynis_3.0.9.bb b/recipes-compliance/lynis/lynis_3.1.1.bb
similarity index 88%
rename from recipes-compliance/lynis/lynis_3.0.9.bb
rename to recipes-compliance/lynis/lynis_3.1.1.bb
index b8b97a5..b69f4df 100644
--- a/recipes-compliance/lynis/lynis_3.0.9.bb
+++ b/recipes-compliance/lynis/lynis_3.1.1.bb
@@ -6,11 +6,9 @@  HOMEDIR = "https://cisofy.com/"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1"
 
-SRC_URI = "https://downloads.cisofy.com/lynis/${BPN}-${PV}.tar.gz \
-           file://0001-osdetection-add-OpenEmbedded-and-Poky.patch \
-          "
+SRC_URI = "https://downloads.cisofy.com/lynis/${BPN}-${PV}.tar.gz"
 
-SRC_URI[sha256sum] = "f394df7d20391fb76e975ae88f3eba1da05ac9c4945e2c7f709326e185e17025"
+SRC_URI[sha256sum] = "d72f4ee7325816bb8dbfcf31eb104207b9fe58a2493c2a875373746a71284cc3"
 
 #UPSTREAM_CHECK = "https://downloads.cisofy.com/lynis"