From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/7] suricata: Update to version 7.0.2 Date: Tue, 06 Feb 2024 22:27:33 +0100 Message-ID: <20240206212739.3270712-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8679514433664122623==" List-Id: --===============8679514433664122623== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Update from version 6.0.15 to 7.0.2 - Update of rootfile - suricata 7.0.2 requires libhtp >=3D 0.5.45 it also requires libelf.so.1 for execution. Previous suricata versions onl= y required libelf for building. libelf or elfutils are not mentioned anywhere in the = changelog - Without elfutils available during starting then suricata fails to start due= to libelf.so.1 not being available. - Tested out suricata7 with elfutils on my vm testbed and it successfully sta= rted. - The suricata-5.0.8 patch has been removed as it got applied to configure.ac= but this is not available in suricata-7.0.2. It looks like that patch was never act= ually used in suricata as all the builds I checked used the configure file from the sour= ce tarball and the configure was never created by running autoconf on the configure.ac - Changelog is too large to include here. Details can be found in the ChangeL= og file in the source tarball Fixes: Bug#13516 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/suricata | 3 ++- lfs/suricata | 7 +++---- ...5.0.8-fix-level1-cache-line-size-detection.patch | 13 ------------- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 src/patches/suricata/suricata-5.0.8-fix-level1-cache-line= -size-detection.patch diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suric= ata index c414cf61b..53224d006 100644 --- a/config/rootfiles/common/suricata +++ b/config/rootfiles/common/suricata @@ -1,7 +1,6 @@ etc/suricata etc/suricata/suricata.yaml usr/bin/suricata -#usr/include/suricata-plugin.h usr/sbin/convert-ids-backend-files #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS @@ -27,6 +26,7 @@ usr/share/suricata #usr/share/suricata/rules/dnp3-events.rules #usr/share/suricata/rules/dns-events.rules #usr/share/suricata/rules/files.rules +#usr/share/suricata/rules/ftp-events.rules #usr/share/suricata/rules/http-events.rules #usr/share/suricata/rules/http2-events.rules #usr/share/suricata/rules/ipsec-events.rules @@ -35,6 +35,7 @@ usr/share/suricata #usr/share/suricata/rules/mqtt-events.rules #usr/share/suricata/rules/nfs-events.rules #usr/share/suricata/rules/ntp-events.rules +#usr/share/suricata/rules/quic-events.rules #usr/share/suricata/rules/rfb-events.rules #usr/share/suricata/rules/smb-events.rules #usr/share/suricata/rules/smtp-events.rules diff --git a/lfs/suricata b/lfs/suricata index 2e71ba49d..baead19e7 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2023 IPFire Team = # +# Copyright (C) 2007-2024 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 6.0.15 +VER =3D 7.0.2 =20 THISAPP =3D suricata-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_BLAKE2 =3D cf5c2d5760e52f0b4eb0276feb89e056d74ef5478e3158a047fbde= c14022aa6e0ba986b7ee9f9ec49e2ebb3f206c7d71ad8ce8dc4eb9a6b48b4ba38c96c2f1c6 +$(DL_FILE)_BLAKE2 =3D 5af50f6f0d91ba233b1cc373c073e72824f10d6df20c27041d5fd1= 1d25c7be6b1941beccf0fb18612d6277eaa7bb1d47d8fedbd34f580ba87d352c45d4d51725 =20 install : $(TARGET) =20 @@ -71,7 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-disa= ble-sid-2210059.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata/suricata-5.0.= 8-fix-level1-cache-line-size-detection.patch cd $(DIR_APP) && LDFLAGS=3D"$(LDFLAGS)" ./configure \ --prefix=3D/usr \ --sysconfdir=3D/etc \ diff --git a/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-d= etection.patch b/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-si= ze-detection.patch deleted file mode 100644 index f1529812d..000000000 --- a/src/patches/suricata/suricata-5.0.8-fix-level1-cache-line-size-detectio= n.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d56d3a550..81abf8f00 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2424,7 +2424,7 @@ fi - AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no") - if test "$HAVE_GETCONF_CMD" !=3D "no"; then - CLS=3D$(getconf LEVEL1_DCACHE_LINESIZE) -- if [test "$CLS" !=3D "" && test "$CLS" !=3D "0"]; then -+ if [test "$CLS" !=3D "" && test "$CLS" !=3D "0" && test "$CLS" !=3D= "undefined"]; then - AC_DEFINE_UNQUOTED([CLS],[${CLS}],[L1 cache line size]) - else - AC_DEFINE([CLS],[64],[L1 cache line size]) --=20 2.43.0 --===============8679514433664122623==--