From: Michal Hrusecky <michal.hrusecky@turris.com>
Date: Thu, 22 Jul 2021 11:44:07 +0000 (+0200)
Subject: net/snort3: Include default configs and snort2lua
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f31271fed30fe526d276bc850aa6ed53d5b045c1;p=feed%2Fpackages.git

net/snort3: Include default configs and snort2lua

Include default configuration files to have something to start from.
Also include snort2lua to help convert snort2 rules to snort3 to also
help with bootstrapping the configuration.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
---

diff --git a/net/snort3/Makefile b/net/snort3/Makefile
index 4530596a82..8880edbed0 100644
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort3
 PKG_VERSION:=3.1.0.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
@@ -61,6 +61,7 @@ TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/daq3 -ltirpc
 
 define Package/snort3/conffiles
 /etc/config/snort
+/etc/snort/
 endef
 
 define Package/snort3/install
@@ -69,6 +70,10 @@ define Package/snort3/install
 		$(PKG_INSTALL_DIR)/usr/bin/snort  \
 		$(1)/usr/bin/
 
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/snort2lua  \
+		$(1)/usr/bin/
+
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/bin/u2{boat,spewfoo} \
 		$(1)/usr/bin/
@@ -88,6 +93,9 @@ define Package/snort3/install
 		$(1)/usr/share/lua/
 
 	$(INSTALL_DIR) $(1)/etc/snort
+	$(INSTALL_CONF) \
+		$(PKG_INSTALL_DIR)/usr/etc/snort/*.lua \
+		$(1)/etc/snort
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \
diff --git a/net/snort3/files/snort.config b/net/snort3/files/snort.config
index c402ec5a33..92e42959d2 100644
--- a/net/snort3/files/snort.config
+++ b/net/snort3/files/snort.config
@@ -1,4 +1,4 @@
 config snort 'snort'
-	option config_dir '/etc/snort/etc/'
+	option config_dir '/etc/snort/'
 	option alert_module 'alert_syslog'
 	option interface 'eth0'