X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fsuricata;h=fdff36ca625b2408f116a8ee623b9d4e49c50d42;hb=674328ea046162b6293adf46996d6126ff5ae0ed;hp=0873f54b43ea0d11a50fddbdec021fb613e7b62c;hpb=67752a9510d9db653ca8aee9355e8fa63d0f9316;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/suricata b/lfs/suricata
index 0873f54b43..fdff36ca62 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# 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.0.5
+VER        = 5.0.2
 
 THISAPP    = suricata-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ea0cb823d6a86568152f75ade6de442f
+$(DL_FILE)_MD5 = 28470c05f0f1d3eae2a0c7312c3eabc3
 
 install : $(TARGET)
 
@@ -78,12 +78,45 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-gccmarch-native \
 		--enable-non-bundled-htp \
 		--enable-nfqueue \
-		--disable-static
+		--disable-static \
+		--disable-python \
+		--with-libjansson-libraries=/usr/lib \
+		--with-libjansson-includes=/usr/include \
+		--disable-suricata-update \
+		--enable-rust
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make install-conf
-	mv /etc/suricata/suricata.yaml /etc/suricata/suricata-example.yaml
-	-mkdir -p /etc/suricata/rules
+
+	# Remove default suricata config file.
+	rm -rvf /etc/suricata/suricata.yaml
+
+	# Install IPFire related config file.
+	install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
+
+	# Remove shipped rules.
+	rm -rvf /usr/share/suricata
+
+	# Create emtpy rules directory.
+	-mkdir -p /var/lib/suricata
+
+	# Move config files for references, threshold and classification
+	# to the rules directory.
+	mv /etc/suricata/*.config /var/lib/suricata
+
+	# Set correct permissions for the files.
+	chmod 644 /var/lib/suricata/*.config
+
+	# Set correct ownership for /var/lib/suricata and the
+	# contained files
+	chown -R nobody:nobody /var/lib/suricata
+
+	# Create logging directory.
 	-mkdir -p /var/log/suricata
+
+	# Set correct ownership for /var/log/suricata.
+	chown suricata:suricata /var/log/suricata
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)