From 18cb05aafe14d33820ddfeaf4e1a6eeef8eb935d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 14 Jul 2020 11:20:14 +0200
Subject: [PATCH] config: more prepping for RC

---
 config/20.7/build.conf | 3 +++
 config/20.7/make.conf  | 3 +--
 config/20.7/ports.conf | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/20.7/build.conf b/config/20.7/build.conf
index 3c76850..df5657c 100644
--- a/config/20.7/build.conf
+++ b/config/20.7/build.conf
@@ -8,3 +8,6 @@ SUFFIX?=	-devel
 COREBRANCH?=	master
 PLUGINSBRANCH?= master
 SRCBRANCH?=	master
+
+COREENV=	CORE_PHP=${PHP} CORE_ABI=${SETTINGS} CORE_PYTHON=${PYTHON} \
+		CORE_SURICATA=
diff --git a/config/20.7/make.conf b/config/20.7/make.conf
index f3d809a..d341cc3 100644
--- a/config/20.7/make.conf
+++ b/config/20.7/make.conf
@@ -67,7 +67,6 @@ net_haproxy_SET=		LUA
 net_miniupnpd_SET=		CHECK_PORTINUSE PF_FILTER_RULES
 net_openldap24-server_SET=	MEMBEROF REFINT SASL
 net_vnstat_UNSET=		GUI
-opnsense_suricata-devel_SET=	HYPERSCAN NSS
 security_acme.sh_SET=		BINDTOOLS EXAMPLES
 security_autossh_SET=		SSH_PORTABLE
 security_ca_root_nss_UNSET=	ETCSYMLINK
@@ -83,7 +82,7 @@ security_openvpn_UNSET=		EASYRSA TEST
 security_strongswan_SET=	EAPRADIUS GCM XAUTH
 security_strongswan_UNSET=	CURL
 security_stunnel_SET=		TLS_LOG_IDENT
-security_suricata_SET=		HYPERSCAN
+security_suricata_SET=		HYPERSCAN NSS
 sysutils_flashrom_UNSET=	FTDI
 sysutils_msktutil_SET=		${PRODUCT_GSSAPI}
 www_lighttpd_UNSET=		LUA
diff --git a/config/20.7/ports.conf b/config/20.7/ports.conf
index 6047dde..427e69b 100644
--- a/config/20.7/ports.conf
+++ b/config/20.7/ports.conf
@@ -156,7 +156,6 @@ opnsense/opnsense-update
 opnsense/pam_opnsense
 opnsense/phpseclib@php${PRODUCT_PHP}
 opnsense/sshlockout_pf
-opnsense/suricata-devel				arm,arm64
 opnsense/syslogd
 print/texinfo
 ports-mgmt/pkg