diff --git a/CHANGES b/CHANGES index f56bd8411d..ab60704542 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ +2.2-beta-161 | 2013-10-25 15:48:15 -0700 + + * Add curl to list of optional dependencies. It's used by the + active-http.bro script. (Daniel Thayer) + + * Update test and baseline for a recent doc test fix. (Daniel + Thayer) + 2.2-beta-158 | 2013-10-25 15:05:08 -0700 * Updating README with download/git information. (Robin Sommer) diff --git a/VERSION b/VERSION index 8cdf44379f..dc2a0b123a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-158 +2.2-beta-161 diff --git a/doc/install/install.rst b/doc/install/install.rst index a4bd51d29e..5e6b742ae1 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -98,6 +98,7 @@ build time: * LibGeoIP (for geo-locating IP addresses) * sendmail (enables Bro and BroControl to send mail) * gawk (enables all features of bro-cut) + * curl (used by a Bro script that implements active HTTP) * gperftools (tcmalloc is used to improve memory and CPU usage) * ipsumdump (for trace-summary; http://www.cs.ucla.edu/~kohler/ipsumdump) * Ruby executable, library, and headers (for Broccoli Ruby bindings) diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_02_bro@2/output b/testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_01_bro/output similarity index 75% rename from testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_02_bro@2/output rename to testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_01_bro/output index e4552b8580..34303a12ad 100644 --- a/testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_02_bro@2/output +++ b/testing/btest/Baseline/doc.sphinx.include-doc_scripting_connection_record_01_bro/output @@ -1,9 +1,8 @@ # @TEST-EXEC: cat %INPUT >output && btest-diff output -connection_record_02.bro +connection_record_01.bro @load base/protocols/conn -@load base/protocols/dns event connection_state_remove(c: connection) { diff --git a/testing/btest/doc/sphinx/include-doc_scripting_connection_record_02_bro@2.btest b/testing/btest/doc/sphinx/include-doc_scripting_connection_record_01_bro.btest similarity index 75% rename from testing/btest/doc/sphinx/include-doc_scripting_connection_record_02_bro@2.btest rename to testing/btest/doc/sphinx/include-doc_scripting_connection_record_01_bro.btest index e4552b8580..34303a12ad 100644 --- a/testing/btest/doc/sphinx/include-doc_scripting_connection_record_02_bro@2.btest +++ b/testing/btest/doc/sphinx/include-doc_scripting_connection_record_01_bro.btest @@ -1,9 +1,8 @@ # @TEST-EXEC: cat %INPUT >output && btest-diff output -connection_record_02.bro +connection_record_01.bro @load base/protocols/conn -@load base/protocols/dns event connection_state_remove(c: connection) {