Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Sep 2023 20:54:06 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1d00d4804dae - main - security/zeek: Clean up USES=python
Message-ID:  <202309062054.386Ks63X021741@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

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

commit 1d00d4804dae5649e741b4a4b2f097e6660cdd05
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-06 20:50:46 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-06 20:50:46 +0000

    security/zeek: Clean up USES=python
    
    - While I'm here, fix PLIST
    
    ====> Checking for pkg-plist issues (check-plist)
    ===> Parsing plist
    ===> Checking for items in STAGEDIR missing from pkg-plist
    Error: Orphaned: @dir lib/%%ZEEKUSER%%/plugins
    Error: Orphaned: @dir lib/%%ZEEKUSER%%/spicy
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    ===> Error: Plist issues found.
    *** Error code 1
    
    Approved by:    portmgr (blanket)
    With hat:       python
---
 security/zeek/Makefile  | 2 +-
 security/zeek/pkg-plist | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index ea426690f273..af4bf8e71088 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libcares.so:dns/c-ares
 RUN_DEPENDS=	c-ares>=1.18.1:dns/c-ares
 
 USES=		bison cmake compiler:c++17-lang cpe gettext-runtime perl5 \
-		python:3.7+ shebangfix ssl
+		python shebangfix ssl
 
 USE_LDCONFIG=	yes
 
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 2077fe07d674..62c8a3eb223c 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1233,6 +1233,7 @@ lib/libparaglob.a
 %%SPICY%%lib/libspicy-rt-debug.a
 %%SPICY%%lib/libspicy-rt.a
 %%SPICY%%lib/libspicy.so
+@dir lib/zeek/plugins
 lib/zeek/python/SubnetTree.py
 lib/zeek/python/_SubnetTree.so
 lib/zeek/python/broker/__init__.py
@@ -1283,6 +1284,7 @@ lib/zeek/python/zeekctl/plugins/lb_pf_ring.py
 lib/zeek/python/zeekctl/plugins/ps.py
 lib/zeek/python/zeekctl/plugins/zeek_port_warning.py
 lib/zeek/python/zeekctl/plugins/zzz_af_packet.py
+@dir lib/zeek/spicy
 %%ZEEKCTL%%man/man1/trace-summary.1.gz
 man/man1/zeek-cut.1.gz
 man/man8/zeek.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309062054.386Ks63X021741>