git: 9c36d02b932e - main - security/zeek: Unbreak armv7 build and fix testport issue

[Craig Leres]

The branch main has been updated by leres:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9c36d02b932e632613f6a3948afa2a65afbfdf6b

commit 9c36d02b932e632613f6a3948afa2a65afbfdf6b
Author:     Craig Leres <leres at FreeBSD.org>
AuthorDate: 2021-04-14 05:13:29 +0000
Commit:     Craig Leres <leres at FreeBSD.org>
CommitDate: 2021-04-14 05:13:29 +0000

    security/zeek: Unbreak armv7 build and fix testport issue
    
    Add a patch from upstream to fix building on armv7 (used by pfsense):
    
        https://github.com/zeek/zeek/issues/1496
    
    Thanks to @garga for the pointer.
    
    Fix a testport "left over" file @adridg reported. When zeek is run
    as part of package installation, it copies some config files to
    spool/installed-scripts-do-not-touch/site and local.zeek.sample
    hitches a ride and needs to be removed on uninstall. But it is not
    really a @sample candidate.
    
    While we're here fix some minor portlint (env -> ${SETENV}) and
    clean up some commented out directives.
    
    Reported by:    garga adridg
---
 security/zeek/Makefile                       |  8 +-------
 security/zeek/files/patch-src_CMakeLists.txt | 10 ++++++++++
 security/zeek/pkg-plist                      |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index fe674ffe2aec..53c8a38718c8 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -97,11 +97,6 @@ USE_RC_SUBR=	zeek
 post-patch:
 	${REINPLACE_CMD} -e '\|/usr/local/|s|$$| ${STAGEDIR}${PREFIX}/|' \
 	    ${WRKSRC_zeek_netmap}/cmake/FindNetmap.cmake
-	
-
-#	# Silence the "use ZeekControl.plugin instead of BroControl.plugin" nag
-#	@${REINPLACE_CMD} -e 's/^print/#&/' \
-#	    ${WRKSRC}/auxil/zeekctl/BroControl/__init__.py
 
 post-install-ZEEKCTL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/logs
@@ -128,12 +123,11 @@ post-install-NETMAP-on:
 	${REINPLACE_CMD} -e 's|=/usr/local|=${STAGEDIR}${PREFIX}|' \
 	    -e '/^include_dir=/s|:/usr/local|:${STAGEDIR}${PREFIX}|' \
 	    ${WRKDIR}/zeek-bin/zeek-config
-	cd ${WRKSRC_zeek_netmap} && env PATH=${WRKDIR}/zeek-bin:${PATH} \
+	cd ${WRKSRC_zeek_netmap} && ${SETENV} PATH=${WRKDIR}/zeek-bin:${PATH} \
 	    ./configure --with-netmap=/usr \
 	    --install-root=${STAGEDIR}${PREFIX}/lib/zeek/plugins
 	cd ${WRKSRC_zeek_netmap}/build && make && make install
 
-
 .include <bsd.port.pre.mk>
 
 UNAME_M!=	${UNAME} -m
diff --git a/security/zeek/files/patch-src_CMakeLists.txt b/security/zeek/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..de12b5954a97
--- /dev/null
+++ b/security/zeek/files/patch-src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt.orig	2021-04-09 11:46:37 UTC
++++ src/CMakeLists.txt
+@@ -344,6 +344,7 @@ set(HH_SRCS
+ )
+ 
+ if (${COMPILER_ARCHITECTURE} STREQUAL "arm")
++  list(APPEND HH_SRCS ../auxil/highwayhash/highwayhash/hh_neon.cc)
+   set_source_files_properties(${HH_SRCS} PROPERTIES COMPILE_FLAGS
+                               -mfloat-abi=hard -march=armv7-a -mfpu=neon)
+ elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index b453a77562ae..bfc6e3eed514 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1985,6 +1985,7 @@ man/man8/zeek.8.gz
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.zeek
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.zeek
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.zeek
+%%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.zeek.sample
 %%ZEEKCTL%%@preunexec rm -f %D/spool/state.db
 %%ZEEKCTL%%@dir spool/tmp
 %%ZEEKCTL%%@dir spool/installed-scripts-do-not-touch/site