diff --git a/CHANGES b/CHANGES index 35115b2acc..cc2f0e15ed 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.5-375 | 2018-01-11 11:47:01 -0600 + + * Fix a test that fails in some environments (Daniel Thayer) + + * Add CVE ID for BIT-1856. (Johanna Amann) + 2.5-372 | 2017-12-15 15:08:51 -0600 * Remove some DNS weirds that caused volume and are generally not useful: diff --git a/VERSION b/VERSION index d61fe2a063..7cc72ab65d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-372 +2.5-375 diff --git a/testing/btest/coverage/init-default.test b/testing/btest/coverage/init-default.test index 6877159c62..d736277d49 100644 --- a/testing/btest/coverage/init-default.test +++ b/testing/btest/coverage/init-default.test @@ -11,7 +11,7 @@ #@TEST-EXEC: test -e $DIST/scripts/base/init-default.bro #@TEST-EXEC: ( cd $DIST/scripts/base && find . -name '*.bro' ) | sort >"all scripts found" #@TEST-EXEC: bro misc/loaded-scripts -#@TEST-EXEC: cat loaded_scripts.log | egrep -v '/build/|/loaded-scripts.bro|#' | sed 's#/./#/#g' >loaded_scripts.log.tmp +#@TEST-EXEC: cat loaded_scripts.log | egrep -v '/build/scripts/|/loaded-scripts.bro|#' | sed 's#/./#/#g' >loaded_scripts.log.tmp #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed -e ':a' -e '$!N' -e 's/^\(.*\).*\n\1.*/\1/' -e 'ta' >prefix #@TEST-EXEC: cat loaded_scripts.log.tmp | sed 's/ //g' | sed "s#`cat prefix`#./#g" | sort >init-default.bro #@TEST-EXEC: diff -u "all scripts found" init-default.bro | egrep "^-[^-]" > missing_loads