diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-02-21 09:46:42 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-03-27 14:57:16 -0700 |
commit | 3b343eb34d5a3b64845854b8cd1031c39a6c891c (patch) | |
tree | a48434f886cf6a64b3535c964500cf6988df83ee | |
parent | 8b38c93f2387793fb03d082e47723002cf667ae9 (diff) | |
download | meta-security-3b343eb34d5a3b64845854b8cd1031c39a6c891c.tar.gz |
suricata: update to 3.2.1
cleaned up ptyhon package creation.
dropped patch no longer needed
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/suricata/suricata.inc | 6 | ||||
-rw-r--r-- | recipes-security/suricata/suricata_3.2.1.bb (renamed from recipes-security/suricata/suricata_3.1.3.bb) | 18 |
2 files changed, 13 insertions, 11 deletions
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/" | |||
2 | SECTION = "security Monitor/Admin" | 2 | SECTION = "security Monitor/Admin" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | 4 | ||
5 | VER = "3.1.3" | 5 | VER = "3.2.1" |
6 | SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" | 6 | SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "7242f9b2cb96d27d5e9f8ff085c5029e" | 8 | SRC_URI[md5sum] = "61b5cbb70591ea8ff4b26a0b00214a54" |
9 | SRC_URI[sha256sum] = "bd89c269e29b03a8898ccabccfb7fcab11c1aa036444772e117705f3b37b4174" | 9 | SRC_URI[sha256sum] = "0e0b0cf49016804bb2fb1fc4327341617e76a67902f4e03e0ef6d16c1d7d3994" |
diff --git a/recipes-security/suricata/suricata_3.1.3.bb b/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 | |||
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" |
6 | 6 | ||
7 | SRC_URI += "file://no_libhtp_build.patch \ | 7 | SRC_URI += " \ |
8 | file://volatiles.03_suricata \ | 8 | file://volatiles.03_suricata \ |
9 | file://suricata.yaml \ | 9 | file://suricata.yaml \ |
10 | " | 10 | " |
11 | 11 | ||
12 | inherit autotools-brokensep pkgconfig | 12 | inherit autotools-brokensep pkgconfig python-dir |
13 | 13 | ||
14 | CFLAGS += "-D_DEFAULT_SOURCE" | 14 | CFLAGS += "-D_DEFAULT_SOURCE" |
15 | 15 | ||
@@ -33,6 +33,7 @@ PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-li | |||
33 | PACKAGECONFIG[file] = ",,file, file" | 33 | PACKAGECONFIG[file] = ",,file, file" |
34 | PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," | 34 | PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," |
35 | PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," | 35 | PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," |
36 | PACKAGECONFIG[python] = "--with-python, --without-python, python, python" | ||
36 | 37 | ||
37 | export logdir = "${localstatedir}/log" | 38 | export logdir = "${localstatedir}/log" |
38 | 39 | ||
@@ -52,7 +53,8 @@ fi | |||
52 | ${bindir}/suricata -c ${sysconfdir}/suricata.yaml -i eth0 | 53 | ${bindir}/suricata -c ${sysconfdir}/suricata.yaml -i eth0 |
53 | } | 54 | } |
54 | 55 | ||
55 | FILES_${PN} += "${sysconfdir}/suricata ${logdir}/suricata" | 56 | PACKAGES += "${PN}-python" |
56 | FILES_${PN}-dev += "/usr/lib/python2.7/site-packages" | 57 | FILES_${PN} = "${bindir}/suricata ${sysconfdir}/default ${sysconfdir}/suricata ${logdir}/suricata" |
58 | FILES_${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" | ||
57 | 59 | ||
58 | RDEPENDS_${PN} += " python" | 60 | RDEPENDS_${PN}-python += "python" |