[meta-security][PATCH 1/3] cryptsetup-tpm-incubator: fix QA error RDEPENDS

[meta-security][PATCH 1/3] cryptsetup-tpm-incubator: fix QA error RDEPENDS

[Armin Kuster]

ERROR: cryptsetup-tpm-incubator-0.9.9-r0 do_package_qa: QA Issue: /usr/lib/libcryptsetup.so.12.3.0 contained in package cryptsetup-tpm-incubator requires libdevmapper.so.1.02(DM_1_02_97)(64bit), but no providers found in RDEPENDS_cryptsetup-tpm-incubator? [file-rdeps]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb b/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb
index 8b50445..8385c94 100644
--- a/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb
+++ b/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb
@@ -32,7 +32,7 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \
                      kernel-module-xts \
                     "
 
-RDEPENDS_${PN} += "lvm2"
+RDEPENDS_${PN} += "lvm2 libdevmapper"
 RRECOMMENDS_${PN} += "lvm2-udevrules"
 
 RREPLACES_${PN} = "cryptsetup"
-- 
2.7.4

[meta-security][PATCH 2/3] oe-scap: Fix QA RDEPENDS error

[Armin Kuster]

ERROR: oe-scap-1.0-r0 do_package_qa: QA Issue: /usr/share/oe-scap/run_tests.sh contained in package oe-scap requires /bin/bash, but no providers found in RDEPENDS_oe-scap? [file-rdeps]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb b/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
index e84ed30..fd53fcb 100644
--- a/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
+++ b/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
@@ -30,4 +30,4 @@ do_install () {
 
 FILES_${PN} += "${datadir}/oe-scap"
 
-RDEPENDS_${PN} = "openscap"
+RDEPENDS_${PN} = "openscap bash"
-- 
2.7.4

[meta-security][PATCH 3/3] suricata: update to 4.1.4

[Armin Kuster]

Backport patch to fix build against newer kernels.

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...-packet-fix-build-on-recent-Linux-kernels.patch | 26 ++++++++++++++++++++++
 .../{libhtp_0.5.29.bb => libhtp_0.5.30.bb}         |  0
 recipes-ids/suricata/suricata.inc                  |  6 ++---
 .../{suricata_4.1.3.bb => suricata_4.1.4.bb}       | 11 ++++-----
 4 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch
 rename recipes-ids/suricata/{libhtp_0.5.29.bb => libhtp_0.5.30.bb} (100%)
 rename recipes-ids/suricata/{suricata_4.1.3.bb => suricata_4.1.4.bb} (95%)

diff --git a/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch b/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch
new file mode 100644
index 0000000..74e9a56
--- /dev/null
+++ b/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch
@@ -0,0 +1,26 @@
+From b37554e0bc3cf383e6547c5c6a69c6f6849c09e3 Mon Sep 17 00:00:00 2001
+From: Eric Leblond <eric@regit.org>
+Date: Wed, 17 Jul 2019 12:35:12 +0200
+Subject: [PATCH] af-packet: fix build on recent Linux kernels
+
+Upstream-Status: Backport
+Signed-off-by: Armin kuster <akuster808@gmail.com>
+---
+ src/source-af-packet.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: suricata-4.1.4/src/source-af-packet.c
+===================================================================
+--- suricata-4.1.4.orig/src/source-af-packet.c
++++ suricata-4.1.4/src/source-af-packet.c
+@@ -64,6 +64,10 @@
+ #include <sys/ioctl.h>
+ #endif
+ 
++#if HAVE_LINUX_SOCKIOS_H
++#include <linux/sockios.h>
++#endif
++
+ #ifdef HAVE_PACKET_EBPF
+ #include "util-ebpf.h"
+ #include <bpf/libbpf.h>
diff --git a/recipes-ids/suricata/libhtp_0.5.29.bb b/recipes-ids/suricata/libhtp_0.5.30.bb
similarity index 100%
rename from recipes-ids/suricata/libhtp_0.5.29.bb
rename to recipes-ids/suricata/libhtp_0.5.30.bb
diff --git a/recipes-ids/suricata/suricata.inc b/recipes-ids/suricata/suricata.inc
index 7be403c..54f91c5 100644
--- a/recipes-ids/suricata/suricata.inc
+++ b/recipes-ids/suricata/suricata.inc
@@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-VER = "4.1.3"
+VER = "4.1.4"
 SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
 
-SRC_URI[md5sum] = "35c4a8e6be3910831649a073950195df"
-SRC_URI[sha256sum] = "6cda6c80b753ce36483c6be535358b971f3890b9aa27a58c2d2f7e89dd6c6aa0"
+SRC_URI[md5sum] = "cb8bf6b8330c44ae78dfb5b083a6fe82"
+SRC_URI[sha256sum] = "2da50d91f92adf8b1af930f388361f76424420b88f553f610e2780e4240f2009"
diff --git a/recipes-ids/suricata/suricata_4.1.3.bb b/recipes-ids/suricata/suricata_4.1.4.bb
similarity index 95%
rename from recipes-ids/suricata/suricata_4.1.3.bb
rename to recipes-ids/suricata/suricata_4.1.4.bb
index d6f5937..f860af9 100644
--- a/recipes-ids/suricata/suricata_4.1.3.bb
+++ b/recipes-ids/suricata/suricata_4.1.4.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd
 SRC_URI += "file://emerging.rules.tar.gz;name=rules"
 
 SRC_URI += " \
-           file://volatiles.03_suricata \
-           file://suricata.yaml \
-           file://suricata.service \
-           file://run-ptest \
-           "
+    file://volatiles.03_suricata \
+    file://suricata.yaml \
+    file://suricata.service \
+    file://run-ptest \
+    file://0001-af-packet-fix-build-on-recent-Linux-kernels.patch \
+    "
 
 SRC_URI[rules.md5sum] = "205c5e5b54e489207ed892c03ad75b33"
 SRC_URI[rules.sha256sum] = "4aa81011b246875a57181c6a0569ca887845e366904bcaf0043220f33bd69798"
-- 
2.7.4