Removed several lfs options leading to: configure: WARNING: unrecognized options

[people/pmueller/ipfire-2.x.git] / lfs / suricata

diff --git a/lfs/suricata b/lfs/suricata
index 0a561ef8ba5c98ce28f5c38ca9df9ec8f39b5c06..055964e2923921d271b4704432473a0a32f3f8cd 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,13 +24,18 @@
 
 include Config
 
-VER        = 4.1.3
+VER        = 5.0.6
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = x86_64 i586 aarch64 armv5tel
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+       LDFLAGS += -latomic
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 35c4a8e6be3910831649a073950195df
+$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f
 
 install : $(TARGET)
 
@@ -70,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure \
+       cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
                --localstatedir=/var \
@@ -80,7 +85,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-nfqueue \
                --disable-static \
                --disable-python \
-               --disable-suricata-update
+               --with-libjansson-libraries=/usr/lib \
+               --with-libjansson-includes=/usr/include \
+               --disable-suricata-update \
+               --enable-rust
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make install-conf
@@ -101,8 +110,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # to the rules directory.
        mv /etc/suricata/*.config /var/lib/suricata
 
-       # Set correct ownership for /var/lib/suricata
-       chown nobody:nobody /var/lib/suricata
+       # Set correct permissions for the files.
+       chmod 644 /var/lib/suricata/*.config
+
+       # Set correct ownership for /var/lib/suricata and the
+       # contained files
+       chown -R nobody:nobody /var/lib/suricata
 
        # Create logging directory.
        -mkdir -p /var/log/suricata