From nobody Sat Jul 09 19:52:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3539317FBCA9; Sat, 9 Jul 2022 19:52: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 4LgLR715Yjz45wn; Sat, 9 Jul 2022 19:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657396371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qrjQEqLtNfa4GGgfqn2v6rblwRbBqBuXsoNNwG54RY=; b=DQRsD1d4oiWi9GtBrKvlH29wYOyuutA9VP7lL4wAIDSKBLx9OLCGF3yDTlAG4QCokoewKk BNvSym5f016mTXgTV1uVAt4rLIu1wLUEmrh+TdnZoNESXwTX0aij/m7qW6WsSkLT1hw2og PDZSr5Gw6Yyba3jJG4DqItY4051uFv/K/yT/RH4F97Ds427isUuEJ4pixKxqDXO8nuhevV RCtfvMItYB+1EyfwmfFhBxiLzkN5O/rSsE2hQT9agkEhFZ//ywan8n3ya/WofSph2ibykv RjobBABmZHqq+TZHYtu1cO+WNH+AStba/8jGlnfo/yt2MR9X7ZNw1A7NzIqOKw== 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 4LgLR708mnzxjK; Sat, 9 Jul 2022 19:52: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 269Jqoub002811; Sat, 9 Jul 2022 19:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269JqogS002810; Sat, 9 Jul 2022 19:52:50 GMT (envelope-from git) Date: Sat, 9 Jul 2022 19:52:50 GMT Message-Id: <202207091952.269JqogS002810@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: 619c9efdbb5b - main - security/zeek: Patch to allow building without ENABLE_ZEEK_UNIT_TESTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 619c9efdbb5b809b2187706427c1ee1d0e57ca1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657396371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qrjQEqLtNfa4GGgfqn2v6rblwRbBqBuXsoNNwG54RY=; b=AN2nnZNm9ntNO1HHF8qR6CQgICnN0XfFEtuXUetJMY5pd2qPoKeASnwskdhgfRKLNya6MG 0YTANrMgFYS50hdYW7AOdc2ByXTLgiM25mCQlilOj5mVe3RO9AqOeCgK0I4PlB++Mn0dQs +cj7qz6xI8N6VutCGebRNJzGuGePGH1JhkRbyCYrhNqdvocYv/MuiPHhVkvTGaUZFbdX8w rnjOVuKmtu+0zdcrkrzKXgIxxm2dDYsu8xrJRlKnU5wHWZ9QOo2D8T9SCZ92+32tYZfVpc y8YUO8t9VhlFK6XoaC1j/+jZT26Tpbj8sw5I5aSPehjYuidTWmsZaojmLtBMlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657396371; a=rsa-sha256; cv=none; b=eQlEReGpMOTZ1J3RT6XW5H3IUtGezuKRX7aYEmOBCJlq+gYh22eZ8IjRy1adVrYT5aT8J9 Wflcj/WKBWUI2r4AnikBL3g8oeDsDZ2+33MC63+L9Dn7QW/43ZlLEgorPMsmbtcriiHahH T7IFSfTAFjft4RiTFkfEj/CA3j2lVBR7TrOCtbKyPkrusQ6ajtuWhYQhC7KV8zIinqsmjc RSmYQs72Pco+zwn1O0rJhnjy5XQLjUPFtT+08wU5p7BmQ75DLii945dvBFbeTwTdr4SUkr 40I7Ao7WctFUnf0GcxhOL4JFkEHzMUQFFmby/mnGKQLEqw+kteeoXosGrcPqwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=619c9efdbb5b809b2187706427c1ee1d0e57ca1f commit 619c9efdbb5b809b2187706427c1ee1d0e57ca1f Author: Craig Leres AuthorDate: 2022-07-09 19:52:20 +0000 Commit: Craig Leres CommitDate: 2022-07-09 19:52:20 +0000 security/zeek: Patch to allow building without ENABLE_ZEEK_UNIT_TESTS 5.0.0 does not build without ENABLE_ZEEK_UNIT_TESTS enabled. Apply upstream patch which solves this: https://github.com/zeek/zeek/pull/2256 Obtained from: Benjamin Bannier --- security/zeek/Makefile | 2 +- .../zeek/files/patch-auxil_spicy_CMakeLists.txt | 22 ++++++++++++++++++++++ security/zeek/pkg-plist | 8 -------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/security/zeek/Makefile b/security/zeek/Makefile index 26c89c7bcc7a..37b42d0770b9 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -2,6 +2,7 @@ PORTNAME= zeek PORTVERSION= 5.0.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://download.zeek.org/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -38,7 +39,6 @@ CMAKE_ARGS+= -GNinja \ -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" \ -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D ENABLE_PERFTOOLS_DEBUG:BOOL=false \ - -D ENABLE_ZEEK_UNIT_TESTS:BOOL=true \ -D INSTALL_AUX_TOOLS:BOOL=true \ -D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD} \ -D PY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \ diff --git a/security/zeek/files/patch-auxil_spicy_CMakeLists.txt b/security/zeek/files/patch-auxil_spicy_CMakeLists.txt new file mode 100644 index 000000000000..6aee2809e636 --- /dev/null +++ b/security/zeek/files/patch-auxil_spicy_CMakeLists.txt @@ -0,0 +1,22 @@ +--- auxil/spicy/CMakeLists.txt.orig 2022-07-09 17:28:05 UTC ++++ auxil/spicy/CMakeLists.txt +@@ -36,3 +36,19 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla") + set(HILTI_DEV_PRECOMPILE_HEADERS OFF) + + add_subdirectory(spicy) ++ ++# Disable Spicy unit test targets. ++# ++# Spicy builds its unit tests as part of `ALL`. They are usually not only ++# uninteresting for us but might cause problems. Since any configuration ++# we do for our unit tests happens through global C++ compiler flags, they ++# would get inherited directly by Spicy which can cause issues, e.g., we set ++# `-DDOCTEST_CONFIG_DISABLE` if `ENABLE_ZEEK_UNIT_TESTS` is false, but Spicy ++# unit test do not anticipate this define being set. ++set_target_properties( ++ hilti-rt-tests ++ hilti-rt-configuration-tests ++ spicy-rt-tests ++ hilti-toolchain-tests ++ spicy-toolchain-tests ++ PROPERTIES EXCLUDE_FROM_ALL TRUE) diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist index 1e1af63b2a69..3311d2a98f4c 100644 --- a/security/zeek/pkg-plist +++ b/security/zeek/pkg-plist @@ -1249,14 +1249,6 @@ lib/libparaglob.a %%SPICY%%lib/zeek-spicy/spicy/zeek.spicy %%SPICY%%lib/zeek-spicy/spicy/zeek_file.spicy %%SPICY%%lib/zeek-spicy/spicy/zeek_rt.hlt -%%SPICY%%lib/zeek-spicy/tests/Scripts/canonify-zeek-log -%%SPICY%%lib/zeek-spicy/tests/Scripts/canonify-zeek-log-sorted -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-remove-abspath -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-remove-timestamps -%%SPICY%%lib/zeek-spicy/tests/Scripts/diff-sort -%%SPICY%%lib/zeek-spicy/tests/Scripts/spicy-version -%%SPICY%%lib/zeek-spicy/tests/Scripts/zeek-version -%%SPICY%%lib/zeek-spicy/tests/random.seed %%NETMAP%%lib/zeek/plugins/Zeek_Netmap/COPYING %%NETMAP%%lib/zeek/plugins/Zeek_Netmap/__bro_plugin__ %%NETMAP%%lib/zeek/plugins/Zeek_Netmap/lib/Zeek-Netmap.%%LCASE_OPSYS%%-%%ARCH%%.so