From ed32ee73faf7f5288f841d887a0888cf04f5c9f2 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 17 Mar 2025 11:55:11 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/timw/ci-macos-sequoia'

* origin/topic/timw/ci-macos-sequoia:
  ci/init-external-repo.sh: Use regex to match macos cirrus task
  CI: Change macOS runner to Sequoia

(cherry picked from commit 43f108bb71bca8cec7faeb8d1aeae5c5920fcee6)
---
 .cirrus.yml               |  6 +++---
 CHANGES                   | 14 ++++++++++++++
 VERSION                   |  2 +-
 ci/init-external-repos.sh |  6 +++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8bdcf4f469..f0d88e4af2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -346,12 +346,12 @@ alpine_task:
 # Cirrus only supports the following macos runner currently, selecting
 # anything else automatically upgrades to this one.
 #
-#    ghcr.io/cirruslabs/macos-runner:sonoma
+#    ghcr.io/cirruslabs/macos-runner:sequoia
 #
 # See also: https://cirrus-ci.org/guide/macOS/
-macos_sonoma_task:
+macos_sequoia_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:sonoma
+    image: ghcr.io/cirruslabs/macos-runner:sequoia
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_ENVIRONMENT
diff --git a/CHANGES b/CHANGES
index 79da4a1737..6102fe5bf8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+7.0.5-6 | 2025-03-18 16:20:53 -0700
+
+  * ci/init-external-repo.sh: Use regex to match macos cirrus task (Arne Welzel, Corelight)
+
+    (cherry picked from commit 43f108bb71bca8cec7faeb8d1aeae5c5920fcee6)
+
+  * CI: Change macOS runner to Sequoia (Tim Wojtulewicz, Corelight)
+
+    (cherry picked from commit 43f108bb71bca8cec7faeb8d1aeae5c5920fcee6)
+
+  * Update mozilla-ca-list.zeek and ct-list.zeek to NSS 3.109 (Tim Wojtulewicz, Corelight)
+
+  * CI: Update freebsd to 13.4 and 14.2 (Tim Wojtulewicz, Corelight)
+
 7.0.5-4 | 2025-03-18 16:17:54 -0700
 
   * Add analyzer registration from VLAN to VNTAG (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index da657f1fe1..543be1f276 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.0.5-4
+7.0.5-6
diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh
index 7f27f582be..eeb693f1f6 100755
--- a/ci/init-external-repos.sh
+++ b/ci/init-external-repos.sh
@@ -51,9 +51,9 @@ if [[ -n "${CIRRUS_CI}" ]] && [[ "${CIRRUS_REPO_OWNER}" == "zeek" ]] && [[ ! -d
 
     banner "Trying to clone zeek-testing-private git repo"
     echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" >cirrus_key.b64
-    if [ "${CIRRUS_TASK_NAME}" == "macos_ventura" -o "${CIRRUS_TASK_NAME}" == "macos_sonoma" ]; then
-        # The base64 command provided with macOS Ventura/Sonoma requires an argument
-        # to pass the input filename
+    if [[ "${CIRRUS_TASK_NAME}" =~ ^macos_ ]]; then
+        # The base64 command provided with macOS requires an argument
+        # to pass the input filename, while -i elsewhere is "ignore garbage".
         base64 -d -i cirrus_key.b64 >cirrus_key
     else
         base64 -d cirrus_key.b64 >cirrus_key