suricata: update to 4.0.0

libhtp updated in // as suricata contains the sources

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

recipes-security/suricata/suricata.inc

@@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
 LICENSE = "GPLv2"
 
-VER = "3.2.1"
+VER = "4.0.0"
 SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz"
 
-SRC_URI[md5sum] = "61b5cbb70591ea8ff4b26a0b00214a54"
-SRC_URI[sha256sum] = "0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994"
+SRC_URI[md5sum] = "41fb91b4cbc6705b353e4bdd02c3df4b"
+SRC_URI[sha256sum] = "6b8b183a8409829ca92c71854cc1abed45f04ccfb7f14c08211f4edf571fa577"

recipes-security/suricata/suricata_4.0.0.bb

@@ -9,7 +9,7 @@ SRC_URI += " \
            file://suricata.yaml \
            "
 
-inherit autotools-brokensep pkgconfig python-dir
+inherit autotools-brokensep pkgconfig python-dir 
 
 CFLAGS += "-D_DEFAULT_SOURCE"
 
@@ -33,7 +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" 
+PACKAGECONFIG[python] = "--enable-python, --disable-python, python, python" 
 
 export logdir = "${localstatedir}/log"
 
@@ -57,4 +57,4 @@ PACKAGES += "${PN}-python"
 FILES_${PN} = "${bindir}/suricata ${sysconfdir}/default ${sysconfdir}/suricata ${logdir}/suricata"
 FILES_${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
 
-RDEPENDS_${PN}-python += "python"
+RDEPENDS_${PN}-python = "python"