From 32d7c96cd426f11190cb971f7fa1250570c6e68d Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Fri, 25 Oct 2013 15:11:20 -0500 Subject: [PATCH 1/2] Update test and baseline for a recent doc test fix --- .../output | 3 +-- ...st => include-doc_scripting_connection_record_01_bro.btest} | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) rename testing/btest/Baseline/{doc.sphinx.include-doc_scripting_connection_record_02_bro@2 => doc.sphinx.include-doc_scripting_connection_record_01_bro}/output (75%) rename testing/btest/doc/sphinx/{include-doc_scripting_connection_record_02_bro@2.btest => include-doc_scripting_connection_record_01_bro.btest} (75%) 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) { From c299a71b83bfd158bfc16dec36145adfa7f43513 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Fri, 25 Oct 2013 15:14:52 -0500 Subject: [PATCH 2/2] Add curl to list of optional dependencies The curl utility is used by the active-http.bro script, but this isn't mentioned anywhere. --- doc/install/install.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install/install.rst b/doc/install/install.rst index a4bd51d29e..fdbb7e9d8b 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 one of the Bro scripts) * 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)