From: abenson <abenson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zeek: update to 4.0.0.
Date: Tue, 30 Mar 2021 05:35:58 +0200 [thread overview]
Message-ID: <20210330033558.8VPYDKk-KsMZu8ItBUAafiRyHJ-3hOA3cLARVhJAWu8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29188@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages zeek_4.0.0
https://github.com/void-linux/void-packages/pull/29188
zeek: update to 4.0.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29188.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeek_4.0.0-29188.patch --]
[-- Type: text/x-diff, Size: 3104 bytes --]
From 6b4b450d7a93c195e322f9b03b14d0676c3bcce4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson@gmail.com>
Date: Tue, 2 Mar 2021 18:24:34 -0700
Subject: [PATCH] zeek: update to 4.0.0.
---
common/shlibs | 6 ++---
srcpkgs/zeek/patches/timeval.patch | 40 ++++++++++++++++++++++++++++++
srcpkgs/zeek/template | 8 +++---
3 files changed, 48 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/zeek/patches/timeval.patch
diff --git a/common/shlibs b/common/shlibs
index 3a2c8d27b3a0..914a2d4a09ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,9 +3532,9 @@ 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
-libcaf_core.so.0.17.6 zeek-3.2.4_2
-libcaf_io.so.0.17.6 zeek-3.2.4_2
-libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+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
libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1
diff --git a/srcpkgs/zeek/patches/timeval.patch b/srcpkgs/zeek/patches/timeval.patch
new file mode 100644
index 000000000000..47f0730becde
--- /dev/null
+++ b/srcpkgs/zeek/patches/timeval.patch
@@ -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>
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 408b3fe11407..13625e90c744 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,9 +1,10 @@
# Template file for 'zeek'
pkgname=zeek
-version=3.2.4
-revision=2
+version=4.0.0
+revision=1
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
+configure_args="-DCMAKE_INSTALL_LIBDIR=lib"
hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
bind-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"
homepage="https://www.zeek.org"
distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
-checksum=d5a984d383c0cc337e18d3d65b969e8566ab8a6fc38e9c6d39ba4a101027be85
+checksum=f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat"
@@ -61,6 +62,7 @@ zeek-devel_package() {
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/share/zeek/cmake
+ vmove usr/lib/cmake
}
}
next prev parent reply other threads:[~2021-03-30 3:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-03 1:25 [PR PATCH] " abenson
2021-03-30 3:35 ` abenson [this message]
2021-03-30 4:03 ` abenson
2021-03-30 22:25 ` [PR PATCH] [Merged]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210330033558.8VPYDKk-KsMZu8ItBUAafiRyHJ-3hOA3cLARVhJAWu8@z \
--to=abenson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).