suricata: update to 2.0.7

this includes CVE-2015-0928

moved patches and files to more generic dir name

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

7 files changed, 6 insertions, 4 deletions

diff --git a/recipes-security/suricata/suricata-2.0.6/no_libhtp_build.patch b/recipes-security/suricata/files/no_libhtp_build.patch
index 2ebf021..2ebf021 100644
--- a/recipes-security/suricata/suricata-2.0.6/no_libhtp_build.patch
+++ b/recipes-security/suricata/files/no_libhtp_build.patch
diff --git a/recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch b/recipes-security/suricata/files/no_pcap_pkgconf_check.patch
index ba9ff90..ba9ff90 100644
--- a/recipes-security/suricata/suricata-2.0.6/no_pcap_pkgconf_check.patch
+++ b/recipes-security/suricata/files/no_pcap_pkgconf_check.patch
diff --git a/recipes-security/suricata/suricata-2.0.6/suricata.yaml b/recipes-security/suricata/files/suricata.yaml
index 90417b0..90417b0 100644
--- a/recipes-security/suricata/suricata-2.0.6/suricata.yaml
+++ b/recipes-security/suricata/files/suricata.yaml
diff --git a/recipes-security/suricata/suricata-2.0.6/volatiles.03_suricata b/recipes-security/suricata/files/volatiles.03_suricata
index 4627bd3..4627bd3 100644
--- a/recipes-security/suricata/suricata-2.0.6/volatiles.03_suricata
+++ b/recipes-security/suricata/files/volatiles.03_suricata
diff --git a/recipes-security/suricata/libhtp_0.5.16.bb b/recipes-security/suricata/libhtp_0.5.17.bb
index 9d07133..7390e20 100644
--- a/recipes-security/suricata/libhtp_0.5.16.bb
+++ b/recipes-security/suricata/libhtp_0.5.17.bb
@@ -4,10 +4,12 @@ require suricata.inc
 
 LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8"
 
+DEPENDS = "zlib"
+
 inherit autotools pkgconfig
 
 CFLAGS += "-D_DEFAULT_SOURCE"
 
-S = "${WORKDIR}/suricata-2.0.6/${BPN}"
+S = "${WORKDIR}/suricata-2.0.7/${BPN}"
 
 RDEPENDS_${PN} += "zlib"
diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc
index a7f95b1..79622dc 100644
--- a/recipes-security/suricata/suricata.inc
+++ b/recipes-security/suricata/suricata.inc
@@ -2,7 +2,7 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-2.0.6.tar.gz"
+SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-2.0.7.tar.gz"
 
-SRC_URI[md5sum] = "14bfb3adc184d4da321c93ed9abae500"
-SRC_URI[sha256sum] = "e833e35ea3b6029bbdef81660af22e8f563494eac85d97618d761ce1b69c78ec"
+SRC_URI[md5sum] = "43cd7dd958d434c580426020079914d7"
+SRC_URI[sha256sum] = "c5c3ccebeecbace39df0ff2d50ec4515b541103ffaa5e33cd1dc79d4955c0dfd"
diff --git a/recipes-security/suricata/suricata_2.0.6.bb b/recipes-security/suricata/suricata_2.0.7.bb
index 7e99791..7e99791 100644
--- a/recipes-security/suricata/suricata_2.0.6.bb
+++ b/recipes-security/suricata/suricata_2.0.7.bb