From f18f9511ac0279224116b85f9a7e25a84f8547bb Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Fri, 15 Nov 2013 07:05:15 -0800
Subject: [PATCH 1/3] Updating submodule(s).

 [nomail]
---
 CHANGES      | 4 ++++
 VERSION      | 2 +-
 aux/binpac   | 2 +-
 aux/bro-aux  | 2 +-
 aux/broccoli | 2 +-
 aux/broctl   | 2 +-
 cmake        | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94eddbcaf5..4908cbe2be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.2-6 | 2013-11-15 07:05:15 -0800
+
+  * Make "install-example-configs" target use DESTDIR. (Jon Siwek)
+    
 2.2-5 | 2013-11-11 13:47:54 -0800
 
   * Fix the irc_reply event for certain server message types. (Seth
diff --git a/VERSION b/VERSION
index 9cf2e10ba7..91e93dce0e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-5
+2.2-6
diff --git a/aux/binpac b/aux/binpac
index 0f20a50afa..54b321009b 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 0f20a50afacb68154b4035b6da63164d154093e4
+Subproject commit 54b321009b750268526419bdbd841f421c839313
diff --git a/aux/bro-aux b/aux/bro-aux
index ce8a9733c4..ebf9c0d88a 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit ce8a9733c4f8c4c8e8b2e9e440acfcf985f39cd8
+Subproject commit ebf9c0d88ae8230845b91f15755156f93ff21aa8
diff --git a/aux/broccoli b/aux/broccoli
index 8600d3afc7..17ec437752 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 8600d3afc748aadbdd729c7bac9e3f69e829c23f
+Subproject commit 17ec437752837fb4214abfb0a2da49df74668d5d
diff --git a/aux/broctl b/aux/broctl
index 6a62d12b47..6e01d6972f 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 6a62d12b478fe6df06746e0cb739cabc1157b203
+Subproject commit 6e01d6972f02d68ee82d05f392d1a00725595b7f
diff --git a/cmake b/cmake
index d902e23fd1..e7a46cb82e 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d902e23fd14624eb9caf0b4a0e693014bf5bd684
+Subproject commit e7a46cb82ee10aa522c4d88115baf10181277d20

From 3effe5df084255dbe7f8613862f522007b0b3133 Mon Sep 17 00:00:00 2001
From: Daniel Thayer <dnthayer@illinois.edu>
Date: Fri, 15 Nov 2013 11:39:27 -0600
Subject: [PATCH 2/3] Update local.bro for Bro 2.2

Removed some commented-out code that no longer works in Bro 2.2 (because
Notice::policy is now a hook).
---
 scripts/site/local.bro | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/site/local.bro b/scripts/site/local.bro
index 2f4eed9865..ddaee42a93 100644
--- a/scripts/site/local.bro
+++ b/scripts/site/local.bro
@@ -30,10 +30,6 @@
 # This adds signatures to detect cleartext forward and reverse windows shells.
 @load-sigs frameworks/signatures/detect-windows-shells
 
-# Uncomment the following line to begin receiving (by default hourly) emails
-# containing all of your notices.
-# redef Notice::policy += { [$action = Notice::ACTION_ALARM, $priority = 0] };
-
 # Load all of the scripts that detect software in various protocols.
 @load protocols/ftp/software
 @load protocols/smtp/software

From dc52846b6f1b6ae4db4c5815a6e376170082d24e Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Mon, 18 Nov 2013 14:03:21 -0800
Subject: [PATCH 3/3] Updating submodule(s).

 [nomail]
---
 CHANGES   | 5 +++++
 VERSION   | 2 +-
 aux/btest | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4908cbe2be..31fddce833 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.2-9 | 2013-11-18 14:03:21 -0800
+
+  * Update local.bro for Bro >= 2.2. The commented out Notice::policy
+    example didn't work anymore. (Daniel Thayer)
+
 2.2-6 | 2013-11-15 07:05:15 -0800
 
   * Make "install-example-configs" target use DESTDIR. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 91e93dce0e..ac3e73a062 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-6
+2.2-9
diff --git a/aux/btest b/aux/btest
index c16e914075..26c3136d56 160000
--- a/aux/btest
+++ b/aux/btest
@@ -1 +1 @@
-Subproject commit c16e91407595f9bf748b0b18e3b7566ccfaa5327
+Subproject commit 26c3136d56493017bc33c5a2f22ae393d585c2d9