From nobody Thu Aug 31 00:32:36 2023 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 4RbhvT11WZz4rRGn; Thu, 31 Aug 2023 00:32:37 +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 4RbhvT0Wb5z4mrN; Thu, 31 Aug 2023 00:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693441957; 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=YqJCF+Kx8ZE5q8VQYOJUMCLD5yjVYUXToCjRU2p7A+c=; b=dKjPzf/WALXe2AgXm9P9QYtMX3XhqZCvyQPhLSAetQWzspeePTvCrbNZ+d3hGte+NU0rA3 wJkAhSYN9fXHp60CO4Cj78nvxWUAwfIA/7hDiNopwTZoejVDMdpHYWwT3xK7Nh8X+rIsoE xj7i3GDlIJ5B6dYBsM27D4/JQG9rxR+vXlrzWYCwJMqswZuCaTol7P0O5mBTQ+s0pOjXcj aWE57Wg9I5kly2ddL/D+yidzNElZhyhetQHmucIwHdLd0lMcLTx5Nli/ukMmJd9az9E8ij p+62COhAddHqQeV7egnFlOxpFDTiD1Nyt/R6zRWBHHKA4P3/KFTFji/YgU+t6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693441957; a=rsa-sha256; cv=none; b=P+mwC62oPdbKb6nQ91cKB9wu/S3sCREK51p/OAwpo05Rsukt/7ub01TAAl/7rf8CBgpBYH 388UORMXZ2g6K7Z6hVOYZlNtHf2Z2xxiZVaZ+MF0dAr7ce2zNnKQkpDeJbIrs+ALICKWjh HUcIZdyum2qHn+hy/SamikYDBbReJJtKakPbFOmV4qU3X3ds3QkQtun0NR/lAeL2tJJBVA MOuhGvKXq5ZDyTQeDujXPw4aJ+oBKFiRUk+UHonWEj2oWC0ji0DiW5AbBRDSDZyvuPEpdf ++5zZXqxi6rRuOgzbD4s/vxd1h+3dikcVW1U2ElIfSIMtpnIIgGWlC2ZWr5MXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693441957; 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=YqJCF+Kx8ZE5q8VQYOJUMCLD5yjVYUXToCjRU2p7A+c=; b=W8zMSbvT6ptniSYnWPsE07c33zkLcdrBrVd2B/cQbglJpbQZWNly251Om025CljnMceUTZ 11MN20l5SzxTIOmIUFsI7wtVJ/1gZY4pUAWxizaXtI5Puu1OgFYa8HCGUnJz8eEmENFuT/ phsA23UOqcoyIlsymsoA8q6txX2+wEUlxfKlQcscEDB6MDMgXTCzKZ3KwqS/XknOJ2i1Mi ICV6KCZXGKlT9cBZwiKUkfkg9hwOrrHS0JlXJ57v/sv7tsXI2tKSia23EStAAbC1zrYQD0 saZU0JxPIBOGHFuuBi+P0GU1fwNNEwRBoj5UXPjo9yP8QbV/gNRruELzZPJS0g== 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 4RbhvS6hbrzvkZ; Thu, 31 Aug 2023 00:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37V0Wauv053089; Thu, 31 Aug 2023 00:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37V0Wa2F053086; Thu, 31 Aug 2023 00:32:36 GMT (envelope-from git) Date: Thu, 31 Aug 2023 00:32:36 GMT Message-Id: <202308310032.37V0Wa2F053086@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: 75702bc2c87e - main - security/zeek: revert b6a8929a2551 for pkg-plist 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: 75702bc2c87ed2234607ab1ca60c59fb94666e40 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=75702bc2c87ed2234607ab1ca60c59fb94666e40 commit 75702bc2c87ed2234607ab1ca60c59fb94666e40 Author: Craig Leres AuthorDate: 2023-08-31 00:31:24 +0000 Commit: Craig Leres CommitDate: 2023-08-31 00:31:24 +0000 security/zeek: revert b6a8929a2551 for pkg-plist I get package errors with that version (for 13.2/amd64 at least): =================================================== ===> Building package for zeek-6.0.0 pkg-static: Unable to access file /wrkdirs/usr/ports/security/zeek/work/stage/usr/local/include/zeek/analyzer/protocol/finger/legacy/events.bif.h:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/security/zeek/work/stage/usr/local/include/zeek/analyzer/protocol/syslog/legacy/events.bif.h:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/security/zeek/work/stage/usr/local/share/zeek/base/bif/plugins/Zeek_Finger.events.bif.zeek:No such file or directory pkg-static: Unable to access file /wrkdirs/usr/ports/security/zeek/work/stage/usr/local/share/zeek/base/bif/plugins/Zeek_Syslog.events.bif.zeek:No such file or directory *** Error code 1 Maybe it's an options thing? I have everything set except PERFTOOLS and BUILD_TYPE set to RELEASE. While here update LICENSE. --- security/zeek/Makefile | 2 +- security/zeek/pkg-plist | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/security/zeek/Makefile b/security/zeek/Makefile index 1e50c9e7d409..ea426690f273 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -8,7 +8,7 @@ MAINTAINER= leres@FreeBSD.org COMMENT= System for detecting network intruders in real-time WWW= https://www.zeek.org/ -LICENSE= BSD3CLAUSE +LICENSE= CC-BY-4.0 BROKEN_FreeBSD_12_powerpc64= does not build: error: zero-size array 'names' diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist index 2480afafbdbf..2077fe07d674 100644 --- a/security/zeek/pkg-plist +++ b/security/zeek/pkg-plist @@ -697,7 +697,6 @@ include/zeek/analyzer/protocol/dns/events.bif.h include/zeek/analyzer/protocol/file/File.h include/zeek/analyzer/protocol/file/events.bif.h include/zeek/analyzer/protocol/finger/legacy/Finger.h -include/zeek/analyzer/protocol/finger/legacy/events.bif.h include/zeek/analyzer/protocol/ftp/FTP.h include/zeek/analyzer/protocol/ftp/events.bif.h include/zeek/analyzer/protocol/ftp/functions.bif.h @@ -943,7 +942,6 @@ include/zeek/analyzer/protocol/ssl/tls-handshake-signed_certificate_timestamp.pa include/zeek/analyzer/protocol/ssl/tls-handshake.pac include/zeek/analyzer/protocol/ssl/types.bif.h include/zeek/analyzer/protocol/syslog/legacy/Syslog.h -include/zeek/analyzer/protocol/syslog/legacy/events.bif.h include/zeek/analyzer/protocol/syslog/legacy/syslog-analyzer.pac include/zeek/analyzer/protocol/syslog/legacy/syslog-protocol.pac include/zeek/analyzer/protocol/syslog/legacy/syslog.pac @@ -1171,8 +1169,8 @@ include/zeek/spicy/packet-analyzer.h include/zeek/spicy/port-range.h include/zeek/spicy/protocol-analyzer.h include/zeek/spicy/runtime-support.h -%%SPICY%%include/zeek/spicy/spicy.bif.h -%%SPICY%%include/zeek/spicy/spicyz/config.h +include/zeek/spicy/spicy.bif.h +include/zeek/spicy/spicyz/config.h include/zeek/spicy/spicyz/driver.h include/zeek/spicy/spicyz/glue-compiler.h include/zeek/stats.bif.func_h @@ -1235,7 +1233,6 @@ lib/libparaglob.a %%SPICY%%lib/libspicy-rt-debug.a %%SPICY%%lib/libspicy-rt.a %%SPICY%%lib/libspicy.so -@dir lib/%%ZEEKUSER%%/plugins lib/zeek/python/SubnetTree.py lib/zeek/python/_SubnetTree.so lib/zeek/python/broker/__init__.py @@ -1367,7 +1364,6 @@ share/btest/scripts/spicy/diff-sort %%DATADIR%%/base/bif/plugins/Zeek_FileExtract.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_FileExtract.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_FileHash.events.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Finger.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GSSAPI.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GTPv1.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek @@ -1452,7 +1448,6 @@ share/btest/scripts/spicy/diff-sort %%DATADIR%%/base/bif/plugins/Zeek_SSL.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_SSL.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_SSL.types.bif.zeek -%%DATADIR%%/base/bif/plugins/Zeek_Syslog.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.events.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.functions.bif.zeek %%DATADIR%%/base/bif/plugins/Zeek_TCP.types.bif.zeek @@ -1467,7 +1462,7 @@ share/btest/scripts/spicy/diff-sort %%DATADIR%%/base/bif/plugins/Zeek_XMPP.events.bif.zeek %%DATADIR%%/base/bif/plugins/__load__.zeek %%DATADIR%%/base/bif/reporter.bif.zeek -%%SPICY%%%%DATADIR%%/base/bif/spicy.bif.zeek +%%DATADIR%%/base/bif/spicy.bif.zeek %%DATADIR%%/base/bif/stats.bif.zeek %%DATADIR%%/base/bif/store.bif.zeek %%DATADIR%%/base/bif/strings.bif.zeek @@ -2049,7 +2044,6 @@ share/btest/scripts/spicy/diff-sort %%DATADIR%%/policy/tuning/defaults/warnings.zeek %%DATADIR%%/policy/tuning/json-logs.zeek %%DATADIR%%/policy/tuning/track-all-assets.zeek -@dir %%DATADIR%%/spicy @sample %%DATADIR%%/site/local.zeek.sample %%SPICY%%share/zeek/spicy/zeek.spicy %%SPICY%%share/zeek/spicy/zeek_file.spicy