diff options
Diffstat (limited to 'meta-security/recipes-ids')
-rw-r--r-- | meta-security/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch | 28 | ||||
-rw-r--r-- | meta-security/recipes-ids/samhain/samhain.inc | 1 | ||||
-rw-r--r-- | meta-security/recipes-ids/suricata/python3-suricata-update_1.2.1.bb (renamed from meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb) | 8 |
3 files changed, 34 insertions, 3 deletions
diff --git a/meta-security/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch b/meta-security/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch new file mode 100644 index 000000000..72cb8806c --- /dev/null +++ b/meta-security/recipes-ids/samhain/files/samhain-fix-initializer-element-is-not-constant.patch @@ -0,0 +1,28 @@ +Fix error when compile for powerpc: + +| x_sh_dbIO.c: In function 'swap_short': +| x_sh_dbIO.c:229:36: error: initializer element is not constant +| 229 | static unsigned short ooop = *iptr; +| | ^ + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/sh_dbIO.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sh_dbIO.c b/src/sh_dbIO.c +index b547ac5..23a9621 100644 +--- a/src/sh_dbIO.c ++++ b/src/sh_dbIO.c +@@ -226,7 +226,8 @@ static unsigned short * swap_short (unsigned short * iptr) + else + { + /* alignment problem */ +- static unsigned short ooop = *iptr; ++ static unsigned short ooop; ++ ooop = *iptr; + unsigned short hi = (ooop & 0xff00); + unsigned short lo = (ooop & 0xff); + ooop = (lo << 8) | (hi >> 8); diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index 6a2eb0855..0148e46cf 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -18,6 +18,7 @@ SRC_URI = "https://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://samhain-avoid-searching-host-for-postgresql.patch \ file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \ file://fix-build-with-new-version-attr.patch \ + file://samhain-fix-initializer-element-is-not-constant.patch \ " SRC_URI[sha256sum] = "3e57574036d5055e9557ec5095818b419ea6c4365370fc2ccce1e9f87f9fad08" diff --git a/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb b/meta-security/recipes-ids/suricata/python3-suricata-update_1.2.1.bb index 732ca9a11..bbdce69ab 100644 --- a/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb +++ b/meta-security/recipes-ids/suricata/python3-suricata-update_1.2.1.bb @@ -5,11 +5,13 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" -SRCREV = "9630630ffc493ca26299d174ee2066aa1405b2d4" -SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.1.x'" +SRCREV = "50e857f75e576e239d8306a6ac55946a1ce252a6" +SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.2.x'" S = "${WORKDIR}/git" inherit python3native python3targetconfig setuptools3 -RDEPENDS_${PN} = "python3-pyyaml" +RDEPENDS_${PN} = "python3-pyyaml python3-logging python3-compression" + +BBCLASSEXTEND = "native nativesdk" |