diff mbox series

[meta-security,17/17] suricata: remove build paths

Message ID 20240725090131.75860-17-mikko.rapeli@linaro.org
State New
Headers show
Series [meta-security,01/17] bastille: UNPACKDIR fixes | expand

Commit Message

Mikko Rapeli July 25, 2024, 9:01 a.m. UTC 
Remove build time tool paths from build info
which gets embedded into binaries.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 ...uricata-remove-paths-from-build-info.patch | 56 +++++++++++++++++++
 recipes-ids/suricata/suricata_7.0.0.bb        |  1 +
 2 files changed, 57 insertions(+)
 create mode 100644 recipes-ids/suricata/files/0001-suricata-remove-paths-from-build-info.patch
diff mbox series

Patch

diff --git a/recipes-ids/suricata/files/0001-suricata-remove-paths-from-build-info.patch b/recipes-ids/suricata/files/0001-suricata-remove-paths-from-build-info.patch
new file mode 100644
index 0000000..ebd1433
--- /dev/null
+++ b/recipes-ids/suricata/files/0001-suricata-remove-paths-from-build-info.patch
@@ -0,0 +1,56 @@ 
+From 3d11a6a8c764e4af2f24cc4cf56b4943a3aa212a Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <mikko.rapeli@linaro.org>
+Date: Thu, 25 Jul 2024 08:31:21 +0000
+Subject: [PATCH] suricata: remove paths from build info
+
+Remove paths etc from build info to fix build reproduction
+issues.
+
+Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Upstream-Status: Inappropriate [configuration]
+
+diff --git a/configure.ac b/configure.ac
+index 5258f3d..9712c9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2632,13 +2632,13 @@ SURICATA_BUILD_CONF="Suricata Configuration:
+ 
+   Rust support:                            ${enable_rust}
+   Rust strict mode:                        ${enable_rust_strict}
+-  Rust compiler path:                      ${RUSTC}
++  Rust compiler path:                      
+   Rust compiler version:                   ${rust_compiler_version}
+-  Cargo path:                              ${CARGO}
++  Cargo path:                              
+   Cargo version:                           ${cargo_version_output}
+ 
+   Python support:                          ${enable_python}
+-  Python path:                             ${python_path}
++  Python path:                             
+   Install suricatactl:                     ${install_suricatactl}
+   Install suricatasc:                      ${install_suricatactl}
+   Install suricata-update:                 ${install_suricata_update}${install_suricata_update_reason}
+@@ -2667,13 +2667,13 @@ Generic build parameters:
+   --localstatedir                          ${CONFIGURE_LOCALSTATEDIR}
+   --datarootdir                            ${CONFIGURE_DATAROOTDIR}
+ 
+-  Host:                                    ${host}
+-  Compiler:                                ${CC} (exec name) / ${compiler} (real)
++  Host:                                    
++  Compiler:                                
+   GCC Protect enabled:                     ${enable_gccprotect}
+   GCC march native enabled:                ${enable_gccmarch_native}
+   GCC Profile enabled:                     ${enable_gccprofile}
+   Position Independent Executable enabled: ${enable_pie}
+-  CFLAGS                                   ${CFLAGS}
++  CFLAGS                                   
+   PCAP_CFLAGS                              ${PCAP_CFLAGS}
+   SECCFLAGS                                ${SECCFLAGS}"
+ 
+-- 
+2.34.1
+
diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb
index d87cebd..35ac8c0 100644
--- a/recipes-ids/suricata/suricata_7.0.0.bb
+++ b/recipes-ids/suricata/suricata_7.0.0.bb
@@ -10,6 +10,7 @@  SRC_URI[sha256sum] = "7bcd1313118366451465dc3f8385a3f6aadd084ffe44dd257dda810586
 DEPENDS = "lz4 libhtp"
 
 SRC_URI += " \
+    file://0001-suricata-remove-paths-from-build-info.patch \
     file://volatiles.03_suricata \
     file://tmpfiles.suricata \
     file://suricata.yaml \