mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-11 15:00:34 +00:00
Code Issues Projects Releases Wiki Activity

lynis: upgrade 3.0.9 -> 3.1.1

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Wang Mingyu
2024-04-17 13:12:39 +08:00
committed by Armin Kuster
parent fb28801eee
commit 93239b90ac
2 changed files with 2 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
recipes-compliance/lynis/files/0001-osdetection-add-OpenEmbedded-and-Poky.patch
View File

@@ -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

6
recipes-compliance/lynis/lynis_3.0.9.bb → recipes-compliance/lynis/lynis_3.1.1.bb
View File

@@ -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"