suricata/libhtp: update to 4.1.5/0.5.31

same sources
refresh patch

drop rules tar ball

Signed-off-by: Armin Kuster <akuster808@gmail.com>

5 files changed, 8 insertions, 13 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
index 74e9a56..530568b 100644
--- 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
@@ -9,12 +9,12 @@ 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
+Index: suricata-4.1.5/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>
+--- suricata-4.1.5.orig/src/source-af-packet.c
++++ suricata-4.1.5/src/source-af-packet.c
+@@ -68,6 +68,10 @@
+ #include <linux/sockios.h>
  #endif
  
 +#if HAVE_LINUX_SOCKIOS_H
diff --git a/recipes-ids/suricata/files/emerging.rules.tar.gz b/recipes-ids/suricata/files/emerging.rules.tar.gz
deleted file mode 100644
index aed3754..0000000
--- a/recipes-ids/suricata/files/emerging.rules.tar.gz
+++ /dev/null
diff --git a/recipes-ids/suricata/libhtp_0.5.30.bb b/recipes-ids/suricata/libhtp_0.5.31.bb
index 8305f70..8305f70 100644
--- a/recipes-ids/suricata/libhtp_0.5.30.bb
+++ b/recipes-ids/suricata/libhtp_0.5.31.bb
diff --git a/recipes-ids/suricata/suricata.inc b/recipes-ids/suricata/suricata.inc
index 54f91c5..1f4baff 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.4"
+VER = "4.1.5"
 SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
 
-SRC_URI[md5sum] = "cb8bf6b8330c44ae78dfb5b083a6fe82"
-SRC_URI[sha256sum] = "2da50d91f92adf8b1af930f388361f76424420b88f553f610e2780e4240f2009"
+SRC_URI[md5sum] = "0dfd68f6f4314c5c2eed7128112eff3b"
+SRC_URI[sha256sum] = "cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b"
diff --git a/recipes-ids/suricata/suricata_4.1.4.bb b/recipes-ids/suricata/suricata_4.1.5.bb
index f860af9..cda1c87 100644
--- a/recipes-ids/suricata/suricata_4.1.4.bb
+++ b/recipes-ids/suricata/suricata_4.1.5.bb
@@ -4,8 +4,6 @@ require suricata.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548"
 
-SRC_URI += "file://emerging.rules.tar.gz;name=rules"
-
 SRC_URI += " \
     file://volatiles.03_suricata \
     file://suricata.yaml \
@@ -14,9 +12,6 @@ SRC_URI += " \
     file://0001-af-packet-fix-build-on-recent-Linux-kernels.patch \
     "
 
-SRC_URI[rules.md5sum] = "205c5e5b54e489207ed892c03ad75b33"
-SRC_URI[rules.sha256sum] = "4aa81011b246875a57181c6a0569ca887845e366904bcaf0043220f33bd69798"
-
 inherit autotools-brokensep pkgconfig python3-dir systemd ptest
 
 CFLAGS += "-D_DEFAULT_SOURCE"