From owner-dev-commits-ports-all@freebsd.org Wed Apr 14 05:26:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 535CE5CA447; Wed, 14 Apr 2021 05:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKrZ31wYJz4ZQY; Wed, 14 Apr 2021 05:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 308A917F7D; Wed, 14 Apr 2021 05:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13E5QpLS008883; Wed, 14 Apr 2021 05:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13E5QppP008882; Wed, 14 Apr 2021 05:26:51 GMT (envelope-from git) Date: Wed, 14 Apr 2021 05:26:51 GMT Message-Id: <202104140526.13E5QppP008882@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 9c36d02b932e - main - security/zeek: Unbreak armv7 build and fix testport issue MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c36d02b932e632613f6a3948afa2a65afbfdf6b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 05:26:51 -0000 The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c36d02b932e632613f6a3948afa2a65afbfdf6b commit 9c36d02b932e632613f6a3948afa2a65afbfdf6b Author: Craig Leres AuthorDate: 2021-04-14 05:13:29 +0000 Commit: Craig Leres 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 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