Revert "suricata: Enable rust support"

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

diff --git a/lfs/suricata b/lfs/suricata
index 2e7a5c5dc43cb7f2335e561e15d8f8a5782fb4f0..12dcfe08c9ebebd6e1a65cd95e4c540ff564308a 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-2019  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,7 +24,7 @@
 
 include Config
 
-VER        = 4.0.6
+VER        = 4.1.5
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e8e9a401fef3b3ca1027c268c38c8f4b
+$(DL_FILE)_MD5 = 0dfd68f6f4314c5c2eed7128112eff3b
 
 install : $(TARGET)
 
@@ -78,7 +78,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --disable-gccmarch-native \
                --enable-non-bundled-htp \
                --enable-nfqueue \
-               --disable-static
+               --disable-static \
+               --disable-python \
+               --with-libjansson-libraries=/usr/lib \
+               --with-libjansson-includes=/usr/include \
+               --disable-suricata-update
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make install-conf
@@ -89,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Install IPFire related config file.
        install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
 
+       # Remove shipped rules.
+       rm -rvf /usr/share/suricata
+
        # Create emtpy rules directory.
        -mkdir -p /var/lib/suricata
 
@@ -96,11 +103,18 @@ $(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
 
+       # Set correct ownership for /var/log/suricata.
+       chown suricata:suricata /var/log/suricata
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)