From patchwork Tue Feb 22 12:51:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5268 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K2zbh5GhNz3xgV for ; Tue, 22 Feb 2022 12:52:48 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K2zb00mWrz5fk; Tue, 22 Feb 2022 12:52:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2zZy5vTmz32Mh; Tue, 22 Feb 2022 12:52:10 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K2zZp2355z2yXK for ; Tue, 22 Feb 2022 12:52:02 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4K2zZm5rSMz5XQ; Tue, 22 Feb 2022 12:52:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645534321; 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: in-reply-to:in-reply-to:references:references; bh=QjWaP314YH2wsxvi1C+nS3HPs7xIBQhzkQ4qQ+6J2W8=; b=CPz3ZKj7Ni0x2VdM7VDdC6cT3nEB5J/eimijjRt52f/jk1E3Mqnsdf2Nm/uyk8VHvgajTw AorSUCncCOJyOACQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645534321; 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: in-reply-to:in-reply-to:references:references; bh=QjWaP314YH2wsxvi1C+nS3HPs7xIBQhzkQ4qQ+6J2W8=; b=fxcdri9LUSwxSJNdb+qPU2Vs2F8PciVufVkzojuzoTsMmb3LKB3MSt52BhAyrO6XsmsjhC L0mrrRW32Dx+m13nDNO35Ttviq34Y0O5W3fFwXeYXjQwdlZk/Dzh7aKfPdi4e2V2SZqOFD kzqiRcTr/yiHuBGWOvdL9C055R5MpWwHYNDP9PRFPlihc4OBW+Dabc2fTd7XoTpuv1Chn6 B6N5MsgX16fS3gdwom2b4KJZTI4oXi7fb/HOoKytgAKoaAX0IpPiS2h3f3KklIAQ52Xjbc Tdwvk+5BAlcoZwRa8SpZe05dZIu2QnTxTA4D7VB3WRGuxg+iXLCFHQwWubRHvg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 47/50] suricata: Fix check for level one cache line size Date: Tue, 22 Feb 2022 12:51:32 +0000 Message-Id: <20220222125135.1211290-48-michael.tremer@ipfire.org> In-Reply-To: <20220222125135.1211290-1-michael.tremer@ipfire.org> References: <20220222125135.1211290-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" riscv64 does not return any value on our machine (maybe because it is emulated?). "undefined" is however seen as a valid value, which makes the build fail. Signed-off-by: Michael Tremer --- lfs/suricata | 1 + ...5.0.8-fix-level1-cache-line-size-detection.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch diff --git a/lfs/suricata b/lfs/suricata index a870e3668..65f5e504c 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0-stream-tcp-Handle-retransmitted-SYN-with-TSval.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-disable-sid-2210059.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch cd $(DIR_APP) && LDFLAGS="$(LDFLAGS)" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch b/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch new file mode 100644 index 000000000..a6747a2a7 --- /dev/null +++ b/src/patches/suricata-5.0.8-fix-level1-cache-line-size-detection.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index d56d3a550..81abf8f00 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2313,7 +2313,7 @@ fi + AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no") + if test "$HAVE_GETCONF_CMD" != "no"; then + CLS=$(getconf LEVEL1_DCACHE_LINESIZE) +- if [test "$CLS" != "" && test "$CLS" != "0"]; then ++ if [test "$CLS" != "" && test "$CLS" != "0" && test "$CLS" != "undefined"]; then + AC_DEFINE_UNQUOTED([CLS],[${CLS}],[L1 cache line size]) + else + AC_DEFINE([CLS],[64],[L1 cache line size])