diff --git a/CHANGES b/CHANGES index 2124ffae3c..60565108fe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +7.0.0-dev.108 | 2024-04-08 12:02:03 -0700 + + * CI: Remove commented openssl 1.1 workaround from macOS preparation script (Tim Wojtulewicz, Corelight) + + * CI: Fix installation of python package on macOS (Tim Wojtulewicz, Corelight) + + * fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior (Vern Paxson, Corelight) + 7.0.0-dev.102 | 2024-04-02 08:17:08 -0700 * fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index 6a6e66f977..55be7ea95a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.102 +7.0.0-dev.108 diff --git a/ci/macos/prepare.sh b/ci/macos/prepare.sh index 52c4472272..a96833f75f 100755 --- a/ci/macos/prepare.sh +++ b/ci/macos/prepare.sh @@ -8,12 +8,9 @@ set -x brew update brew upgrade cmake brew install openssl@3 swig bison flex ccache libmaxminddb -python3 -m pip install --user websockets -# Brew doesn't create the /opt/homebrew/opt/openssl symlink if you install -# openssl@1.1, only with 3.0. Create the symlink if it doesn't exist. -#if [ ! -e /opt/homebrew/opt/openssl ]; then -# if [ -d /opt/homebrew/opt/openssl@1.1 ]; then -# ln -s /opt/homebrew/opt/openssl@1.1 /opt/homebrew/opt/openssl -# fi -#fi +if [ $(sw_vers -productVersion | cut -d '.' -f 1) -lt 14 ]; then + python3 -m pip install --upgrade pip +fi + +python3 -m pip install --user --break-system-packages websockets