Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'topic/christian/bump-highwayhash'

Browse source 
* topic/christian/bump-highwayhash:
  CI tweak: upgrade curl on FreeBSD to avoid cert expiration
  CI tweak: add a datestamp to Debian 9 Dockerfiles to invalidate Cirrus build cache
  Bump highwayhash submodule to pull in another FreeBSD header fix
This commit is contained in:
Christian Kreibich 2021-10-01 13:28:39 -07:00
commit 0e5e01f65f
6 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,3 +1,12 @@
4.2.0-dev.240 | 2021-10-01 13:28:39 -0700
* Bump highwayhash submodule to pull in another FreeBSD header fix (Christian Kreibich, Corelight)
* CI tweak: upgrade curl on FreeBSD to avoid cert expiration (Christian Kreibich, Corelight)
* CI tweak: add a datestamp to Debian 9 Dockerfiles to invalidate Cirrus build cache (Christian Kreibich, Corelight)
4.2.0-dev.235 | 2021-09-28 10:04:46 -0700 4.2.0-dev.235 | 2021-09-28 10:04:46 -0700
* GHI-1766: Remove address from Site::private_address_space that converts into 0.0.0.0/0 (Tim Wojtulewicz, Corelight) * GHI-1766: Remove address from Site::private_address_space that converts into 0.0.0.0/0 (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.2.0-dev.235 4.2.0-dev.240

2
auxil/highwayhash

@ -1 +1 @@
Subproject commit 2361494e0400d52eb76d2c6c62db72168ebe69d0 Subproject commit ca0ff296b116354957276cef2c61be171ac2f897

4
ci/debian-9-32bit/Dockerfile
View file

@ -2,6 +2,10 @@ FROM i386/debian:9
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
# A version field to invalide Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 221001
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \ git \
cmake \ cmake \

4
ci/debian-9/Dockerfile
View file

@ -2,6 +2,10 @@ FROM debian:9
ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
# A version field to invalide Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 221001
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
git \ git \
cmake \ cmake \

1
ci/freebsd/prepare.sh
View file

@ -7,6 +7,7 @@ set -x
env ASSUME_ALWAYS_YES=YES pkg bootstrap env ASSUME_ALWAYS_YES=YES pkg bootstrap
pkg install -y bash git cmake swig bison python3 base64 pkg install -y bash git cmake swig bison python3 base64
pkg upgrade -y curl
pyver=`python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")'` pyver=`python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")'`
pkg install -y $pyver-sqlite3 $pyver-pip pkg install -y $pyver-sqlite3 $pyver-pip
pip install junit2html pip install junit2html