From 5a26b0c88b6194109e6db8a67bc57c12ebccefc0 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 26 Apr 2021 15:01:42 -0500 Subject: [PATCH] zeek: update to 4.0.1. --- common/shlibs | 2 +- srcpkgs/zeek/patches/timeval.patch | 40 ------------------------------ srcpkgs/zeek/template | 4 +-- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/zeek/patches/timeval.patch diff --git a/common/shlibs b/common/shlibs index 182d311e70f2..4e69b5ccb4ae 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3481,7 +3481,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.2 zeek-3.2.4_2 +libbroker.so.3 zeek-4.0.1_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 diff --git a/srcpkgs/zeek/patches/timeval.patch b/srcpkgs/zeek/patches/timeval.patch deleted file mode 100644 index 47f0730becde..000000000000 --- a/srcpkgs/zeek/patches/timeval.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- src/util.h.orig -+++ src/util.h -@@ -29,6 +29,17 @@ - #include - #include // std::unique_ptr - -+#ifdef TIME_WITH_SYS_TIME -+# include -+# include -+#else -+# ifdef HAVE_SYS_TIME_H -+# include -+# else -+# include -+# endif -+#endif -+ - #ifdef DEBUG - - #include ---- src/util.cc.orig -+++ src/util.cc -@@ -5,17 +5,6 @@ - - #include "zeek/util.h" - --#ifdef TIME_WITH_SYS_TIME --# include --# include --#else --# ifdef HAVE_SYS_TIME_H --# include --# else --# include --# endif --#endif -- - #ifdef HAVE_DARWIN - #include - #include diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template index 13625e90c744..e071ae02cb68 100644 --- a/srcpkgs/zeek/template +++ b/srcpkgs/zeek/template @@ -1,6 +1,6 @@ # Template file for 'zeek' pkgname=zeek -version=4.0.0 +version=4.0.1 revision=1 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake @@ -13,7 +13,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://www.zeek.org" distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz" -checksum=f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54 +checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-fts-devel musl-legacy-compat"