git: 02c1f1a6efdc - main - security/zeek: Update to 4.0.5

From: Craig Leres <leres_at_FreeBSD.org>
Date: Tue, 25 Jan 2022 22:38:37 UTC
The branch main has been updated by leres:

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

commit 02c1f1a6efdc5211e1c5dead4ec2393cd134daf6
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2022-01-25 22:38:12 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2022-01-25 22:38:12 +0000

    security/zeek: Update to 4.0.5
    
    Changes since 4.0.4:
    
     - The highwayhash module was updated to fix a build failure on
       FreeBSD.
    
     - A number of fixes for various problems on the CI infrastructure.
    
     - Writers were not being cleaned up correctly when recreating log
       streams with the same ID as an existing stream. This could lead
       to a crash.
    
     - IP packets with bad/incorrect IP header lengths were not reporting
       weirds as they should be.
    
    Reported by:    Tim Wojtulewicz
---
 security/zeek/Makefile                                       |  6 +++---
 security/zeek/distinfo                                       |  6 +++---
 .../patch-auxil_highwayhash_highwayhash_arch__specific.cc    | 12 ------------
 security/zeek/pkg-plist                                      | 12 ++++++------
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index 09577a4e08aa..6d8ae496b02e 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -1,7 +1,7 @@
 # Created by: David O'Brien <obrien@FreeBSD.org>
 
 PORTNAME=	zeek
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 CATEGORIES=	security
 MASTER_SITES=	https://download.zeek.org/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -13,8 +13,8 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_FreeBSD_12_powerpc64=	Does not build: error: zero-size array 'names'
 
-USES=		bison cmake compiler:c++11-lang cpe gettext-runtime ninja perl5 \
-		python shebangfix ssl
+USES=		bison cmake compiler:c++11-lang cpe gettext-runtime \
+		ninja perl5 python shebangfix ssl
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	limit:0,even
diff --git a/security/zeek/distinfo b/security/zeek/distinfo
index 2d836a70b137..b5b5990755b1 100644
--- a/security/zeek/distinfo
+++ b/security/zeek/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1632345196
-SHA256 (zeek-4.0.4.tar.gz) = d9991de344fa8ed8c92d130837309655dc9e22c4f5e53c141dce6deee5c0505c
-SIZE (zeek-4.0.4.tar.gz) = 30981125
+TIMESTAMP = 1643144165
+SHA256 (zeek-4.0.5.tar.gz) = d3a6989a955019a4ac2993cf1b53c8517d0e8ac1ad84f3404df9ad5d97f414fc
+SIZE (zeek-4.0.5.tar.gz) = 30984675
 SHA256 (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = d37a69babfbb62a51a2413d6b83ae792ce1e7f1ccb1d51bd6b209a10fe5c4d75
 SIZE (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = 9100
diff --git a/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc b/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc
deleted file mode 100644
index ae6bae49a2fe..000000000000
--- a/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- auxil/highwayhash/highwayhash/arch_specific.cc.orig	2021-07-15 09:38:08 UTC
-+++ auxil/highwayhash/highwayhash/arch_specific.cc
-@@ -24,8 +24,8 @@
- #if __GLIBC__
- #include <sys/platform/ppc.h>  // __ppc_get_timebase_freq
- #elif __FreeBSD__
--#include <sys/sysctl.h>
- #include <sys/types.h>
-+#include <sys/sysctl.h>
- #endif
- #endif
- 
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 159b68ff176e..9e47a7822a15 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -1944,12 +1944,12 @@ man/man8/zeek.8.gz
 %%DATADIR%%/policy/tuning/track-all-assets.zeek
 @sample %%DATADIR%%/site/local.zeek.sample
 %%ZEEKCTL%%%%DATADIR%%/test-all-policy.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/__load__.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/auto.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/check.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/main.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/process-trace.zeek
-%%ZEEKCTL%%share/zeek/zeekctl/standalone.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/__load__.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/auto.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/check.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/main.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/process-trace.zeek
+%%ZEEKCTL%%%%DATADIR%%/zeekctl/standalone.zeek
 %%DATADIR%%/zeekygen/__load__.zeek
 %%DATADIR%%/zeekygen/example.zeek
 %%ZEEKCTL%%share/zeekctl/scripts/archive-log