* [PR PATCH] Zeek 6.0.0
@ 2023-10-03 15:05 abenson
2023-10-03 15:15 ` [PR PATCH] [Updated] Zeek 6.0.1 abenson
2023-10-04 18:29 ` [PR PATCH] [Merged]: " abenson
0 siblings, 2 replies; 3+ messages in thread
From: abenson @ 2023-10-03 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
There is a new pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages zeek_6.0.0
https://github.com/void-linux/void-packages/pull/46408
Zeek 6.0.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
```
pkg host target cross result
spicy x86_64 x86_64 n OK
spicy x86_64-musl x86_64-musl n OK
spicy i686 i686 n OK
spicy x86_64 aarch64-musl y OK
spicy x86_64 aarch64 y OK
spicy x86_64 armv7l-musl y OK
spicy x86_64 armv7l y OK
spicy x86_64 armv6l-musl y OK
spicy x86_64 armv6l y OK
zeek x86_64 x86_64 n OK
zeek x86_64-musl x86_64-musl n OK
zeek i686 i686 n OK
zeek x86_64 aarch64-musl y OK
zeek x86_64 aarch64 y OK
zeek x86_64 armv7l-musl y OK
zeek x86_64 armv7l y OK
zeek x86_64 armv6l-musl y OK
zeek x86_64 armv6l y OK
```
A patch file from https://github.com/void-linux/void-packages/pull/46408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeek_6.0.0-46408.patch --]
[-- Type: text/x-diff, Size: 8385 bytes --]
From 5815558f8c128cf34f9895302879c301e5ba9e82 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 08:29:52 -0500
Subject: [PATCH 1/2] New package: spicy-1.8.1
---
srcpkgs/spicy/patches/fix-cross.patch | 39 +++++++++++++++++++++++++++
srcpkgs/spicy/template | 20 ++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 srcpkgs/spicy/patches/fix-cross.patch
create mode 100644 srcpkgs/spicy/template
diff --git a/srcpkgs/spicy/patches/fix-cross.patch b/srcpkgs/spicy/patches/fix-cross.patch
new file mode 100644
index 0000000000000..d27777c1fd567
--- /dev/null
+++ b/srcpkgs/spicy/patches/fix-cross.patch
@@ -0,0 +1,39 @@
+--- a/scripts/precompile-headers.sh
++++ b/scripts/precompile-headers.sh
+@@ -27,7 +27,7 @@
+ config=$1
+ header=$2;
+
+- for flag in $(${config} --cxxflags); do
++ for flag in $(${CROSSCOMPILE_EMULATOR} ${config} --cxxflags); do
+ if ! echo "${flag}" | grep -q '^-I'; then
+ continue
+ fi
+@@ -49,7 +49,7 @@
+ LIBSPICY=$(search_header "${SPICY_CONFIG}" spicy/rt/libspicy.h)
+
+ # Extract version from `hilti-config`. It should be identical to the one from `spicy-config`.
+-VERSION=$(${HILTI_CONFIG} --version | cut -d ' ' -f1)
++VERSION=$(${CROSSCOMPILE_EMULATOR} ${HILTI_CONFIG} --version | cut -d ' ' -f1)
+
+ # The cache is read from the environment variable `SPICY_CACHE`
+ # if set; else a patch under the user's home directory is used.
+@@ -61,14 +61,14 @@
+ # NOTE: The compiler invocations here should be kept in sync
+ # with what we do in `CMakeLists.txt`.
+ cp "${LIBHILTI}" "${CACHE}/precompiled_libhilti_debug.h"
+-$("${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch"
+
+ cp "${LIBHILTI}" "${CACHE}/precompiled_libhilti.h"
+
+-$("${HILTI_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti.h.gch"
+
+ cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy_debug.h"
+-$("${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch"
+
+ cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy.h"
+-$("${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch"
diff --git a/srcpkgs/spicy/template b/srcpkgs/spicy/template
new file mode 100644
index 0000000000000..1126e78e776b7
--- /dev/null
+++ b/srcpkgs/spicy/template
@@ -0,0 +1,20 @@
+# Template file for 'spicy'
+pkgname=spicy
+version=1.8.1
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="flex python3"
+makedepends="libfl-devel zlib-devel"
+short_desc="Generate Robust Parsers for Protocols & File Formats"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://docs.zeek.org/projects/spicy/en/latest/"
+distfiles="https://github.com/zeek/spicy/releases/download/v${version}/spicy.tar.gz"
+checksum=016d2ba6dc7a35e007bc8519afd7dec4ede15a129ce7b268ebd90865d8da9fa8
+
+if [ "$CROSS_BUILD" ]; then
+ export CROSSCOMPILE_EMULATOR="/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+else
+ export CROSSCOMPILE_EMULATOR=
+fi
From 6fcfb5a7774eb7bfc2807ecbccc068833dc22eb5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Sep 2023 08:15:07 -0500
Subject: [PATCH 2/2] zeek: update to 6.0.1.
---
common/shlibs | 2 +-
.../patches/highwayhash-still-sucks.patch | 36 ---------------
srcpkgs/zeek/template | 46 ++++---------------
3 files changed, 11 insertions(+), 73 deletions(-)
delete mode 100644 srcpkgs/zeek/patches/highwayhash-still-sucks.patch
diff --git a/common/shlibs b/common/shlibs
index 39b5358aa11ec..65017cddb5aa9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,7 +3550,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.3 zeek-4.0.1_1
+libbroker.so.4 zeek-6.0.0_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/highwayhash-still-sucks.patch b/srcpkgs/zeek/patches/highwayhash-still-sucks.patch
deleted file mode 100644
index cde519af34767..0000000000000
--- a/srcpkgs/zeek/patches/highwayhash-still-sucks.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
---- a/auxil/highwayhash/highwayhash/arch_specific.cc
-+++ b/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 272d86734e8ac..38b237ccf8918 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,53 +1,27 @@
# Template file for 'zeek'
pkgname=zeek
-version=4.0.1
-revision=2
+version=6.0.1
+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"
+build_helper=qemu
+configure_args="-DCMAKE_INSTALL_LIBDIR=lib -DZEEK_ETC_INSTALL_DIR=/etc -DDISABLE_SPICY=1"
+hostmakedepends="flex pkg-config python3-devel libpcap-devel openssl-devel
+ bind-devel zlib-devel swig spicy"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel
+ python3-devel libfl-devel"
short_desc="Advanced framework for network traffic analysis"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.zeek.org"
distfiles="https://download.zeek.org/zeek-${version}.tar.gz"
-checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a
+checksum=cfc329a170439195d7070ec5387d95cdda7eb6b86ac85ec707b9ed0e9d576a29
+make_check=no # checks are broken
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat"
fi
-post_patch() {
- # no cpuid check in highwayhash for ppc since
- # google pretends older hardware does not exist
- case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc*)
- vsed -i 's/"power"/"google-sucks"/' src/CMakeLists.txt
- vsed -i 's/HH_ARCH_PPC/HH_ARCH_GOOGLE_SUCKS/g' \
- auxil/highwayhash/highwayhash/instruction_sets.h
- ;;
- esac
-}
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- mkdir -p native
- cd native
- CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
- CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
- LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
- cmake ..
- make ${makejobs} binpac bifcl
- configure_args+="
- -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/auxil/bifcl/bifcl
- -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/auxil/binpac/src/binpac"
- cd ..
- fi
-}
-
post_install() {
vsv zeek
vsv bro
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Zeek 6.0.1
2023-10-03 15:05 [PR PATCH] Zeek 6.0.0 abenson
@ 2023-10-03 15:15 ` abenson
2023-10-04 18:29 ` [PR PATCH] [Merged]: " abenson
1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2023-10-03 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages zeek_6.0.0
https://github.com/void-linux/void-packages/pull/46408
Zeek 6.0.1
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
```
pkg host target cross result
spicy x86_64 x86_64 n OK
spicy x86_64-musl x86_64-musl n OK
spicy i686 i686 n OK
spicy x86_64 aarch64-musl y OK
spicy x86_64 aarch64 y OK
spicy x86_64 armv7l-musl y OK
spicy x86_64 armv7l y OK
spicy x86_64 armv6l-musl y OK
spicy x86_64 armv6l y OK
zeek x86_64 x86_64 n OK
zeek x86_64-musl x86_64-musl n OK
zeek i686 i686 n OK
zeek x86_64 aarch64-musl y OK
zeek x86_64 aarch64 y OK
zeek x86_64 armv7l-musl y OK
zeek x86_64 armv7l y OK
zeek x86_64 armv6l-musl y OK
zeek x86_64 armv6l y OK
```
A patch file from https://github.com/void-linux/void-packages/pull/46408.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeek_6.0.0-46408.patch --]
[-- Type: text/x-diff, Size: 8430 bytes --]
From 1e8a090e8ae6d6d157949cab6bff61f2d67c67c0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 3 Oct 2023 08:29:52 -0500
Subject: [PATCH 1/2] New package: spicy-1.8.1
---
srcpkgs/spicy/patches/fix-cross.patch | 39 +++++++++++++++++++++++++++
srcpkgs/spicy/template | 24 +++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 srcpkgs/spicy/patches/fix-cross.patch
create mode 100644 srcpkgs/spicy/template
diff --git a/srcpkgs/spicy/patches/fix-cross.patch b/srcpkgs/spicy/patches/fix-cross.patch
new file mode 100644
index 0000000000000..d27777c1fd567
--- /dev/null
+++ b/srcpkgs/spicy/patches/fix-cross.patch
@@ -0,0 +1,39 @@
+--- a/scripts/precompile-headers.sh
++++ b/scripts/precompile-headers.sh
+@@ -27,7 +27,7 @@
+ config=$1
+ header=$2;
+
+- for flag in $(${config} --cxxflags); do
++ for flag in $(${CROSSCOMPILE_EMULATOR} ${config} --cxxflags); do
+ if ! echo "${flag}" | grep -q '^-I'; then
+ continue
+ fi
+@@ -49,7 +49,7 @@
+ LIBSPICY=$(search_header "${SPICY_CONFIG}" spicy/rt/libspicy.h)
+
+ # Extract version from `hilti-config`. It should be identical to the one from `spicy-config`.
+-VERSION=$(${HILTI_CONFIG} --version | cut -d ' ' -f1)
++VERSION=$(${CROSSCOMPILE_EMULATOR} ${HILTI_CONFIG} --version | cut -d ' ' -f1)
+
+ # The cache is read from the environment variable `SPICY_CACHE`
+ # if set; else a patch under the user's home directory is used.
+@@ -61,14 +61,14 @@
+ # NOTE: The compiler invocations here should be kept in sync
+ # with what we do in `CMakeLists.txt`.
+ cp "${LIBHILTI}" "${CACHE}/precompiled_libhilti_debug.h"
+-$("${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch"
+
+ cp "${LIBHILTI}" "${CACHE}/precompiled_libhilti.h"
+
+-$("${HILTI_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti.h.gch"
+
+ cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy_debug.h"
+-$("${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch"
+
+ cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy.h"
+-$("${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch"
++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch"
diff --git a/srcpkgs/spicy/template b/srcpkgs/spicy/template
new file mode 100644
index 0000000000000..b6c2f3a30b5fd
--- /dev/null
+++ b/srcpkgs/spicy/template
@@ -0,0 +1,24 @@
+# Template file for 'spicy'
+pkgname=spicy
+version=1.8.1
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="flex python3"
+makedepends="libfl-devel zlib-devel"
+short_desc="Generate Robust Parsers for Protocols & File Formats"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://docs.zeek.org/projects/spicy/en/latest/"
+distfiles="https://github.com/zeek/spicy/releases/download/v${version}/spicy.tar.gz"
+checksum=016d2ba6dc7a35e007bc8519afd7dec4ede15a129ce7b268ebd90865d8da9fa8
+
+if [ "$CROSS_BUILD" ]; then
+ export CROSSCOMPILE_EMULATOR="/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
+else
+ export CROSSCOMPILE_EMULATOR=
+fi
+
+post_install() {
+ vlicense LICENSE
+}
From 67c32677890fe4d2c349ecb48d5bd9636c2efb96 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Sep 2023 08:15:07 -0500
Subject: [PATCH 2/2] zeek: update to 6.0.1.
---
common/shlibs | 2 +-
.../patches/highwayhash-still-sucks.patch | 36 ---------------
srcpkgs/zeek/template | 46 ++++---------------
3 files changed, 11 insertions(+), 73 deletions(-)
delete mode 100644 srcpkgs/zeek/patches/highwayhash-still-sucks.patch
diff --git a/common/shlibs b/common/shlibs
index 39b5358aa11ec..65017cddb5aa9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,7 +3550,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.3 zeek-4.0.1_1
+libbroker.so.4 zeek-6.0.0_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/highwayhash-still-sucks.patch b/srcpkgs/zeek/patches/highwayhash-still-sucks.patch
deleted file mode 100644
index cde519af34767..0000000000000
--- a/srcpkgs/zeek/patches/highwayhash-still-sucks.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
---- a/auxil/highwayhash/highwayhash/arch_specific.cc
-+++ b/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 272d86734e8ac..38b237ccf8918 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,53 +1,27 @@
# Template file for 'zeek'
pkgname=zeek
-version=4.0.1
-revision=2
+version=6.0.1
+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"
+build_helper=qemu
+configure_args="-DCMAKE_INSTALL_LIBDIR=lib -DZEEK_ETC_INSTALL_DIR=/etc -DDISABLE_SPICY=1"
+hostmakedepends="flex pkg-config python3-devel libpcap-devel openssl-devel
+ bind-devel zlib-devel swig spicy"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel
+ python3-devel libfl-devel"
short_desc="Advanced framework for network traffic analysis"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.zeek.org"
distfiles="https://download.zeek.org/zeek-${version}.tar.gz"
-checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a
+checksum=cfc329a170439195d7070ec5387d95cdda7eb6b86ac85ec707b9ed0e9d576a29
+make_check=no # checks are broken
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat"
fi
-post_patch() {
- # no cpuid check in highwayhash for ppc since
- # google pretends older hardware does not exist
- case "$XBPS_TARGET_MACHINE" in
- ppc64le*) ;;
- ppc*)
- vsed -i 's/"power"/"google-sucks"/' src/CMakeLists.txt
- vsed -i 's/HH_ARCH_PPC/HH_ARCH_GOOGLE_SUCKS/g' \
- auxil/highwayhash/highwayhash/instruction_sets.h
- ;;
- esac
-}
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- mkdir -p native
- cd native
- CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
- CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
- LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
- cmake ..
- make ${makejobs} binpac bifcl
- configure_args+="
- -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/auxil/bifcl/bifcl
- -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/auxil/binpac/src/binpac"
- cd ..
- fi
-}
-
post_install() {
vsv zeek
vsv bro
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Zeek 6.0.1
2023-10-03 15:05 [PR PATCH] Zeek 6.0.0 abenson
2023-10-03 15:15 ` [PR PATCH] [Updated] Zeek 6.0.1 abenson
@ 2023-10-04 18:29 ` abenson
1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2023-10-04 18:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1324 bytes --]
There's a merged pull request on the void-packages repository
Zeek 6.0.1
https://github.com/void-linux/void-packages/pull/46408
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
```
pkg host target cross result
spicy x86_64 x86_64 n OK
spicy x86_64-musl x86_64-musl n OK
spicy i686 i686 n OK
spicy x86_64 aarch64-musl y OK
spicy x86_64 aarch64 y OK
spicy x86_64 armv7l-musl y OK
spicy x86_64 armv7l y OK
spicy x86_64 armv6l-musl y OK
spicy x86_64 armv6l y OK
zeek x86_64 x86_64 n OK
zeek x86_64-musl x86_64-musl n OK
zeek i686 i686 n OK
zeek x86_64 aarch64-musl y OK
zeek x86_64 aarch64 y OK
zeek x86_64 armv7l-musl y OK
zeek x86_64 armv7l y OK
zeek x86_64 armv6l-musl y OK
zeek x86_64 armv6l y OK
```
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-04 18:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-03 15:05 [PR PATCH] Zeek 6.0.0 abenson
2023-10-03 15:15 ` [PR PATCH] [Updated] Zeek 6.0.1 abenson
2023-10-04 18:29 ` [PR PATCH] [Merged]: " abenson
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).