opnsense/suricata-devel: update to 4.1.0-rc1

opnsense · Jul 24, 2018 · 22e295b · 22e295b · fichtner · Jul 24, 2018
1 parent fbfc161
commit 22e295b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/opnsense/suricata-devel/Makefile b/opnsense/suricata-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	suricata
 PKGNAMESUFFIX=	-devel
-DISTVERSION=	4.1.0-beta1
+DISTVERSION=	4.1.0-rc1
 CATEGORIES=	security
 MASTER_SITES=	http://www.openinfosecfoundation.org/download/
 
@@ -126,10 +126,6 @@ CONFIGURE_ARGS+=--enable-gccprotect \
 
 CONFIG_DIR?=	${ETCDIR}
 CONFIG_FILES=	suricata.yaml classification.config reference.config threshold.config
-RULES_DIR=	${CONFIG_DIR}/rules
-RULES_FILES=	app-layer-events.rules decoder-events.rules dns-events.rules files.rules \
-		http-events.rules modbus-events.rules smtp-events.rules stream-events.rules \
-		tls-events.rules
 LOGS_DIR?=	/var/log/${PORTNAME}
 
 pre-patch:
@@ -140,14 +136,10 @@ post-patch-NSS-off:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${CONFIG_DIR}
-	@${MKDIR} ${STAGEDIR}${RULES_DIR}
 	@${MKDIR} ${STAGEDIR}${LOGS_DIR}
 .for f in ${CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
 .endfor
-.for f in ${RULES_FILES}
-	${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f}
-.endfor
 
 post-install-SC-on:
 	(cd ${STAGEDIR}${PREFIX} \

diff --git a/opnsense/suricata-devel/distinfo b/opnsense/suricata-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522204137
-SHA256 (suricata-4.1.0-beta1.tar.gz) = 9ce646c98e63f925146176b7dd3a7c8de060ae2784e8336e1f1cfa0a16a2903c
-SIZE (suricata-4.1.0-beta1.tar.gz) = 14922072
+TIMESTAMP = 1532404851
+SHA256 (suricata-4.1.0-rc1.tar.gz) = 8662d10a3bcaea61c4b2b11e06dec33418fb3ec82bfd33b70a86f9d8eadc12de
+SIZE (suricata-4.1.0-rc1.tar.gz) = 15280395
diff --git a/opnsense/suricata-devel/pkg-plist b/opnsense/suricata-devel/pkg-plist
@@ -38,22 +38,27 @@ man/man1/suricata.1.gz
 %%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
 %%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.py
 %%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.pyc
-@sample %%ETCDIR%%/suricata.yaml.sample
 @sample %%ETCDIR%%/classification.config.sample
 @sample %%ETCDIR%%/reference.config.sample
+@sample %%ETCDIR%%/suricata.yaml.sample
 @sample %%ETCDIR%%/threshold.config.sample
-%%ETCDIR%%/rules/app-layer-events.rules
-%%ETCDIR%%/rules/decoder-events.rules
-%%ETCDIR%%/rules/dns-events.rules
-%%ETCDIR%%/rules/files.rules
-%%ETCDIR%%/rules/http-events.rules
-%%ETCDIR%%/rules/modbus-events.rules
-%%ETCDIR%%/rules/smtp-events.rules
-%%ETCDIR%%/rules/stream-events.rules
-%%ETCDIR%%/rules/tls-events.rules
-@dir etc/suricata/rules
-@dir etc/suricata
+%%DATADIR%%/rules/app-layer-events.rules
+%%DATADIR%%/rules/decoder-events.rules
+%%DATADIR%%/rules/dnp3-events.rules
+%%DATADIR%%/rules/dns-events.rules
+%%DATADIR%%/rules/files.rules
+%%DATADIR%%/rules/http-events.rules
+%%DATADIR%%/rules/ipsec-events.rules
+%%DATADIR%%/rules/kerberos-events.rules
+%%DATADIR%%/rules/modbus-events.rules
+%%DATADIR%%/rules/nfs-events.rules
+%%DATADIR%%/rules/ntp-events.rules
+%%DATADIR%%/rules/smtp-events.rules
+%%DATADIR%%/rules/stream-events.rules
+%%DATADIR%%/rules/tls-events.rules
+@dir %%DATADIR%%
+@dir %%ETCDIR%%
 @dir include/htp
 @dir(root,wheel,0700) /var/log/suricata
-@postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/etc/suricata`` to remove configuration files."; fi
+@postunexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, run ``rm -rf ${PKG_PREFIX}/%%ETCDIR%%`` to remove configuration files."; fi
 @dir %%DOCSDIR%%