diff --git a/CHANGES b/CHANGES index b289b52f5f..e69b0d5e25 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +3.3.0-dev.512 | 2020-11-10 13:55:33 -0700 + + * Change Debian 10 CI config to use GCC (Jon Siwek, Corelight) + + * Update external testing repo hashes for canonification updates (Tim Wojtulewicz, Corelight) + 3.3.0-dev.509 | 2020-11-10 08:41:54 -0700 * GH-1221: Add unknown_protocols.log for logging packet analyzer lookup failures (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 5f2e92dac8..a399488b3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.509 +3.3.0-dev.512 diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile index 2a9d29d259..ea5a9ab0b3 100644 --- a/ci/debian-10/Dockerfile +++ b/ci/debian-10/Dockerfile @@ -23,14 +23,8 @@ RUN apt-get update && apt-get -y install \ curl \ wget \ xz-utils \ - clang \ - libc++-7-dev \ - libc++abi-7-dev \ && rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 - # Many distros adhere to PEP 394's recommendation for `python` = `python2` so # this is a simple workaround until we drop Python 2 support and explicitly # use `python3` for all invocations (e.g. in shebangs). @@ -38,5 +32,3 @@ RUN ln -sf /usr/bin/python3 /usr/local/bin/python RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip RUN pip install junit2html - -ENV CXXFLAGS=-stdlib=libc++