From 379faf9f4746c14c8df8521c245d6376dbfa33c3 Mon Sep 17 00:00:00 2001
From: Vincent Li <vincent.mc.li@gmail.com>
Date: Sat, 21 Dec 2024 15:44:54 -0800
Subject: [PATCH] suricata: enable compile and install suricata

add rust back and enable compile and install suricata

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
---
 config/rootfiles/common/suricata | 18 +++++++++---------
 lfs/rust                         |  7 ++++---
 make.sh                          |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 5db644ebe..8fe53f7e6 100644
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -1,8 +1,8 @@
-#etc/suricata
-#etc/suricata/suricata.yaml
-#usr/bin/suricata
-#usr/bin/suricata-watcher
-#usr/sbin/convert-ids-backend-files
+etc/suricata
+etc/suricata/suricata.yaml
+usr/bin/suricata
+usr/bin/suricata-watcher
+usr/sbin/convert-ids-backend-files
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS
 #usr/share/doc/suricata/Basic_Setup.txt
@@ -17,7 +17,7 @@
 #usr/share/man/man1/suricatactl-filestore.1
 #usr/share/man/man1/suricatactl.1
 #usr/share/man/man1/suricatasc.1
-#usr/share/suricata
+usr/share/suricata
 #usr/share/suricata/classification.config
 #usr/share/suricata/reference.config
 #usr/share/suricata/rules
@@ -44,9 +44,9 @@
 #usr/share/suricata/rules/stream-events.rules
 #usr/share/suricata/rules/tls-events.rules
 #usr/share/suricata/threshold.config
-#var/cache/suricata
-#var/lib/suricata
+var/cache/suricata
+var/lib/suricata
 #var/lib/suricata/data
-#var/log/suricata
+var/log/suricata
 #var/log/suricata/certs
 #var/log/suricata/files
diff --git a/lfs/rust b/lfs/rust
index d0a200d57..7b87d6d93 100644
--- a/lfs/rust
+++ b/lfs/rust
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 1.67.0
+VER        = 1.83.0
 
 # From https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers
 
 THISAPP    = rust-$(VER)
-DL_FILE    = $(THISAPP)-$(RUST_PLATFORM).tar.gz
+DL_FILE    = $(THISAPP)-$(RUST_PLATFORM).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_PLATFORM)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -46,6 +46,7 @@ $(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = 3409ed876f430ff22eff792fe9f4
 $(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 82c17813fbb4a48451a207dbc7879bd7239e947e249ad24e6e098bd2e250cd8aae79ab37bbc2549cb9ffc3e24ef6e072380bbcaf8a620b02457db24f328d92ea
 $(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = d099645796f46769e15520b15771bb1886ee040bbee9de00f4983e8fe56c945a9afe1bded33f80c9196354d720ef09588d24468a751a8e2512688fef47a33496
 $(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = e5b0efa7114840535d5a0934a22510e850b05eb339eab42e561717281da993817df2e0a57082d73ed7898001885e4dbabcce1ebfaec611cf125e51acd5d75e8a
+$(THISAPP)-loongarch64-unknown-linux-gnu.tar.xz_BLAKE2 = b1356c331f85ca97717dcaab94aded8f20c577bf61051583e03b8530127e5cd3688f92ff920a6b2083d3d59b7d9faeea2a2de4382cf49766a74a71fe76214bd5
 
 install : $(TARGET)
 
@@ -74,7 +75,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && ./install.sh \
 		--components=cargo,rustc,rust-std-$(RUST_PLATFORM) \
diff --git a/make.sh b/make.sh
index 06ff2260a..b1d20140f 100755
--- a/make.sh
+++ b/make.sh
@@ -1476,7 +1476,7 @@ build_system() {
 	lfsmake2 configroot
 	lfsmake2 initscripts
 	lfsmake2 backup
-	#lfsmake2 rust
+	lfsmake2 rust
 	lfsmake2 openssl
 	lfsmake2 popt
 	lfsmake2 libedit
@@ -1772,7 +1772,7 @@ build_system() {
 	lfsmake2 colm
 	lfsmake2 ragel
 	lfsmake2 vectorscan
-	#lfsmake2 suricata
+	lfsmake2 suricata
 	lfsmake2 ids-ruleset-sources
 	lfsmake2 ipblocklist-sources
 	lfsmake2 squid