Merge pull request #180653 from tobim/pkgs/zeek-5.0.0

diff --git a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt

index bafbabf1..0579f20a 100644

--- a/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt

+++ b/auxil/spicy/spicy/hilti/toolchain/CMakeLists.txt

@@ -188,11 +188,3 @@ install_headers(include hilti)

 install_headers(${PROJECT_BINARY_DIR}/include/hilti hilti)

 install(CODE "file(REMOVE \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_INCLUDEDIR}/hilti/hilti\")"

 )# Get rid of symlink.

-

-##### Tests

-

-add_executable(hilti-toolchain-tests tests/main.cc tests/id-base.cc tests/visitor.cc tests/util.cc)

-hilti_link_executable_in_tree(hilti-toolchain-tests PRIVATE)

-target_link_libraries(hilti-toolchain-tests PRIVATE doctest)

-target_compile_options(hilti-toolchain-tests PRIVATE "-Wall")

-add_test(NAME hilti-toolchain-tests COMMAND ${PROJECT_BINARY_DIR}/bin/hilti-toolchain-tests)

From 889ee4dd9e778511e2fb850e6467f55a331cded9 Mon Sep 17 00:00:00 2001

From: Tobias Mayer <tobim@fastmail.fm>

Date: Sun, 13 Nov 2022 19:06:00 +0100

Subject: [PATCH] Fix include path in exported CMake targets

---

 CMakeLists.txt | 23 ++++++++++++++---------

 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt

index e22b77aa..77a15314 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -209,7 +209,6 @@ if (CAF_ROOT)

   else()

     find_package(CAF REQUIRED COMPONENTS openssl test io core net)

   endif()

-  list(APPEND LINK_LIBS CAF::core CAF::io CAF::net)

   set(BROKER_USE_EXTERNAL_CAF ON)

 else ()

   message(STATUS "Using bundled CAF")

@@ -243,22 +242,18 @@ endif ()

 # Make sure there are no old header versions on disk.

 install(

-  CODE "MESSAGE(STATUS \"Removing: ${CMAKE_INSTALL_PREFIX}/include/broker\")"

-  CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/include/broker\")")

+  CODE "MESSAGE(STATUS \"Removing: ${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")"

+  CODE "file(REMOVE_RECURSE \"${CMAKE_FULL_INSTALL_INCLUDEDIR}/broker\")")

 # Install all headers except the files from broker/internal.

 install(DIRECTORY include/broker

-        DESTINATION include

+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"

         FILES_MATCHING PATTERN "*.hh"

                        PATTERN "include/broker/internal" EXCLUDE)

-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include)

-

-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)

-

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.hh.in

                ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh)

-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION include/broker)

+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/broker/config.hh DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/broker")

 if (NOT BROKER_EXTERNAL_SQLITE_TARGET)

   include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)

@@ -360,6 +355,11 @@ if (ENABLE_SHARED)

                         OUTPUT_NAME broker)

   target_link_libraries(broker PUBLIC ${LINK_LIBS})

   target_link_libraries(broker PRIVATE CAF::core CAF::io CAF::net)

+  target_include_directories(

+    broker PUBLIC

+      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>

+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

   install(TARGETS broker

           EXPORT BrokerTargets

           DESTINATION ${CMAKE_INSTALL_LIBDIR})

@@ -373,6 +373,11 @@ if (ENABLE_STATIC)

   endif()

   target_link_libraries(broker_static PUBLIC ${LINK_LIBS})

   target_link_libraries(broker_static PRIVATE CAF::core CAF::io CAF::net)

+  target_include_directories(

+    broker_static PUBLIC

+      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>

+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

   install(TARGETS broker_static

           EXPORT BrokerTargets

           DESTINATION ${CMAKE_INSTALL_LIBDIR})

-- 

2.38.1

{ stdenv

, lib

, callPackage

, fetchFromGitHub

, cmake

, pkg-config

, python3

, caf

, openssl

}:

let

  inherit (stdenv.hostPlatform) isStatic;

  src-cmake = fetchFromGitHub {

    owner = "zeek";

    repo = "cmake";

    rev = "0b7a543554622600bc0a42b57a22f291a4fbd86c";

    hash = "sha256-kaBOBTpfR3XyuF4PW5NQKca/UhXXxJJcXVsErFU1VYY=";

  };

  src-3rdparty = fetchFromGitHub {

    owner = "zeek";

    repo = "zeek-3rdparty";

    rev = "eb87829547270eab13c223e6de58b25bc9a0282e";

    hash = "sha256-AVaKcRjF5ZiSR8aPSLBzSTeWVwGWW/aSyQJcN0Yhza0=";

  };

  caf' = caf.overrideAttrs (old: {

    version = "unstable-2022-11-17-zeek";

    src = fetchFromGitHub {

      owner = "zeek";

      repo = "actor-framework";

      rev = "dbb68b4573736d7aeb69268cc73aa766c998b3dd";

      hash = "sha256-RV2mKF3B47h/hDgK/D1UJN/ll2G5rcPkHaLVY1/C/Pg=";

    };

    checkPhase = ''

      runHook preCheck

      libcaf_core/caf-core-test

      libcaf_io/caf-io-test

      libcaf_openssl/caf-openssl-test

      libcaf_net/caf-net-test --not-suites='net.*'

      runHook postCheck

    '';

  });

in

stdenv.mkDerivation rec {

  pname = "zeek-broker";

  version = "2.4.2";

  outputs = [ "out" "py" ];

  strictDeps = true;

  src = fetchFromGitHub {

    owner = "zeek";

    repo = "broker";

    rev = "v${version}";

    hash = "sha256-y07fJEVPDGPv5VThE45SwM342VS6LnEtMvazZHadM/k=";

  };

  postUnpack = ''

    rmdir $sourceRoot/cmake $sourceRoot/3rdparty

    ln -s ${src-cmake} ''${sourceRoot}/cmake

    ln -s ${src-3rdparty} ''${sourceRoot}/3rdparty

    # Refuses to build the bindings unless this file is present, but never

    # actually uses it.

    touch $sourceRoot/bindings/python/3rdparty/pybind11/CMakeLists.txt

  '';

  patches = [

    ./0001-Fix-include-path-in-exported-CMake-targets.patch

  ];

  nativeBuildInputs = [ cmake ];

  buildInputs = [ openssl python3.pkgs.pybind11 ];

  propagatedBuildInputs = [ caf' ];

  cmakeFlags = [

    "-DCAF_ROOT=${caf'}"

    "-DENABLE_STATIC_ONLY:BOOL=${if isStatic then "ON" else "OFF"}"

    "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/"

  ];

  meta = with lib; {

    description = "Zeek's Messaging Library";

    homepage = "https://github.com/zeek/broker";

    license = licenses.bsd3;

    platforms = platforms.unix;

    maintainers = with maintainers; [ tobim ];

  };

}

diff --git a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt

index f154901c..76563717 100644

--- a/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt

+++ b/auxil/spicy/spicy/hilti/runtime/CMakeLists.txt

@@ -69,7 +69,7 @@ target_compile_definitions(hilti-rt-objects PRIVATE "HILTI_RT_BUILD_TYPE_RELEASE

 # Build hilti-rt-debug with debug flags.

 string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG})

 target_compile_options(hilti-rt-debug-objects PRIVATE ${cxx_flags_debug})

-target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall")

+target_compile_options(hilti-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE")

 target_compile_definitions(hilti-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG")

 add_library(hilti-rt-tests-library-dummy1 SHARED src/tests/library-dummy.cc)

diff --git a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt

index 20e7d291..9712341f 100644

--- a/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt

+++ b/auxil/spicy/spicy/spicy/runtime/CMakeLists.txt

@@ -48,7 +48,7 @@ target_link_libraries(spicy-rt-objects PUBLIC hilti-rt-objects)

 # Build spicy-rt-debug with debug flags.

 string(REPLACE " " ";" cxx_flags_debug ${CMAKE_CXX_FLAGS_DEBUG})

 target_compile_options(spicy-rt-debug-objects PRIVATE ${cxx_flags_debug})

-target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall")

+target_compile_options(spicy-rt-debug-objects PRIVATE "-UNDEBUG;-O0;-Wall;-U_FORTIFY_SOURCE")

 target_compile_definitions(spicy-rt-debug-objects PRIVATE "HILTI_RT_BUILD_TYPE_DEBUG")

 target_link_libraries(spicy-rt-debug-objects PUBLIC hilti-rt-debug-objects)

{ lib

, stdenv

, callPackage

, fetchurl

, cmake

, flex

, bison

, spicy-parser-generator

, openssl

, libkqueue

, libpcap

, zlib

, file

, gettext

, coreutils

, ncurses

, caf

}:

let

  broker = callPackage ./broker { };

in

stdenv.mkDerivation rec {

  pname = "zeek";

  version = "4.2.2";

  version = "5.1.2";

  src = fetchurl {

    url = "https://download.zeek.org/zeek-${version}.tar.gz";

    sha256 = "sha256-9Q3X24uAmnSnLUAklK+gC0Mu8eh81ZE2h/7uIVc8cAw=";

    sha256 = "sha256-1DvXUcTbLBm9UjJXuk8DjGEj+lED+s9D+SNnSqA3bwU=";

  };

  strictDeps = true;

  patches = [

    ./avoid-broken-tests.patch

    ./debug-runtime-undef-fortify-source.patch

    ./fix-installation.patch

  ];

  nativeBuildInputs = [

    bison

    cmake

    file

    flex

    python3

  ];

  buildInputs = [

    broker

    spicy-parser-generator

    curl

    gperftools

    libkqueue

    libmaxminddb

    libpcap

    ncurses

    openssl

    python3

    swig

    zlib

  ] ++ lib.optionals stdenv.isDarwin [

    gettext

  ];

  outputs = [ "out" "lib" "py" ];

  postPatch = ''

    patchShebangs ./auxil/spicy/spicy/scripts

    substituteInPlace auxil/spicy/CMakeLists.txt --replace "hilti-toolchain-tests" ""

    substituteInPlace auxil/spicy/spicy/hilti/CMakeLists.txt --replace "hilti-toolchain-tests" ""

  '';

  cmakeFlags = [

    "-DCAF_ROOT=${caf}"

    "-DZEEK_PYTHON_DIR=${placeholder "py"}/lib/${python3.libPrefix}/site-packages"

    "-DBroker_ROOT=${broker}"

    "-DSPICY_ROOT_DIR=${spicy-parser-generator}"

    "-DLIBKQUEUE_ROOT_DIR=${libkqueue}"

    "-DENABLE_PERFTOOLS=true"

    "-DINSTALL_AUX_TOOLS=true"

    "-DZEEK_ETC_INSTALL_DIR=/etc/zeek"

    "-DZEEK_LOG_DIR=/var/log/zeek"

    "-DZEEK_STATE_DIR=/var/lib/zeek"

    "-DZEEK_SPOOL_DIR=/var/spool/zeek"

  ];

  postInstall = ''

    done

  '';

  passthru = {

    inherit broker;

  };

  meta = with lib; {

    description = "Network analysis framework much different from a typical IDS";

    homepage = "https://www.zeek.org";