aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-09-04 23:03:55 +0000
committerArmin Kuster <akuster808@gmail.com>2019-09-07 08:34:22 -0700
commitd75dc96fa3ddc1fb7f72a97e220813e592d8f5ad (patch)
tree96dc214ba1dc27be896ec318c7d37d6990ebb0e5
parente8e3044fcebc044b35792f48127c4977c1423e5b (diff)
downloadmeta-security-d75dc96fa3ddc1fb7f72a97e220813e592d8f5ad.tar.gz
meta-security-d75dc96fa3ddc1fb7f72a97e220813e592d8f5ad.tar.bz2
meta-security-d75dc96fa3ddc1fb7f72a97e220813e592d8f5ad.zip
suricata: update to 4.1.4
Backport patch to fix build against newer kernels. Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch26
-rw-r--r--recipes-ids/suricata/libhtp_0.5.30.bb (renamed from recipes-ids/suricata/libhtp_0.5.29.bb)0
-rw-r--r--recipes-ids/suricata/suricata.inc6
-rw-r--r--recipes-ids/suricata/suricata_4.1.4.bb (renamed from recipes-ids/suricata/suricata_4.1.3.bb)11
4 files changed, 35 insertions, 8 deletions
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
index 8305f70..8305f70 100644
--- a/recipes-ids/suricata/libhtp_0.5.29.bb
+++ b/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
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"