meta-security: subtree update:30ea7a89dc..d75dc96fa3

Armin Kuster (11):
      python-scapy: drop py2 package
      packagegroup-core-security-ptest: only included if ptest is enabled
      packagegroup-core-security: update package name
      busybox: fix sig changes when layer added
      initramfs-framework-ima: correct IMA_POLICY name
      apparmor: drop lsb RDEPENDS
      openscap: Drop nostamp
      scap-security-guide: add depends on openscap-native do_install
      cryptsetup-tpm-incubator: fix QA error RDEPENDS
      oe-scap: Fix QA RDEPENDS error
      suricata: update to 4.1.4

Stefan Agner (1):
      libseccomp: build static library always

Change-Id: Ia2f8aec978de4f3d20c13be3c12b70a7badc29d5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

4 files changed, 35 insertions, 8 deletions

diff --git a/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch b/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch
new file mode 100644
index 0000000000..74e9a56c18
--- /dev/null
+++ b/meta-security/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/meta-security/recipes-ids/suricata/libhtp_0.5.29.bb b/meta-security/recipes-ids/suricata/libhtp_0.5.30.bb
index 8305f70105..8305f70105 100644
--- a/meta-security/recipes-ids/suricata/libhtp_0.5.29.bb
+++ b/meta-security/recipes-ids/suricata/libhtp_0.5.30.bb
diff --git a/meta-security/recipes-ids/suricata/suricata.inc b/meta-security/recipes-ids/suricata/suricata.inc
index 7be403ccb6..54f91c5e8f 100644
--- a/meta-security/recipes-ids/suricata/suricata.inc
+++ b/meta-security/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/meta-security/recipes-ids/suricata/suricata_4.1.3.bb b/meta-security/recipes-ids/suricata/suricata_4.1.4.bb
index d6f5937d10..f860af97ab 100644
--- a/meta-security/recipes-ids/suricata/suricata_4.1.3.bb
+++ b/meta-security/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"