[yocto] [meta-security][PATCH 1/2] suricata: update to 3.0

[Armin Kuster]

removed patch no longer needded.
LIC_FILES_CHKSUM changed do to copyright date updates.

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../suricata/files/no_pcap_pkgconf_check.patch     | 26 ----------------------
 recipes-security/suricata/libhtp_0.5.18.bb         |  2 +-
 recipes-security/suricata/suricata.inc             |  7 +++---
 .../{suricata_2.0.11.bb => suricata_3.0.bb}        |  3 +--
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-security/suricata/files/no_pcap_pkgconf_check.patch
 rename recipes-security/suricata/{suricata_2.0.11.bb => suricata_3.0.bb} (95%)

diff --git a/recipes-security/suricata/files/no_pcap_pkgconf_check.patch b/recipes-security/suricata/files/no_pcap_pkgconf_check.patch
deleted file mode 100644
index ba9ff90..0000000
--- a/recipes-security/suricata/files/no_pcap_pkgconf_check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: suricata-2.0.6/configure
-===================================================================
---- suricata-2.0.6.orig/configure
-+++ suricata-2.0.6/configure
-@@ -17372,8 +17372,6 @@ fi
- 
-         if test "$HAVE_PCAP_CONFIG" = "no"; then
-             CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1"
--        else
--            CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1"
-         fi
-     else
-         CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=0"
-Index: suricata-2.0.6/configure.ac
-===================================================================
---- suricata-2.0.6.orig/configure.ac
-+++ suricata-2.0.6/configure.ac
-@@ -1060,8 +1060,6 @@
-         AC_PATH_PROG(HAVE_PCAP_CONFIG, pcap-config, "no")
-         if test "$HAVE_PCAP_CONFIG" = "no"; then
-             CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=1"
--        else
--            CFLAGS="${CFLAGS} `pcap-config --defines` `pcap-config --cflags` -DLIBPCAP_VERSION_MAJOR=1"
-         fi
-     else
-         CFLAGS="${CFLAGS} -DLIBPCAP_VERSION_MAJOR=0"
diff --git a/recipes-security/suricata/libhtp_0.5.18.bb b/recipes-security/suricata/libhtp_0.5.18.bb
index 734b341..8305f70 100644
--- a/recipes-security/suricata/libhtp_0.5.18.bb
+++ b/recipes-security/suricata/libhtp_0.5.18.bb
@@ -2,7 +2,7 @@ SUMMARY = "LibHTP is a security-aware parser for the HTTP protocol and the relat
 
 require suricata.inc
 
-LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8"
+LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548"
 
 DEPENDS = "zlib"
 
diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc
index 5684386..38b9572 100644
--- a/recipes-security/suricata/suricata.inc
+++ b/recipes-security/suricata/suricata.inc
@@ -2,8 +2,9 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-VER = "2.0.11"
+VER = "3.0"
 SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
 
-SRC_URI[md5sum] = "4c05eebfb87c3c1ff51460f4e6318b9a"
-SRC_URI[sha256sum] = "c607f1e18e5636830f42a83f7c67e1466f07db82853f3a9dba4ab8c6c3bc656e"
+SRC_URI[md5sum] = "a964af69263592c625b56f72d49e8d24"
+SRC_URI[sha256sum] = "4b8feb398a0800c955fe24aa31ca446c539e79492155717e826473f902c8e65a"
+
diff --git a/recipes-security/suricata/suricata_2.0.11.bb b/recipes-security/suricata/suricata_3.0.bb
similarity index 95%
rename from recipes-security/suricata/suricata_2.0.11.bb
rename to recipes-security/suricata/suricata_3.0.bb
index 21b22d1..ead568a 100644
--- a/recipes-security/suricata/suricata_2.0.11.bb
+++ b/recipes-security/suricata/suricata_3.0.bb
@@ -2,10 +2,9 @@ SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detec
 
 require suricata.inc
 
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=1fbd81241fe252ec0f5658a521ab7dd8"
+LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548"
 
 SRC_URI += "file://no_libhtp_build.patch \
-            file://no_pcap_pkgconf_check.patch \
             file://volatiles.03_suricata \
             file://suricata.yaml \
         "
-- 
2.3.5