summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2019-01-07 11:40:24 -0200
committerRenato Botelho <renato@netgate.com>2019-01-07 11:41:18 -0200
commitf4cd1d1a1a37d629da09272f0185e31492e446b3 (patch)
tree703e2c10dcc2eeb8ee3439e23f8a39465bd3a573
parentf236aa92fcb3db602183a4cc3d205d4a157fc643 (diff)
downloadpfsense-f4cd1d1a1a37d629da09272f0185e31492e446b3.zip
pfsense-f4cd1d1a1a37d629da09272f0185e31492e446b3.tar.gz
Re-enable suricata, without RUST, for armv6
-rw-r--r--tools/conf/pfPorts/make.conf4
-rw-r--r--tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv61
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf
index d84d251..62b314d 100644
--- a/tools/conf/pfPorts/make.conf
+++ b/tools/conf/pfPorts/make.conf
@@ -154,7 +154,11 @@ security_strongswan_SET_FORCE= CURL EAPDYNAMIC EAPRADIUS EAPSIMFILE \
security_strongswan_UNSET_FORCE= EAPAKA3GPP2 BUILTIN LIBC SMP
security_suricata_SET_FORCE=GEOIP HTP_PORT IPFW JSON LUAJIT NSS PORTS_PCAP NETMAP HYPERSCAN REDIS
+.if ${CUR_ARCH} == "armv6"
+security_suricata_UNSET_FORCE=LUA PRELUDE SC TESTS RUST
+.else
security_suricata_UNSET_FORCE=LUA PRELUDE SC TESTS
+.endif
security_xinetd_UNSET_FORCE= XCONV
diff --git a/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 b/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6
index 0e20a55..b832493 100644
--- a/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6
+++ b/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6
@@ -2,7 +2,6 @@ devel/aws-sdk-php
emulators/%%PRODUCT_NAME%%-pkg-Open-VM-Tools
graphics/drm-kmod
net-mgmt/%%PRODUCT_NAME%%-pkg-Telegraf
-security/%%PRODUCT_NAME%%-suricata
sysutils/%%PRODUCT_NAME%%-builder
sysutils/%%PRODUCT_NAME%%-pkg-LCDproc
sysutils/%%PRODUCT_NAME%%-pkg-Netgate_Coreboot_Upgrade
OpenPOWER on IntegriCloud