zeek: update to 6.0.1.

common/shlibs

@@ -3550,7 +3550,7 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 libupstart.so.1 libupstart-1.13.3_1
 librtas.so.2 librtas-2.0.2_1
 librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.3 zeek-4.0.1_1
+libbroker.so.4 zeek-6.0.0_1
 libcaf_core.so.0.18.0 zeek-4.0.0_1
 libcaf_io.so.0.18.0 zeek-4.0.0_1
 libcaf_openssl.so.0.18.0 zeek-4.0.0_1

srcpkgs/zeek/patches/highwayhash-still-sucks.patch

@@ -1,36 +0,0 @@
-From 6a57ff6feaa2900c8a65d0563925171198f5ce64 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Tue, 18 Aug 2020 19:52:01 +0200
-Subject: [PATCH] fix highwayhash on ppc/musl
-
----
- auxil/highwayhash/highwayhash/arch_specific.cc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git auxil/highwayhash/highwayhash/arch_specific.cc auxil/highwayhash/highwayhash/arch_specific.cc
-index 82d1574..198a82f 100644
---- a/auxil/highwayhash/highwayhash/arch_specific.cc
-+++ b/auxil/highwayhash/highwayhash/arch_specific.cc
-@@ -171,15 +171,18 @@ double InvariantTicksPerSecond() {
- #if HH_ARCH_PPC
- #if __GLIBC__  
-   static const double cycles_per_second = __ppc_get_timebase_freq();
-+  return cycles_per_second;
- #elif __FreeBSD__
-   static double cycles_per_second = 0;
-   size_t length = sizeof(cycles_per_second);
-   sysctlbyname("kern.timecounter.tc.timebase.frequency", &cycles_per_second, &length, NULL, 0);
--#endif
-   return cycles_per_second;
- #else
-   return NominalClockRate();
- #endif
-+#else
-+  return NominalClockRate();
-+#endif
- }
- 
- }  // namespace highwayhash
--- 
-2.28.0
-

srcpkgs/zeek/template

@@ -1,53 +1,27 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=4.0.1
+version=6.0.1
-revision=2
+revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_LIBDIR=lib"
+build_helper=qemu
-hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
+configure_args="-DCMAKE_INSTALL_LIBDIR=lib -DZEEK_ETC_INSTALL_DIR=/etc -DDISABLE_SPICY=1"
- bind-devel zlib-devel"
+hostmakedepends="flex pkg-config python3-devel libpcap-devel openssl-devel
-makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
+ bind-devel zlib-devel swig spicy"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel
+ python3-devel libfl-devel"
 short_desc="Advanced framework for network traffic analysis"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.zeek.org"
 distfiles="https://download.zeek.org/zeek-${version}.tar.gz"
-checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a
+checksum=cfc329a170439195d7070ec5387d95cdda7eb6b86ac85ec707b9ed0e9d576a29
+make_check=no # checks are broken
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"
 fi
 
-post_patch() {
-	# no cpuid check in highwayhash for ppc since
-	# google pretends older hardware does not exist
-	case "$XBPS_TARGET_MACHINE" in
-		ppc64le*) ;;
-		ppc*)
-			vsed -i 's/"power"/"google-sucks"/' src/CMakeLists.txt
-			vsed -i 's/HH_ARCH_PPC/HH_ARCH_GOOGLE_SUCKS/g' \
-				auxil/highwayhash/highwayhash/instruction_sets.h
-			;;
-	esac
-}
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p native
-		cd native
-		CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
-		CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
-		LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
-		cmake ..
-		make ${makejobs} binpac bifcl
-		configure_args+="
-		 -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/auxil/bifcl/bifcl
-		 -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/auxil/binpac/src/binpac"
-		cd ..
-	fi
-}
-
 post_install() {
 	vsv zeek
 	vsv bro