From ae8e12c629c280db3cd558cfe6220e8bce5f49a7 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Thu, 31 Oct 2013 00:20:58 -0700 Subject: [PATCH 1/6] Updating submodule(s). [nomail] --- aux/broccoli | 2 +- aux/broctl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aux/broccoli b/aux/broccoli index 5cc63348a4..02e5c1e1f9 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit 5cc63348a4c3e54adaf59e5a85bec055025c6c1f +Subproject commit 02e5c1e1f993ef0fea3e2a59c34df9f40839e398 diff --git a/aux/broctl b/aux/broctl index cea34f6de7..c0972d56b0 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit cea34f6de7fc3b6f01921593797e5f0f197b67a7 +Subproject commit c0972d56b00afe637ac51737e50db6acd94eb96b From 114c9a6c9c6fe7f6a7afaa51289c5b078e5171ea Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 1 Nov 2013 04:52:43 -0700 Subject: [PATCH 2/6] Updating submodule(s). [nomail] --- aux/broctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aux/broctl b/aux/broctl index c0972d56b0..aeb8501a50 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit c0972d56b00afe637ac51737e50db6acd94eb96b +Subproject commit aeb8501a50dcf33c53e7fe776b6e333327c11861 From 5f863df91fa48c0e49943dfd3389fed8175b30ea Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 1 Nov 2013 05:03:01 -0700 Subject: [PATCH 3/6] Canonfying an intel test to not depend on output order. --- CHANGES | 5 +++++ VERSION | 2 +- .../base/frameworks/intel/cluster-transparency.bro | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index b5fb5fe274..ff6e283db7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +2.2-beta-180 | 2013-11-01 05:03:37 -0700 + + * Canonfying an intel test to not depend on output order. (Robin + Sommer) + 2.2-beta-177 | 2013-10-30 04:54:54 -0700 * Fix thread processing/termination conditions. (Jon Siwek) diff --git a/VERSION b/VERSION index 9a2bcb901d..a0f735c7cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-177 +2.2-beta-180 diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro index 4d977d475d..5bedf752d2 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro @@ -4,10 +4,10 @@ # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT # @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT # @TEST-EXEC: btest-bg-wait -k 10 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: btest-diff manager-1/intel.log -# @TEST-EXEC: btest-diff worker-1/.stdout -# @TEST-EXEC: btest-diff worker-2/.stdout @TEST-START-FILE cluster-layout.bro redef Cluster::nodes = { @@ -77,4 +77,4 @@ event remote_connection_closed(p: event_peer) # Cascading termination #print fmt("disconnected from: %s", p); terminate_communication(); - } \ No newline at end of file + } From 101fbdeff7205b5c431ef89fa1a6cb354cf6d3e1 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 1 Nov 2013 05:24:10 -0700 Subject: [PATCH 4/6] Adding source and original copyright statement to Mozilla cert list. --- CHANGES | 5 ++++- VERSION | 2 +- scripts/base/protocols/ssl/mozilla-ca-list.bro | 10 +++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ff6e283db7..518487152f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -2.2-beta-180 | 2013-11-01 05:03:37 -0700 +2.2-beta-181 | 2013-11-01 05:24:10 -0700 + + * Adding source and original copyright statement to Mozilla cert + list. (Robin Sommer) * Canonfying an intel test to not depend on output order. (Robin Sommer) diff --git a/VERSION b/VERSION index a0f735c7cb..57d7e0aa80 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-180 +2.2-beta-181 diff --git a/scripts/base/protocols/ssl/mozilla-ca-list.bro b/scripts/base/protocols/ssl/mozilla-ca-list.bro index 75dc057a55..d7c5578166 100644 --- a/scripts/base/protocols/ssl/mozilla-ca-list.bro +++ b/scripts/base/protocols/ssl/mozilla-ca-list.bro @@ -1,5 +1,13 @@ # Don't edit! This file is automatically generated. -# Generated at: Thu Sep 19 12:40:13 -0700 2013 +# Generated at: 2013-11-01 05:23:08 -0700 +# Generated from: http://mxr.mozilla.org/mozilla-central/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1 +# +# The original source file comes with this licensing statement: +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + @load base/protocols/ssl module SSL; redef root_certs += { From a9d874861457dd5158da3abd80ecc710aac373b8 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Fri, 1 Nov 2013 05:26:05 -0700 Subject: [PATCH 5/6] Updating submodule(s). [nomail] --- CHANGES | 2 +- VERSION | 2 +- aux/bro-aux | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 518487152f..a1e5c0c6bc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -2.2-beta-181 | 2013-11-01 05:24:10 -0700 +2.2-beta-182 | 2013-11-01 05:26:05 -0700 * Adding source and original copyright statement to Mozilla cert list. (Robin Sommer) diff --git a/VERSION b/VERSION index 57d7e0aa80..a836ee3256 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-181 +2.2-beta-182 diff --git a/aux/bro-aux b/aux/bro-aux index d17f99107c..ce8a9733c4 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit d17f99107cc778627a0829f0ae416073bb1e20bb +Subproject commit ce8a9733c4f8c4c8e8b2e9e440acfcf985f39cd8 From 13ff4374dd10cf10430faaeacb8b565bd455a972 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Mon, 4 Nov 2013 00:00:23 -0600 Subject: [PATCH 6/6] Remove swig-ruby from required packages section of install doc --- doc/install/install.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/install.rst b/doc/install/install.rst index 5e6b742ae1..7532a82cea 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -85,7 +85,7 @@ that ``bash`` and ``python`` are in your ``PATH``): preferred Mac OS X package management system (e.g. MacPorts_, Fink_, or Homebrew_). - Specifically for MacPorts, the ``cmake``, ``swig``, ``swig-ruby``, + Specifically for MacPorts, the ``cmake``, ``swig``, ``swig-python`` and ``file`` packages provide the required dependencies.