From 7b608002316afe9d166a3d2745000c288dd65ed0 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Wed, 25 Aug 2021 12:45:02 -0700
Subject: [PATCH] CI support refresh

- Add Debian 11 (Bullseye)
- Drop Ubuntu 16.04

Includes submodule bumps for corresponding updates
---
 .cirrus.yml                               | 34 +++++++++++------------
 auxil/broker                              |  2 +-
 auxil/zeek-archiver                       |  2 +-
 ci/{ubuntu-16.04 => debian-11}/Dockerfile |  9 +-----
 4 files changed, 20 insertions(+), 27 deletions(-)
 rename ci/{ubuntu-16.04 => debian-11}/Dockerfile (74%)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8219911ac2..184484b2e8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -133,6 +133,23 @@ centos7_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+debian11_task:
+  container:
+    # Debian 11 EOL: June 2026
+    dockerfile: ci/debian-11/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
+debian11_static_task:
+  container:
+    # Just use a recent/common distro to run a static compile test.
+    # Debian 11 EOL: June 2026
+    dockerfile: ci/debian-11/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  env:
+    ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
+
 debian10_task:
   container:
     # Debian 10 EOL: June 2024
@@ -140,16 +157,6 @@ debian10_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-debian10_static_task:
-  container:
-    # Just uses a recent/common distro to run a static compile test.
-    # Debian 10 EOL: June 2024
-    dockerfile: ci/debian-10/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-  env:
-    ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
-
 debian9_task:
   container:
     # Debian 9 EOL: June 2022
@@ -194,13 +201,6 @@ ubuntu18_task:
   env:
     ZEEK_CI_CONFIGURE_FLAGS: *MOBILE_IPV6_CONFIG
 
-ubuntu16_task:
-  container:
-    # Ubuntu 16.04 EOL: April 2021
-    dockerfile: ci/ubuntu-16.04/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-
 alpine_task:
   container:
     # Alpine releases typically happen every 6 months w/ support for 2 years.
diff --git a/auxil/broker b/auxil/broker
index bef5e0b485..7b856adaec 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit bef5e0b485c63e3da4bde9cf01285634a0587cc6
+Subproject commit 7b856adaec012a8d9072aaa4d268565060fbd116
diff --git a/auxil/zeek-archiver b/auxil/zeek-archiver
index d3e55991cb..d3ea092245 160000
--- a/auxil/zeek-archiver
+++ b/auxil/zeek-archiver
@@ -1 +1 @@
-Subproject commit d3e55991cbe69f37966207479492edd38d548b1d
+Subproject commit d3ea09224556e9f206eb6de89cb1f5294bacafcf
diff --git a/ci/ubuntu-16.04/Dockerfile b/ci/debian-11/Dockerfile
similarity index 74%
rename from ci/ubuntu-16.04/Dockerfile
rename to ci/debian-11/Dockerfile
index 5b65acd55f..584fde914c 100644
--- a/ci/ubuntu-16.04/Dockerfile
+++ b/ci/debian-11/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM debian:11
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 
@@ -15,9 +15,6 @@ RUN apt-get update && apt-get -y install \
     python3 \
     python3-dev \
     python3-pip\
-    clang-8 \
-    libc++-8-dev \
-    libc++abi-8-dev \
     swig \
     zlib1g-dev \
     libkrb5-dev \
@@ -29,7 +26,3 @@ RUN apt-get update && apt-get -y install \
   && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install junit2html
-
-ENV CC=/usr/bin/clang-8
-ENV CXX=/usr/bin/clang++-8
-ENV CXXFLAGS=-stdlib=libc++