[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 899a8a2fb7dc6b9c16a73922f193578bdb7267b3

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 899a8a2fb7dc6b9c16a73922f193578bdb7267b3

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2580 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  899a8a2fb7dc6b9c16a73922f193578bdb7267b3 (commit)
      from  870a92f8fbebfe4d50efafda536b98f7664ac127 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 899a8a2fb7dc6b9c16a73922f193578bdb7267b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 6 15:51:34 2019 +0100

    hyperscan: Build only on x86
    
    This package does not compile on ARM
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 hyperscan/hyperscan.nm |  5 ++++-
 suricata/suricata.nm   | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index c781f73bd..e1688a5c3 100644
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -5,7 +5,10 @@
 
 name       = hyperscan
 version    = 5.1.0
-release    = 1
+release    = 2
+
+# This won't build on any architectures but those
+sup_arches = x86_64 i686
 
 groups     = System/Libraries
 url        = https://github.com/intel/hyperscan
diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 2a560ec2e..4825612e2 100644
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -5,7 +5,7 @@
 
 name       = suricata
 version    = 4.0.6
-release    = 2
+release    = 3
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/
@@ -23,7 +23,6 @@ source_dl  = http://www.openinfosecfoundation.org/download/
 build
 	requires
 		file-devel
-		hyperscan-devel
 		libcap-ng-devel
 		libnfnetlink-devel
 		libnetfilter_queue-devel
@@ -41,11 +40,16 @@ build
 		--enable-nfqueue \
 		--disable-gccmarch-native \
 		--disable-static \
-		--enable-hyperscan \
 		--enable-non-bundled-htp \
 		--with-libhtp-includes=%{includedir}/htp \
 		--with-libhtp-libraries=%{libdir}
 
+	# Enable hyperscan only on x86
+	if "%{DISTRO_PLATFORM}" == "x86"
+		requires += hyperscan-devel
+		configure_options += --enable-hyperscan
+	end
+
 	install_cmds
 		mkdir -pv %{BUILDROOT}%{sysconfdir}
 		mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata


hooks/post-receive
--
IPFire 3.x development tree