Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/allow-macos-libkrb5'

Browse source 
* origin/topic/timw/allow-macos-libkrb5:
  Allow macOS to search for libkrb5, but disallow system version of library
This commit is contained in:
Tim Wojtulewicz 2025-05-13 10:03:46 -07:00
commit 5aa6734042
7 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -18,6 +18,7 @@ spicy_ssl_config: &SPICY_SSL_CONFIG --build-type=release --disable-broker-tests
asan_sanitizer_config: &ASAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=address --enable-fuzzers --enable-coverage --ccache --enable-werror asan_sanitizer_config: &ASAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=address --enable-fuzzers --enable-coverage --ccache --enable-werror
ubsan_sanitizer_config: &UBSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=undefined --enable-fuzzers --ccache --enable-werror ubsan_sanitizer_config: &UBSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=undefined --enable-fuzzers --ccache --enable-werror
tsan_sanitizer_config: &TSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=thread --enable-fuzzers --ccache --enable-werror tsan_sanitizer_config: &TSAN_SANITIZER_CONFIG --build-type=debug --disable-broker-tests --sanitizers=thread --enable-fuzzers --ccache --enable-werror
macos_config: &MACOS_CONFIG --build-type=release --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install --ccache --enable-werror --with-krb5=/opt/homebrew/opt/krb5
resources_template: &RESOURCES_TEMPLATE resources_template: &RESOURCES_TEMPLATE
cpu: *CPUS cpu: *CPUS
@ -33,6 +34,7 @@ macos_environment: &MACOS_ENVIRONMENT
ZEEK_CI_BTEST_JOBS: 12 ZEEK_CI_BTEST_JOBS: 12
# No permission to write to default location of /zeek # No permission to write to default location of /zeek
CIRRUS_WORKING_DIR: /tmp/zeek CIRRUS_WORKING_DIR: /tmp/zeek
ZEEK_CI_CONFIGURE_FLAGS: *MACOS_CONFIG
freebsd_resources_template: &FREEBSD_RESOURCES_TEMPLATE freebsd_resources_template: &FREEBSD_RESOURCES_TEMPLATE
cpu: 8 cpu: 8

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.94 | 2025-05-13 10:03:46 -0700
* Allow macOS to search for libkrb5, but disallow system version of library (Tim Wojtulewicz, Corelight)
8.0.0-dev.92 | 2025-05-13 18:26:22 +0200 8.0.0-dev.92 | 2025-05-13 18:26:22 +0200
* btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight) * btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight)

12
CMakeLists.txt
View file

@ -1087,13 +1087,11 @@ if (LIBMMDB_FOUND)
endif () endif ()
set(USE_KRB5 false) set(USE_KRB5 false)
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_package(LibKrb5)
find_package(LibKrb5) if (LIBKRB5_FOUND)
if (LIBKRB5_FOUND) set(USE_KRB5 true)
set(USE_KRB5 true) include_directories(BEFORE ${LibKrb5_INCLUDE_DIR})
include_directories(BEFORE ${LibKrb5_INCLUDE_DIR}) list(APPEND OPTLIBS ${LibKrb5_LIBRARY})
list(APPEND OPTLIBS ${LibKrb5_LIBRARY})
endif ()
endif () endif ()
set(HAVE_PERFTOOLS false) set(HAVE_PERFTOOLS false)

4
NEWS
View file

@ -38,6 +38,10 @@ Changed Functionality
published vectors with holes. A reporter error is produced at runtime when published vectors with holes. A reporter error is produced at runtime when
serialization of vectors with holes is attempted. serialization of vectors with holes is attempted.
- Using libkrb5 for Kerberos support is now allowed on macOS. Due to very old age and
brokenness, the system version of the library is unsupported and will fail to
configure. Use the version from Homebrew or another newer installation.
Removed Functionality Removed Functionality
--------------------- ---------------------

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.92 8.0.0-dev.94

2
ci/macos/prepare.sh
View file

@ -7,7 +7,7 @@ set -x
brew update brew update
brew upgrade cmake brew upgrade cmake
brew install cppzmq openssl@3 python@3 swig bison flex ccache libmaxminddb dnsmasq brew install cppzmq openssl@3 python@3 swig bison flex ccache libmaxminddb dnsmasq krb5
which python3 which python3
python3 --version python3 --version

2
cmake

@ -1 +1 @@
Subproject commit fd0696f9077933660f7da5f81978e86b3e967647 Subproject commit c63efd65e874d689bb28aab390456b2d96941e15