From nobody Sat Aug 03 17:37:54 2024 X-Original-To: dev-commits-ports-all@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 4WbqfV3Bqcz5SmdV; Sat, 03 Aug 2024 17:37:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WbqfV2STjz4fr6; Sat, 3 Aug 2024 17:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722706674; 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=4SDHkH+fkm1kRmCmded+bMenKwMHZU2QPkJrdvUwzxs=; b=DHNlDz3pnjqgd31y+pYRkZLodm32lej8SwWozLQdJvx8Yru9h4E/PYdQYNkLsYtequU2VU IV00Rs3iZuSREDDNcbBQziriTuBSbT5bCuEEoh7ndRiT3bIhVpOi+XNhYVE8ZQA7MROOF/ t1yaTul+azPBHzKLViTzMqOtycoryMl+PD3LSXvcfAFQ6zEQF2umZK+jsP6YTKz5+aeRQn n174i1O5qfPcbxsPPfVPUUYyVJ7WZJw5xzPFTSLaW0P2loAiaEGpM611lYZ86Co7scRF7z kysJKCeFbXAOgzodKIwybqBHFjMEl+e04MecEzJtdEa6XtHENAObEPHalVHtsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722706674; a=rsa-sha256; cv=none; b=xqJg2iGnvsei29dpZTKD1HJQUpnZyx1jCTlGlYAbTOH+0EmtBYbBwhiGv/wiiiFVRPjlyf j5/erCVWN8pnrl/ZhKTBvZRwiAj7Ay2eIdtfdg4mvybJ6KxyGUVaf3y3b9aEsiP9clV3+N 4ntetxCbBN8qIYeu8uM7DrsPN4vX589qTwXgMFGcQBY0h9UMCkapFQJCqnoh98KbVhEnhX rHC7ukEZFx7wWkiH+6LytUdrUYNciCVgjS+e1bGqEumx/Oq0EA955ySsoZJ7HaYx/8TRHA +I628orT93DZtpFl84pVDDssIZtAbzMv2PKHYRTi4actdnvWM0/LIVV1seZN8Q== 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=1722706674; 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=4SDHkH+fkm1kRmCmded+bMenKwMHZU2QPkJrdvUwzxs=; b=bDif84PJa62oTqhF3iYPytrxvABqbz9Q1OR3626cpTJ/uC9dFRyrTfjb4SS9al4fEL3Pub pq86ypCyZ2b71GTRaqGt+8Saf8ZlJF+x+jFlwU9uqnByfS2FJezvVHwAHmZU+PzmhhKeKo ITXtdYE7j2agkECltwzpHmPnzV0ZI3Oyyl5wQFkiQUZsP6WkPde7m8OoD3WVrUqPXw8dVR RIttLr20Kasdd6wxsJUjjynY76xnkw3sofgXRylQQ5VMz95bcxC8tXouizBX8B8lXw8E+I H6uy6O1CF9yT9QlvXhD6Smy1NGMBrozzYwXVB77GdPcM/NH+0di7RPk3IfGfLg== 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 4WbqfV1WhDzLVb; Sat, 3 Aug 2024 17:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 473HbsBX030603; Sat, 3 Aug 2024 17:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473HbsAf030600; Sat, 3 Aug 2024 17:37:54 GMT (envelope-from git) Date: Sat, 3 Aug 2024 17:37:54 GMT Message-Id: <202408031737.473HbsAf030600@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: 74edd3d9781c - main - security/zeek: Clean up some stage nits List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 74edd3d9781c8318ce79c8f116011ece9061a34a Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=74edd3d9781c8318ce79c8f116011ece9061a34a commit 74edd3d9781c8318ce79c8f116011ece9061a34a Author: Craig Leres AuthorDate: 2024-08-03 17:37:29 +0000 Commit: Craig Leres CommitDate: 2024-08-03 17:37:29 +0000 security/zeek: Clean up some stage nits - Change the legacy lib/broctl symlink from an absolute to a relative path. - Remove unnecessary USES=gettext-runtime - Add @dir pkg-plist entries for empty directories. Reported by: Daniel Engberg --- security/zeek/Makefile | 7 +++++-- security/zeek/pkg-plist | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/security/zeek/Makefile b/security/zeek/Makefile index 6aacbcd2de35..0cd9bebfb8cd 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -1,5 +1,6 @@ PORTNAME= zeek DISTVERSION= 7.0.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://download.zeek.org/ @@ -15,8 +16,8 @@ BUILD_DEPENDS= bison>=3.3:devel/bison \ LIB_DEPENDS= libcares.so:dns/c-ares RUN_DEPENDS= c-ares>=1.25.0:dns/c-ares -USES= bison cmake compiler:c++17-lang cpe gettext-runtime perl5 \ - python shebangfix ssl +USES= bison cmake compiler:c++17-lang cpe perl5 python \ + shebangfix ssl USE_LDCONFIG= yes @@ -166,6 +167,8 @@ post-install-ZEEKCTL-on: ${RM} ${STAGEDIR}${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh ${LN} -s ../../../spool/zeekctl-config.sh \ ${STAGEDIR}${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh + ${RM} ${STAGEDIR}${PREFIX}/lib/broctl + ${LN} -s zeek/python/zeekctl ${STAGEDIR}${PREFIX}/lib/broctl post-install: ${MV} ${STAGEDIR}${DATADIR}/site/local.zeek \ diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist index eaf13a68c02f..a8c69b79bf19 100644 --- a/security/zeek/pkg-plist +++ b/security/zeek/pkg-plist @@ -2180,4 +2180,8 @@ share/man/man8/zeek.8.gz %%ZEEKCTL%%@dir logs %%SPICY%%@dir lib/zeek/spicy @dir lib/zeek/plugins +@dir include/zeek/script_opt/ZAM/maint +@dir include/zeek/script_opt/ZAM/OPs +@dir include/zeek/analyzer/protocol/quic +@dir include/zeek/analyzer/protocol/ldap %%ZEEKCTL%%@postexec su -fm %%ZEEKUSER%% -c '%D/bin/zeekctl install; rm -f %D/spool/debug.log'