mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-11 15:00:34 +00:00
suricata: resolve TMPDIR QA issues in do_configure
ERROR: suricata-7.0.0-r0 do_package_qa: QA Issue: File /usr/bin/suricata
in package suricata contains reference to TMPDIR [buildpaths]
ERROR: suricata-7.0.0-r0 do_package_qa: QA Issue: File
/usr/src/debug/suricata/7.0.0/src/build-info.h in package suricata-src
contains reference to TMPDIR [buildpaths]
Address references when src/build-info.h is being written
This is similar to Debian's approach:
https://sources.debian.org/patches/suricata/1:7.0.10-1~bpo12%2B1/reproducible.patch/
Restore the "already-stripped" check and CFLAGS info
Original resolution in commit c0e3fecc3b ("suricata: fix QA warnings")
Signed-off-by: Clayton Casciato <majortomtosourcecontrol@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
committed by
Armin Kuster
parent
4082afb8a9
commit
277bf8f916
@@ -68,6 +68,8 @@ do_configure:prepend () {
|
||||
# use host for RUST_SURICATA_LIB_XC_DIR
|
||||
sed -i -e 's,\${host_alias},${RUST_HOST_SYS},' ${S}/configure.ac
|
||||
sed -i -e 's,libsuricata_rust.a,libsuricata.a,' ${S}/configure.ac
|
||||
# Address build configuration written to src/build-info.h
|
||||
sed -i -e 's,\(| sed -e '\''s/^/"/'\''\)\( |\),\1 -e '\''s#${WORKDIR}#\\.#g'\''\2,' ${S}/configure.ac
|
||||
autotools_do_configure
|
||||
}
|
||||
|
||||
@@ -126,10 +128,6 @@ do_install () {
|
||||
sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatasc
|
||||
sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatactl
|
||||
sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${libdir}/suricata/python/suricata/sc/suricatasc.py
|
||||
# The build process dumps config logs into the binary, remove them.
|
||||
sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${bindir}/suricata
|
||||
sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${bindir}/suricata
|
||||
sed -i -e 's#CFLAGS.*##g' ${D}${bindir}/suricata
|
||||
}
|
||||
|
||||
pkg_postinst_ontarget:${PN} () {
|
||||
@@ -147,4 +145,3 @@ FILES:${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d"
|
||||
FILES:${PN}-python = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}"
|
||||
|
||||
CONFFILES:${PN} = "${sysconfdir}/suricata/suricata.yaml"
|
||||
INSANE_SKIP:${PN} = "already-stripped"
|
||||
|
||||
Reference in New Issue
Block a user