From e3188eb66ab2b4a0b283616c6d59034d3a888fbe Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 11 Sep 2020 14:46:44 -0500
Subject: [PATCH] zeek: update to 3.2.1. [ci skip]

---
 srcpkgs/zeek/patches/fix-vsx.patch            | 29 ---------------
 .../zeek/patches/google-sucks-part-2.patch    | 36 -------------------
 srcpkgs/zeek/template                         |  7 ++--
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/zeek/patches/fix-vsx.patch
 delete mode 100644 srcpkgs/zeek/patches/google-sucks-part-2.patch

diff --git a/srcpkgs/zeek/patches/fix-vsx.patch b/srcpkgs/zeek/patches/fix-vsx.patch
deleted file mode 100644
index d489cdfb1d4..00000000000
--- a/srcpkgs/zeek/patches/fix-vsx.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c65741bd62d462bab4410ce4f429ad33534cc0df Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Tue, 18 Aug 2020 19:12:19 +0200
-Subject: [PATCH] fix vsx
-
----
- src/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/CMakeLists.txt src/CMakeLists.txt
-index 1d2d5c5..9140fa9 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -344,10 +344,10 @@ elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")
-        ../auxil/highwayhash/highwayhash/hh_neon.cc
-   )
- elseif (${COMPILER_ARCHITECTURE} STREQUAL "power")
--  set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
-+  set_source_files_properties(../auxil/highwayhash/highwayhash/hh_vsx.cc PROPERTIES COMPILE_FLAGS
-                               -mvsx)
-   list(APPEND HH_SRCS
--       ../auxil/highwayhash/highwayhash/hh_vsc.cc
-+       ../auxil/highwayhash/highwayhash/hh_vsx.cc
-   )
- elseif(${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
-   set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
--- 
-2.28.0
-
diff --git a/srcpkgs/zeek/patches/google-sucks-part-2.patch b/srcpkgs/zeek/patches/google-sucks-part-2.patch
deleted file mode 100644
index 2af534821e8..00000000000
--- a/srcpkgs/zeek/patches/google-sucks-part-2.patch
+++ /dev/null
@@ -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
---- auxil/highwayhash/highwayhash/arch_specific.cc
-+++ 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
-
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 825e56e0fe4..e3b5b7be962 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,6 +1,6 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=3.2.0
+version=3.2.1
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.zeek.org"
 distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
-checksum=af3ee5635140a54d305667983d38ea28f36457c9f2f8727e90ea3ef00b22c44f
+checksum=1ebcc73815b00df7b7f578d34cd0278030857b6c082aaff416016b00d3d1cb67
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"
@@ -65,7 +65,6 @@ zeek-devel_package() {
 }
 
 bro_package() {
-	archs=noarch
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" (transitional dummy package)"
@@ -74,13 +73,11 @@ bro_package() {
 binpac_package() {
 	short_desc+=" - protocol parser compiler (transitional)"
 	build_style=meta
-	archs=noarch
 	depends="${sourcepkg}>=${version}_${revision}"
 }
 
 binpac-devel_package() {
 	short_desc+=" - protocol parser compiler library (transitional)"
 	build_style=meta
-	archs=noarch
 	depends="${sourcepkg}-devel>=${version}_${revision}"
 }