From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/3] Suricata: Update to 5.0.1
Date: Thu, 23 Jan 2020 10:44:26 +0100
Message-ID: <20200123094428.3295-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2572034306798939795=="
List-Id: <development.lists.ipfire.org>

--===============2572034306798939795==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 lfs/suricata                    | 10 ++++++----
 src/initscripts/system/suricata | 10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lfs/suricata b/lfs/suricata
index b3d22003b..e17eb5e08 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 @@
=20
 include Config
=20
-VER        =3D 4.1.6
+VER        =3D 5.0.1
=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)_MD5 =3D da5de1e8053f05cbd295793210117d34
+$(DL_FILE)_MD5 =3D 8ba12183d5d4b086755e6f510f2149e2
=20
 install : $(TARGET)
=20
@@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-python \
 		--with-libjansson-libraries=3D/usr/lib \
 		--with-libjansson-includes=3D/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 5dc408262..29e58a7e2 100644
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -6,7 +6,7 @@
 #
 # Author      : Stefan Schantl <stefan.schantl(a)ipfire.org>
 #
-# Version     : 01.02
+# Version     : 01.03
 #
 # Notes       :
 #
@@ -159,11 +159,11 @@ case "$1" in
 		cpu_count=3D$(get_cpu_count)
=20
 		# Numer of NFQUES.
-		NFQUEUES=3D
+		NFQUEUES=3D"-q 0"
=20
-		for i in $(seq 0 $((cpu_count-1)) ); do
-			NFQUEUES+=3D"-q $i "
-		done
+		if [ $cpu_count -gt "1" ]; then
+			NFQUEUES+=3D":$(($cpu_count-1))"
+		fi
=20
 		# Check if the IDS should be started.
 		if [ "$ENABLE_IDS" =3D=3D "on" ]; then
--=20
2.25.0.rc0


--===============2572034306798939795==--