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

Merge branch 'master' into devel

Browse source
This commit is contained in:
Gregor Maier 2011-03-14 09:11:41 -07:00
commit 92b5686124
9 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitmodules vendored
View file

@ -1,15 +1,15 @@
[submodule "aux/bro-aux"] [submodule "aux/bro-aux"]
path = aux/bro-aux path = aux/bro-aux
url = git://git.icir.org/bro-aux url = git://git.bro-ids.org/bro-aux
[submodule "aux/binpac"] [submodule "aux/binpac"]
path = aux/binpac path = aux/binpac
url = git://git.icir.org/binpac url = git://git.bro-ids.org/binpac
[submodule "aux/broccoli"] [submodule "aux/broccoli"]
path = aux/broccoli path = aux/broccoli
url = git://git.icir.org/broccoli url = git://git.bro-ids.org/broccoli
[submodule "aux/broctl"] [submodule "aux/broctl"]
path = aux/broctl path = aux/broctl
url = git://git.icir.org/broctl url = git://git.bro-ids.org/broctl
[submodule "aux/btest"] [submodule "aux/btest"]
path = aux/btest path = aux/btest
url = git://git.icir.org/btest url = git://git.bro-ids.org/btest

1
CHANGES
View file

@ -1,3 +1,4 @@
1.6-dev.53 Fri Feb 25 17:03:05 PST 2011 1.6-dev.53 Fri Feb 25 17:03:05 PST 2011
- Fixing file detector leak in remote communication module. (Scott - Fixing file detector leak in remote communication module. (Scott

4
CMakeLists.txt
View file

@ -37,6 +37,10 @@ endif ()
get_filename_component(POLICYDIR ${POLICYDIR} ABSOLUTE) get_filename_component(POLICYDIR ${POLICYDIR} ABSOLUTE)
configure_file(bro-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev) configure_file(bro-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.sh
"export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.csh
"setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n")
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)

13
INSTALL
View file

@ -92,6 +92,13 @@ with it. In the following we give a few simple examples. See the
quickstart guide at http://www.bro-ids.org for more information; you quickstart guide at http://www.bro-ids.org for more information; you
can the source that in doc/quick-start. can the source that in doc/quick-start.
For developers that wish to run Bro after performing "make", but For developers that wish to run Bro from the the build/ directory
without performing "make install", see build/bro-path-dev for after performing "make", but without performing "make install", they
an example. will have to first set BROPATH to look for scripts inside the build
directory. Sourcing either build/bro-path-dev.sh or build/bro-path-dev.csh
as appropriate for the current shell accomplishes this. e.g.:
> ./configure
> make
> source build/bro-path-dev.sh
> ./build/src/bro

2
aux/bro-aux

@ -1 +1 @@
Subproject commit afa0a0d8b3fdfa5306507948f08ac9f07696eb21 Subproject commit 7e50bac938af1831ecf9660159145a3c2e77e13d

2
aux/broccoli

@ -1 +1 @@
Subproject commit 2b8a1c9c32dab2da9ebb54238c1b60e40bb8688f Subproject commit 584c8ac840ff89905f8ff45f69c95353e9b09113

2
aux/broctl

@ -1 +1 @@
Subproject commit fc940bbb72abbaef2e5f10ea4ab616ec9b61fe0a Subproject commit a7c00a361022f2269985dbaaad11197f1a0dc667

2
aux/btest

@ -1 +1 @@
Subproject commit a2b04952ae91dcd27d5e68a42d5d26c291ecb1f5 Subproject commit acf25f34ab48568f5db919c9e3505ed319daa4e5

3
bro-path-dev.in
View file

@ -1,3 +1,4 @@
#!/bin/sh
# After configured by CMake, this file prints the absolute path to policy # After configured by CMake, this file prints the absolute path to policy
# files that come with the source distributions of Bro and Broctl as well # files that come with the source distributions of Bro and Broctl as well
# as policy files that are generated by the BIF compiler at compile time # as policy files that are generated by the BIF compiler at compile time
@ -6,7 +7,7 @@
# the build directory, avoiding the need to install it. This could be # the build directory, avoiding the need to install it. This could be
# done like: # done like:
# #
# BROPATH=`source bro-path-dev` ./src/bro # BROPATH=`./bro-path-dev` ./src/bro
# #
broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/sigs:${PROJECT_SOURCE_DIR}/policy/time-machine broPolicies=${PROJECT_SOURCE_DIR}/policy:${PROJECT_SOURCE_DIR}/policy/sigs:${PROJECT_SOURCE_DIR}/policy/time-machine