From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 23 Jan 2020 09:44:26 +0000 (+0100)
Subject: Suricata: Update to 5.0.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a65ea1b7291337e6de44a2d4696a00bbf23f7db;p=people%2Fpmueller%2Fipfire-2.x.git

Suricata: Update to 5.0.1

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/suricata b/lfs/suricata
index b3d22003bf..e17eb5e083 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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.1.6
+VER        = 5.0.1
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = da5de1e8053f05cbd295793210117d34
+$(DL_FILE)_MD5 = 8ba12183d5d4b086755e6f510f2149e2
 
 install : $(TARGET)
 
@@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-python \
 		--with-libjansson-libraries=/usr/lib \
 		--with-libjansson-includes=/usr/include \
-		--disable-suricata-update
+		--disable-suricata-update \
+		--enable-rust
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make install-conf
diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index 5dc4082623..29e58a7e29 100644
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -6,7 +6,7 @@
 #
 # Author      : Stefan Schantl <stefan.schantl@ipfire.org>
 #
-# Version     : 01.02
+# Version     : 01.03
 #
 # Notes       :
 #
@@ -159,11 +159,11 @@ case "$1" in
 		cpu_count=$(get_cpu_count)
 
 		# Numer of NFQUES.
-		NFQUEUES=
+		NFQUEUES="-q 0"
 
-		for i in $(seq 0 $((cpu_count-1)) ); do
-			NFQUEUES+="-q $i "
-		done
+		if [ $cpu_count -gt "1" ]; then
+			NFQUEUES+=":$(($cpu_count-1))"
+		fi
 
 		# Check if the IDS should be started.
 		if [ "$ENABLE_IDS" == "on" ]; then