mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
Merge remote-tracking branch 'origin/topic/timw/enable-krb5-on-not-linux'
* origin/topic/timw/enable-krb5-on-not-linux: CI: Add krb5 to FreeBSD Switch libkrb5 check to exclude only Darwin
This commit is contained in:
commit
4472d600e5
4 changed files with 9 additions and 3 deletions
6
CHANGES
6
CHANGES
|
@ -1,3 +1,9 @@
|
|||
7.2.0-dev.534 | 2025-04-15 08:57:48 -0700
|
||||
|
||||
* CI: Add krb5 to FreeBSD (Tim Wojtulewicz, Corelight)
|
||||
|
||||
* Switch libkrb5 check to exclude only Darwin (Tim Wojtulewicz, Corelight)
|
||||
|
||||
7.2.0-dev.530 | 2025-04-14 10:11:59 -0700
|
||||
|
||||
* Add STORAGE_ prefixes for backends and serializers (Tim Wojtulewicz, Corelight)
|
||||
|
|
|
@ -1060,7 +1060,7 @@ if (LIBMMDB_FOUND)
|
|||
endif ()
|
||||
|
||||
set(USE_KRB5 false)
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
|
||||
if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
find_package(LibKrb5)
|
||||
if (LIBKRB5_FOUND)
|
||||
set(USE_KRB5 true)
|
||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
7.2.0-dev.530
|
||||
7.2.0-dev.534
|
||||
|
|
|
@ -6,7 +6,7 @@ set -e
|
|||
set -x
|
||||
|
||||
env ASSUME_ALWAYS_YES=YES pkg bootstrap
|
||||
pkg install -y bash cppzmq git cmake swig bison python3 base64 flex ccache jq dnsmasq
|
||||
pkg install -y bash cppzmq git cmake swig bison python3 base64 flex ccache jq dnsmasq krb5
|
||||
pkg upgrade -y curl
|
||||
pyver=$(python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")')
|
||||
pkg install -y $pyver-sqlite3
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue