wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zeek: update to 4.0.0.

Browse source
This commit is contained in:
Andrew Benson 2021-03-02 18:24:34 -07:00
parent 728d0d7e00
commit 2311bd0774
3 changed files with 48 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/shlibs
View file

@ -3532,9 +3532,9 @@ libupstart.so.1 libupstart-1.13.3_1
librtas.so.2 librtas-2.0.2_1 librtas.so.2 librtas-2.0.2_1
librtasevent.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.2 zeek-3.2.4_2
libcaf_core.so.0.17.6 zeek-3.2.4_2 libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.17.6 zeek-3.2.4_2 libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.17.6 zeek-3.2.4_2 libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2 libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1 libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1 libpinyin.so.13 libpinyin-2.2.1_1

40
srcpkgs/zeek/patches/timeval.patch Normal file
View file

@ -0,0 +1,40 @@
--- 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>

8
srcpkgs/zeek/template
View file

@ -1,9 +1,10 @@
# Template file for 'zeek' # Template file for 'zeek'
pkgname=zeek pkgname=zeek
version=3.2.4 version=4.0.0
revision=2 revision=1
archs="x86_64* i686* aarch64* armv7* ppc64*" archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake build_style=cmake
configure_args="-DCMAKE_INSTALL_LIBDIR=lib"
hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
bind-devel zlib-devel" bind-devel zlib-devel"
makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel" makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
@ -12,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://www.zeek.org" homepage="https://www.zeek.org"
distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz" distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
checksum=d5a984d383c0cc337e18d3d65b969e8566ab8a6fc38e9c6d39ba4a101027be85 checksum=f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat" makedepends+=" musl-fts-devel musl-legacy-compat"
@ -61,6 +62,7 @@ zeek-devel_package() {
vmove "usr/lib/*.a" vmove "usr/lib/*.a"
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove usr/share/zeek/cmake vmove usr/share/zeek/cmake
vmove usr/lib/cmake
} }
} }