git: e05695c847b9 - main - security/zeek: Address stage-qa issues

From: Craig Leres <leres_at_FreeBSD.org>
Date: Sun, 12 Jul 2026 03:05:13 UTC
The branch main has been updated by leres:

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

commit e05695c847b90e2d4373c7f533a5872d61a8794f
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2026-07-12 03:04:43 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2026-07-12 03:04:43 +0000

    security/zeek: Address stage-qa issues
    
    Add missing pkg-plist entries for things installed in /var.
    Also clean up empty include directories in STAGEDIR.
    
    Reported by:    diizzy
---
 security/zeek/Makefile  |  3 +++
 security/zeek/pkg-plist | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index 177ca3225572..a0f360b51208 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	zeek
 DISTVERSION=	8.0.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://download.zeek.org/
 
@@ -171,6 +172,8 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/zeek-cut
 	@${RM} ${STAGEDIR}${PREFIX}/share/zeek/tests
 	${LN} -s ../btest/data ${STAGEDIR}${PREFIX}/share/zeek/tests
+	# upstream leaks a lot of empty include directories!
+	@${FIND} ${STAGEDIR}${PREFIX}/include/zeek -type d -empty -delete
 
 post-install-ZEEKCTL-on:
 	${MKDIR} ${STAGEDIR}/var/spool/zeek/installed-scripts-do-not-touch/auto
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 446c2fbbfaa7..ac9169fc8c76 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1,9 +1,3 @@
-@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/log/zeek
-@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek
-@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/tmp
-%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch
-%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch/auto
-%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch/site
 bin/bifcl
 bin/binpac
 %%ZEEKCTL%%bin/capstats
@@ -2302,11 +2296,19 @@ share/zeek/tests
 %%ZEEKCTL%%@preunexec rm -f /var/spool/zeek/installed-scripts-do-not-touch/site/local-worker.zeek
 %%ZEEKCTL%%@preunexec rm -f /var/spool/zeek/installed-scripts-do-not-touch/site/local.zeek
 %%ZEEKCTL%%@preunexec rm -f /var/spool/zeek/installed-scripts-do-not-touch/site/local.zeek.sample
+%%ZEEKCTL%%/var/spool/zeek/zeekctl-config.sh
+@dir var/lib
 @dir share/man/man8
 @dir share/man/man1
 @dir share/man
 %%SPICY%%@dir lib/zeek/spicy
 @dir lib/zeek/plugins
-@dir include/zeek/analyzer/protocol/quic
-@dir include/zeek/analyzer/protocol/ldap
 %%ZEEKCTL%%@postexec su -fm %%ZEEKUSER%% -c '%D/bin/zeekctl install; rm -f /var/spool/zeek/debug.log'
+@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/tmp
+%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch/site
+%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch/auto
+%%ZEEKCTL%%@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/installed-scripts-do-not-touch
+@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/extract_files
+@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek/brokerstore
+@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/spool/zeek
+@dir(%%ZEEKUSER%%,%%ZEEKGROUP%%,) /var/log/zeek