From 3b343eb34d5a3b64845854b8cd1031c39a6c891c Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Tue, 21 Feb 2017 09:46:42 -0800
Subject: [PATCH] suricata: update to 3.2.1

cleaned up ptyhon package creation.
dropped patch no longer needed

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 recipes-security/suricata/suricata.inc         |  6 +++---
 .../{suricata_3.1.3.bb => suricata_3.2.1.bb}   | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename recipes-security/suricata/{suricata_3.1.3.bb => suricata_3.2.1.bb} (84%)

diff --git a/recipes-security/suricata/suricata.inc b/recipes-security/suricata/suricata.inc
index bf3e6ad..3ce7aad 100644
--- a/recipes-security/suricata/suricata.inc
+++ b/recipes-security/suricata/suricata.inc
@@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-VER = "3.1.3"
+VER = "3.2.1"
 SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
 
-SRC_URI[md5sum] = "7242f9b2cb96d27d5e9f8ff085c5029e"
-SRC_URI[sha256sum] = "bd89c269e29b03a8898ccabccfb7fcab11c1aa036444772e117705f3b37b4174"
+SRC_URI[md5sum] = "61b5cbb70591ea8ff4b26a0b00214a54"
+SRC_URI[sha256sum] = "0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994"
diff --git a/recipes-security/suricata/suricata_3.1.3.bb b/recipes-security/suricata/suricata_3.2.1.bb
similarity index 84%
rename from recipes-security/suricata/suricata_3.1.3.bb
rename to recipes-security/suricata/suricata_3.2.1.bb
index ead568a..fe42fc1 100644
--- a/recipes-security/suricata/suricata_3.1.3.bb
+++ b/recipes-security/suricata/suricata_3.2.1.bb
@@ -4,12 +4,12 @@ require suricata.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548"
 
-SRC_URI += "file://no_libhtp_build.patch \
-            file://volatiles.03_suricata \
-            file://suricata.yaml \
-        "
+SRC_URI += " \
+           file://volatiles.03_suricata \
+           file://suricata.yaml \
+           "
 
-inherit autotools-brokensep pkgconfig
+inherit autotools-brokensep pkgconfig python-dir
 
 CFLAGS += "-D_DEFAULT_SOURCE"
 
@@ -33,6 +33,7 @@ PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-li
 PACKAGECONFIG[file] = ",,file, file"
 PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," 
 PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," 
+PACKAGECONFIG[python] = "--with-python, --without-python, python, python" 
 
 export logdir = "${localstatedir}/log"
 
@@ -52,7 +53,8 @@ fi
     ${bindir}/suricata -c ${sysconfdir}/suricata.yaml -i eth0 
 }
 
-FILES_${PN} += "${sysconfdir}/suricata ${logdir}/suricata"
-FILES_${PN}-dev += "/usr/lib/python2.7/site-packages"
+PACKAGES += "${PN}-python"
+FILES_${PN} = "${bindir}/suricata ${sysconfdir}/default ${sysconfdir}/suricata ${logdir}/suricata"
+FILES_${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
 
-RDEPENDS_${PN} += " python"
+RDEPENDS_${PN}-python += "python"