From patchwork Thu Jan 23 09:44:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2716 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 483HRl3N1tz3xY5 for ; Thu, 23 Jan 2020 09:44:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 483HRj6lBwz3NF; Thu, 23 Jan 2020 09:44:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1579772674; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=k9kvltx0jk5kBjf4iFq35wSz2DySBUziiWJFU6AvfYs=; b=xjDII6crnD2ovDRjbaotA4fARFbNe3kY2KGh9NGNp4JtbVkhTbc69yeSkY+5yjuXcaAI2Y R0+oRt0+kdduIbCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1579772674; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=k9kvltx0jk5kBjf4iFq35wSz2DySBUziiWJFU6AvfYs=; b=SVVg/Ons8GRRhw4Vo4C1/uJ2KcTtreYvaCf0/mz/X8SkcNPrTzAyzhTistNiCn35okgpYj RprLMIRD8r7tEB3XdivOKEmP3vQAh1S4I31EYFJr9pmLNJeDntAtiwkq1O/xVE6gAS5sSt MPQekoAs8DxbvNfSsNUqfMsoLhNIennu+1O5l53acm+g59mmDUXLNT0PLFEsMrG6KTQBLW ds+sQ5JMDQxvY7aqTHtJF/aQMp7raU270dyymtur7eW6PRwboB/h+0uyVke44jLPKtiEIW eu8x9/bze/xFqvxTQrU6bNR7sgwmmkYpdzCD6EqPTHwxlNuG+jBnSqghQp0o1g== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 483HRj53bzz2y0t; Thu, 23 Jan 2020 09:44:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 483HRh1y16z2xdK for ; Thu, 23 Jan 2020 09:44:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 483HRg3Rtzz1qY; Thu, 23 Jan 2020 09:44:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1579772671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=k9kvltx0jk5kBjf4iFq35wSz2DySBUziiWJFU6AvfYs=; b=AmyVKQ5mD9mkxC1hmu6nYMvoQTxhiswdRG8IcxUps3lBSAvf1jvMjMbh9couvmhqN+dDjZ jDKFnaZzZNj+R671eTa3jqT5qrRxqHoJZp6+qONuFCg6Qix69c+5yKVoFi135z8WWeC++x teyKxLe9DcWYDT6apFxjpywPer4VOrDlWYHRI6rFwrM4sHLGi0PApYatRJ0P0aBdBCQXxL WeQU892G/65/p0fxX6VzfzllTb82m/5OgV+mDFPObaJ6HwSwzTKiVjUHvzf4Ox5Tw/IhkO iq4EMRx/YD/ohsCHoUOg/KJljCXO5FNWSk5LiIY3mqcnaOPvkmrHR3KyYw9lfA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1579772671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=k9kvltx0jk5kBjf4iFq35wSz2DySBUziiWJFU6AvfYs=; b=QR/yGnCpyZIdX2vxpdrP9/qAKVeV1AdrbRNodG2blcXii4lGlPCivL4Cu2XjFb3yerEYFS A9OdpPnP5wsbbmDw== From: Stefan Schantl 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 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- 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 # +# Copyright (C) 2007-2020 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 @@ 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 5dc408262..29e58a7e2 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -6,7 +6,7 @@ # # Author : Stefan Schantl # -# 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