From 036ed95a3adec89f77f490112d867de7a0ca439f Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Thu, 4 Jul 2024 13:38:49 +0200
Subject: [PATCH 1/2] ci/macos: Only use sonoma image

---
 .cirrus.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ab50a7bc73..1323ce8e95 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -338,18 +338,15 @@ alpine_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-# Apple doesn't publish official long-term support timelines.
-# We aim to support both the current and previous macOS release.
+# Cirrus only supports the following macos runner currently, selecting
+# anything else automatically upgrades to this one.
+#
+#    ghcr.io/cirruslabs/macos-runner:sonoma
+#
+# See also: https://cirrus-ci.org/guide/macOS/
 macos_sonoma_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
-  prepare_script: ./ci/macos/prepare.sh
-  << : *CI_TEMPLATE
-  << : *MACOS_ENVIRONMENT
-
-macos_ventura_task:
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-base:latest
+    image: ghcr.io/cirruslabs/macos-runner:sonoma
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT

From 36dfe89b59c17e42d86c80699079160f5636560e Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Thu, 4 Jul 2024 15:10:26 +0200
Subject: [PATCH 2/2] CMakeLists: Ensure Threads::Threads target exists

Fix failure on OSX with CMake 3.30 complaining about missing
Threads::Threads target.
---
 CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13ea5a5fe2..c4c7aa9990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,9 @@ function (zeek_add_dependencies dep)
     endforeach ()
 endfunction ()
 
+# Used by library zeek_dynamic_plugin_base and for sanitizer builds.
+find_package(Threads REQUIRED)
+
 # Interface library for propagating extra flags and include paths to dynamically
 # loaded plugins. Also propagates include paths and C++17 mode on the install
 # interface.
@@ -640,11 +643,6 @@ if (NOT BINARY_PACKAGING_MODE)
 endif ()
 
 if (ZEEK_SANITIZERS)
-    # Check the thread library info early as setting compiler flags seems to
-    # interfere with the detection and cause CMAKE_THREAD_LIBS_INIT to not include
-    # -lpthread when it should.
-    find_package(Threads)
-
     string(REPLACE "," " " _sanitizer_args "${ZEEK_SANITIZERS}")
     separate_arguments(_sanitizer_args)
     set(ZEEK_SANITIZERS "")