ci: update to macos latest

(cherry picked from commit e1e03c25c9c4289e10bbcadd0fd86ab41a3e4003)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 8e1dc09db532ed48d606a77b1947bda688ec3137..db619add24fa4a87673cd843a0bca7112f79acec 100644 (file)
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -1391,8 +1391,7 @@ jobs:
 
   macos-latest:
     name: MacOS Latest
-    # use 10.15 for now. Build fails on macos-11 (aka macos-latest)
-    runs-on: macos-10.15
+    runs-on: macos-latest
     needs: [prepare-deps]
     steps:
       # Cache Rust stuff.
@@ -1436,7 +1435,8 @@ jobs:
       - run: ./autogen.sh
       - run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests
       - run: make -j2
-      - run: make check
+      # somehow it gets included by some C++ stdlib header (case unsensitive)
+      - run: rm libhtp/VERSION && make check
       - run: tar xf prep/suricata-verify.tar.gz
       - name: Running suricata-verify
         run: python3 ./suricata-verify/run.py

diff --git a/src/util-daemon.c b/src/util-daemon.c
index 8e6e6b63cda594be8518994b1f6200fa9c8266fb..085df077e6863736ca27a27b4f7961a823be8b00 100644 (file)
--- a/src/util-daemon.c
+++ b/src/util-daemon.c
@@ -110,7 +110,14 @@ void Daemonize (void)
               through conf file */
 
     /* Creates a new process */
+#if defined(OS_DARWIN) && defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
     pid = fork();
+#if defined(OS_DARWIN) && defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
     if (pid < 0) {
         /* Fork error */