zeek: update to 4.0.1.

This commit is contained in:
Andrew Benson 2021-04-26 15:01:42 -05:00 committed by Andrew Benson
parent 385d58bb8a
commit 0ea8b3c510
3 changed files with 3 additions and 43 deletions

View file

@ -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

View file

@ -1,40 +0,0 @@
--- src/util.h.orig
+++ src/util.h
@@ -29,6 +29,17 @@
#include <vector>
#include <memory> // std::unique_ptr
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#ifdef DEBUG
#include <assert.h>
--- src/util.cc.orig
+++ src/util.cc
@@ -5,17 +5,6 @@
#include "zeek/util.h"
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
#ifdef HAVE_DARWIN
#include <mach/task.h>
#include <mach/mach_init.h>

View file

@ -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 <abenson+void@gmail.com>"
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"