diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-09 17:30:40 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-09 17:30:41 +0300 |
commit | 3216ad4ee59bf0fb9090f6a26f037232580719c7 (patch) | |
tree | 40276361d54d057253b7db447310a60a945e9459 /meta-security/recipes-ids/suricata | |
parent | 63ae87823ca5774411cb29a7aebf35efae85f0b3 (diff) | |
download | openbmc-3216ad4ee59bf0fb9090f6a26f037232580719c7.tar.xz |
meta-security: subtree update:86ba098074..caaeb67863
Armin Kuster (2):
suricata/libhtp: update to 4.1.5/0.5.31
suricata-update: add package to pull rules
Change-Id: I474794e67126b8f197432a06ce76a9fcde842608
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-ids/suricata')
-rw-r--r-- | meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch | 10 | ||||
-rw-r--r-- | meta-security/recipes-ids/suricata/files/emerging.rules.tar.gz | bin | 2252393 -> 0 bytes | |||
-rw-r--r-- | meta-security/recipes-ids/suricata/libhtp_0.5.31.bb (renamed from meta-security/recipes-ids/suricata/libhtp_0.5.30.bb) | 0 | ||||
-rw-r--r-- | meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb | 15 | ||||
-rw-r--r-- | meta-security/recipes-ids/suricata/suricata.inc | 6 | ||||
-rw-r--r-- | meta-security/recipes-ids/suricata/suricata_4.1.5.bb (renamed from meta-security/recipes-ids/suricata/suricata_4.1.4.bb) | 5 |
6 files changed, 23 insertions, 13 deletions
diff --git a/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch b/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch index 74e9a56c1..530568b19 100644 --- a/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch +++ b/meta-security/recipes-ids/suricata/files/0001-af-packet-fix-build-on-recent-Linux-kernels.patch @@ -9,12 +9,12 @@ Signed-off-by: Armin kuster <akuster808@gmail.com> src/source-af-packet.c | 4 ++++ 1 file changed, 4 insertions(+) -Index: suricata-4.1.4/src/source-af-packet.c +Index: suricata-4.1.5/src/source-af-packet.c =================================================================== ---- suricata-4.1.4.orig/src/source-af-packet.c -+++ suricata-4.1.4/src/source-af-packet.c -@@ -64,6 +64,10 @@ - #include <sys/ioctl.h> +--- suricata-4.1.5.orig/src/source-af-packet.c ++++ suricata-4.1.5/src/source-af-packet.c +@@ -68,6 +68,10 @@ + #include <linux/sockios.h> #endif +#if HAVE_LINUX_SOCKIOS_H diff --git a/meta-security/recipes-ids/suricata/files/emerging.rules.tar.gz b/meta-security/recipes-ids/suricata/files/emerging.rules.tar.gz Binary files differdeleted file mode 100644 index aed375474..000000000 --- a/meta-security/recipes-ids/suricata/files/emerging.rules.tar.gz +++ /dev/null diff --git a/meta-security/recipes-ids/suricata/libhtp_0.5.30.bb b/meta-security/recipes-ids/suricata/libhtp_0.5.31.bb index 8305f7010..8305f7010 100644 --- a/meta-security/recipes-ids/suricata/libhtp_0.5.30.bb +++ b/meta-security/recipes-ids/suricata/libhtp_0.5.31.bb diff --git a/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb b/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb new file mode 100644 index 000000000..63f75e096 --- /dev/null +++ b/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb @@ -0,0 +1,15 @@ +SUMMARY = "The tool for updating your Suricata rules. " +HOMEPAGE = "http://suricata-ids.org/" +SECTION = "security Monitor/Admin" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" + +SRCREV = "dcd0f630e13463750efb1593ad3ccae1ae6c27d4" +SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.0.x'" + +S = "${WORKDIR}/git" + +inherit python3native setuptools3 + +RDEPENDS_${PN} = "python3-pyyaml" diff --git a/meta-security/recipes-ids/suricata/suricata.inc b/meta-security/recipes-ids/suricata/suricata.inc index 54f91c5e8..1f4baffcc 100644 --- a/meta-security/recipes-ids/suricata/suricata.inc +++ b/meta-security/recipes-ids/suricata/suricata.inc @@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" -VER = "4.1.4" +VER = "4.1.5" SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" -SRC_URI[md5sum] = "cb8bf6b8330c44ae78dfb5b083a6fe82" -SRC_URI[sha256sum] = "2da50d91f92adf8b1af930f388361f76424420b88f553f610e2780e4240f2009" +SRC_URI[md5sum] = "0dfd68f6f4314c5c2eed7128112eff3b" +SRC_URI[sha256sum] = "cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b" diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.4.bb b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb index f860af97a..cda1c870f 100644 --- a/meta-security/recipes-ids/suricata/suricata_4.1.4.bb +++ b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb @@ -4,8 +4,6 @@ require suricata.inc LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" -SRC_URI += "file://emerging.rules.tar.gz;name=rules" - SRC_URI += " \ file://volatiles.03_suricata \ file://suricata.yaml \ @@ -14,9 +12,6 @@ SRC_URI += " \ file://0001-af-packet-fix-build-on-recent-Linux-kernels.patch \ " -SRC_URI[rules.md5sum] = "205c5e5b54e489207ed892c03ad75b33" -SRC_URI[rules.sha256sum] = "4aa81011b246875a57181c6a0569ca887845e366904bcaf0043220f33bd69798" - inherit autotools-brokensep pkgconfig python3-dir systemd ptest CFLAGS += "-D_DEFAULT_SOURCE" |