Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Baseline updates.

Browse source 
Also a small tweak to the genDocSourcesList.sh as I was seein
non-consistent output order.
This commit is contained in:
Robin Sommer 2011-10-26 15:09:32 -07:00
parent 3ec7cc168f
commit 5b79d2b15f
6 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,7 +1,7 @@
2.0-beta-pre | 2011-10-26 14:48:59 -0700 1.6-dev-1507 | 2011-10-26 15:10:18 -0700
* Release 2.0-beta-pre. * Baseline updates. (Robin Sommer)
1.6-dev-1506 | 2011-10-26 14:48:43 -0700 1.6-dev-1506 | 2011-10-26 14:48:43 -0700

2
VERSION
View file

@ -1 +1 @@
2.0-beta-pre 1.6-dev-1507

1
doc/scripts/DocSourcesList.cmake
View file

@ -42,6 +42,7 @@ rest_target(${psd} base/frameworks/notice/actions/add-geodata.bro)
rest_target(${psd} base/frameworks/notice/actions/drop.bro) rest_target(${psd} base/frameworks/notice/actions/drop.bro)
rest_target(${psd} base/frameworks/notice/actions/email_admin.bro) rest_target(${psd} base/frameworks/notice/actions/email_admin.bro)
rest_target(${psd} base/frameworks/notice/actions/page.bro) rest_target(${psd} base/frameworks/notice/actions/page.bro)
rest_target(${psd} base/frameworks/notice/actions/pp-alarms.bro)
rest_target(${psd} base/frameworks/notice/cluster.bro) rest_target(${psd} base/frameworks/notice/cluster.bro)
rest_target(${psd} base/frameworks/notice/extend-email/hostnames.bro) rest_target(${psd} base/frameworks/notice/extend-email/hostnames.bro)
rest_target(${psd} base/frameworks/notice/main.bro) rest_target(${psd} base/frameworks/notice/main.bro)

2
doc/scripts/genDocSourcesList.sh
View file

@ -11,6 +11,8 @@
# Specific scripts can be blacklisted below when e.g. they currently aren't # Specific scripts can be blacklisted below when e.g. they currently aren't
# parseable or they just aren't meant to be documented. # parseable or they just aren't meant to be documented.
export LC_ALL=C # Make sorting stable.
blacklist () blacklist ()
{ {
if [[ "$blacklist" == "" ]]; then if [[ "$blacklist" == "" ]]; then

6
scripts/base/frameworks/notice/actions/pp-alarms.bro
View file

@ -2,6 +2,10 @@
#! in regular intervals, formatted for better human readability. If activated, #! in regular intervals, formatted for better human readability. If activated,
#! that replaces the default summary mail having the raw log output. #! that replaces the default summary mail having the raw log output.
@load base/utils/site
@load base/frameworks/cluster
@load ../main
module Notice; module Notice;
export { export {
@ -104,8 +108,10 @@ function do_msg(out: file, n: Info, line1: string, line2: string, line3: string,
if ( host != 0.0.0.0 ) if ( host != 0.0.0.0 )
{ {
local country = ""; local country = "";
@ifdef ( Notice::ACTION_ADD_GEODATA ) # Make tests happy, cyclic dependency.
if ( n?$remote_location && n$remote_location?$country_code ) if ( n?$remote_location && n$remote_location?$country_code )
country = fmt(" (%s)", n$remote_location$country_code); country = fmt(" (%s)", n$remote_location$country_code);
@endif
name = fmt(" %s = %s%s", host, name, country); name = fmt(" %s = %s%s", host, name, country);
} }

1
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -38,6 +38,7 @@ scripts/base/init-default.bro
scripts/base/frameworks/cluster/./main.bro scripts/base/frameworks/cluster/./main.bro
scripts/base/frameworks/control/__load__.bro scripts/base/frameworks/control/__load__.bro
scripts/base/frameworks/control/./main.bro scripts/base/frameworks/control/./main.bro
scripts/base/frameworks/notice/./actions/pp-alarms.bro
scripts/base/frameworks/dpd/__load__.bro scripts/base/frameworks/dpd/__load__.bro
scripts/base/frameworks/dpd/./main.bro scripts/base/frameworks/dpd/./main.bro
scripts/base/frameworks/signatures/__load__.bro scripts/base/frameworks/signatures/__load__.bro