Re: [PR PATCH] [Updated] zeek: update to 3.2.0.

[abenson <abenson@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages zeek_3.2.0
https://github.com/void-linux/void-packages/pull/24231

zeek: update to 3.2.0.


A patch file from https://github.com/void-linux/void-packages/pull/24231.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeek_3.2.0-24231.patch --]
[-- Type: text/x-diff, Size: 3690 bytes --]

From d639136f9c59b152e2b2d11bcfb2b966e42a3930 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 11 Aug 2020 15:26:00 -0500
Subject: [PATCH] zeek: update to 3.2.0.

---
 common/shlibs                       |  6 ++---
 srcpkgs/zeek/patches/fix-musl.patch | 37 -----------------------------
 srcpkgs/zeek/template               |  8 +++----
 3 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/zeek/patches/fix-musl.patch

diff --git a/common/shlibs b/common/shlibs
index a7126bc0a11..3e5b7946c75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3624,9 +3624,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.1.1_1
-libcaf_core.so.0.17.4 zeek-3.1.1_1
-libcaf_io.so.0.17.4 zeek-3.1.1_1
-libcaf_openssl.so.0.17.4 zeek-3.1.1_1
+libcaf_core.so.0.17.6 zeek-3.2.0_1
+libcaf_io.so.0.17.6 zeek-3.2.0_1
+libcaf_openssl.so.0.17.6 zeek-3.2.0_1
 libbinpac.so.0 zeek-3.1.1_1
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
diff --git a/srcpkgs/zeek/patches/fix-musl.patch b/srcpkgs/zeek/patches/fix-musl.patch
deleted file mode 100644
index f4dc549a115..00000000000
--- a/srcpkgs/zeek/patches/fix-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7e5f9b857eb78c4c17a1321a5a5a55bb4afcf2c9 Mon Sep 17 00:00:00 2001
-From: Andrew Benson <abenson@gmail.com>
-Date: Tue, 16 Jun 2020 17:59:44 -0500
-Subject: [PATCH] cmake: Make musl support more distro agnostic
-
----
- CMakeLists.txt | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 9e6d5c73cb..3efae8fa6b 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -334,18 +334,11 @@ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
- # Make everyone find the highwayhash includes
- include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
- 
--# Alpine support
--if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux AND EXISTS /etc/os-release )
--    execute_process(
--        COMMAND grep -q alpine /etc/os-release
--        RESULT_VARIABLE os_release_alpine
--    )
--
--    if ( os_release_alpine EQUAL 0 )
--        find_package(FTS REQUIRED)
--        list(APPEND OPTLIBS ${FTS_LIBRARY})
--        include_directories(BEFORE ${FTS_INCLUDE_DIR})
--    endif ()
-+# Determine if libfts is external to libc, i.e. musl
-+find_package(FTS)
-+if ( FTS_FOUND )
-+    list(APPEND OPTLIBS ${FTS_LIBRARY})
-+    include_directories(BEFORE ${FTS_INCLUDE_DIR})
- endif ()
- 
- set(zeekdeps ${zeekdeps}
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index cbf9712b60e..59c4d1089f4 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,6 +1,6 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=3.1.5
+version=3.2.0
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -12,7 +12,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=b944e8d47ac435bf83ba61cbfb66ce49eb11ca2fbbde1dc2bae638097ae399e7
+checksum=af3ee5635140a54d305667983d38ea28f36457c9f2f8727e90ea3ef00b22c44f
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"
@@ -28,8 +28,8 @@ pre_configure() {
 		cmake ..
 		make ${makejobs} binpac bifcl
 		configure_args+="
-		 -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/aux/bifcl/bifcl
-		 -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/aux/binpac/src/binpac"
+		 -DBIFCL_EXE_PATH:PATH=${wrksrc}/native/auxil/bifcl/bifcl
+		 -DBINPAC_EXE_PATH:PATH=${wrksrc}/native/auxil/binpac/src/binpac"
 		cd ..
 	fi
 }