summaryrefslogtreecommitdiffstats
path: root/recipes-ids
diff options
context:
space:
mode:
authorClayton Casciato <majortomtosourcecontrol@gmail.com>2025-12-30 12:32:07 -0700
committerScott Murray <scott.murray@konsulko.com>2025-12-31 22:26:10 +0200
commit635238de190ed0281fbdecec6ed3a2a517f71bc6 (patch)
treed0d66b116b29adce25d15d131b2d185432b18492 /recipes-ids
parent2fc3c2748b2edafcab27dc38e988f60aaa2991d6 (diff)
downloadmeta-security-635238de190ed0281fbdecec6ed3a2a517f71bc6.tar.gz
suricata: update PACKAGECONFIG[jansson] option to required
jansson is required as of Suricata 5.0: https://github.com/OISF/suricata/commit/e49c40428e1b9f7e5dcdb5857c3978d5cb859fd9 This is still required in the latest release: https://github.com/OISF/suricata/blob/suricata-8.0.2/configure.ac#L828 On exclusion attempt: [...] | checking for jansson.h... no | checking for json_dump_callback in -ljansson... no | | ERROR: Jansson is now required. | | Go get it from your distribution or from: | http://www.digip.org/jansson/ | | Ubuntu/Debian: apt install libjansson-dev | CentOS: yum install jansson-devel | Fedora: dnf install jansson-devel | | NOTE: The following config.log files may provide further information. | NOTE: [...]/poky-whinlatter/build/tmp/work/cortexa57-poky-linux/suricata/7.0.13/sources/suricata-7.0.13/config.log | ERROR: configure failed | WARNING: exit code 1 from a shell command. ERROR: Task ([...]/poky-whinlatter/layers/meta-security/recipes-ids/suricata/suricata_7.0.13.bb:do_configure) failed with exit code '1' Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-ids')
-rw-r--r--recipes-ids/suricata/suricata_7.0.13.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes-ids/suricata/suricata_7.0.13.bb b/recipes-ids/suricata/suricata_7.0.13.bb
index 7298f1b..469e42d 100644
--- a/recipes-ids/suricata/suricata_7.0.13.bb
+++ b/recipes-ids/suricata/suricata_7.0.13.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd
7SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${PV}.tar.gz" 7SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${PV}.tar.gz"
8SRC_URI[sha256sum] = "bbc94cf0a297f4560c64569ed72867c799287defdaf6e6572ce769f48dd2559b" 8SRC_URI[sha256sum] = "bbc94cf0a297f4560c64569ed72867c799287defdaf6e6572ce769f48dd2559b"
9 9
10DEPENDS = "lz4 libhtp" 10DEPENDS = "jansson lz4 libhtp"
11 11
12SRC_URI += " \ 12SRC_URI += " \
13 file://volatiles.03_suricata \ 13 file://volatiles.03_suricata \
@@ -27,6 +27,7 @@ EXTRA_OECONF += " --disable-debug \
27 --enable-non-bundled-htp \ 27 --enable-non-bundled-htp \
28 --disable-suricata-update \ 28 --disable-suricata-update \
29 --with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR} \ 29 --with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR} \
30 --with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR} \
30 " 31 "
31 32
32CARGO_SRC_DIR = "rust" 33CARGO_SRC_DIR = "rust"
@@ -37,7 +38,7 @@ CARGO_BUILD_FLAGS:append = " --offline"
37B = "${S}" 38B = "${S}"
38 39
39# nfnetlink has a dependancy to meta-networking 40# nfnetlink has a dependancy to meta-networking
40PACKAGECONFIG ??= "jansson file pcre2 yaml python pcap cap-ng net" 41PACKAGECONFIG ??= "file pcre2 yaml python pcap cap-ng net"
41PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}" 42PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}"
42 43
43PACKAGECONFIG[pcre2] = "--with-libpcre2-includes=${STAGING_INCDIR} --with-libpcre2-libraries=${STAGING_LIBDIR}, ,libpcre2 ," 44PACKAGECONFIG[pcre2] = "--with-libpcre2-includes=${STAGING_INCDIR} --with-libpcre2-libraries=${STAGING_LIBDIR}, ,libpcre2 ,"
@@ -48,7 +49,6 @@ PACKAGECONFIG[net] = "--with-libnet-includes=${STAGING_INCDIR} --with-libnet-lib
48PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ," 49PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ,"
49PACKAGECONFIG[nfq] = "--enable-nfqueue, --disable-nfqueue,libnetfilter-queue," 50PACKAGECONFIG[nfq] = "--enable-nfqueue, --disable-nfqueue,libnetfilter-queue,"
50 51
51PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson"
52PACKAGECONFIG[file] = ",,file, file" 52PACKAGECONFIG[file] = ",,file, file"
53PACKAGECONFIG[python] = "--enable-python, --disable-python, python3, python3-core" 53PACKAGECONFIG[python] = "--enable-python, --disable-python, python3, python3-core"
54PACKAGECONFIG[unittests] = "--enable-unittests, --disable-unittests," 54PACKAGECONFIG[unittests] = "--enable-unittests, --disable-unittests,"
@@ -138,4 +138,6 @@ PACKAGES =+ "${PN}-python"
138FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d" 138FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
139FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" 139FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
140 140
141RDEPENDS:${PN} += "jansson"
142
141CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml" 143CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml"