Deprecations: Update NEWS, and tie up a few loose ends.

Broccoli was still present in the source in a few places, debug outputs
that do no longer exist were too.

Part of GH-243

NEWS

@@ -246,15 +246,53 @@ Removed Functionality
     - ``dhcp_request``
     - ``remote_state_access_performed``
     - ``remote_state_inconsistency``
+    - ``remote_connection_established``
+    - ``remote_connection_closed``
+    - ``remote_connection_handshake_done``
+    - ``remote_event_registered``
+    - ``remote_connection_error``
+    - ``remote_capture_filter``
     - ``remote_log_peer``
     - ``remote_log``
     - ``finished_send_state``
     - ``remote_pong``
-    - ``finished_send_state``
+
+- The following types/records were deprecated in version 2.6 or below and are
+  removed from this release:
+
+    - ``peer_id``
+    - ``event_peer``
+
+- The following configuration options were deprecated in version 2.6 or below and are
+  removed from this release:
+
+    - ``max_remote_events_processed``
+    - ``forward_remote_events``
+    - ``forward_remote_state_changes``
+    - ``enable_syslog``
+    - ``remote_trace_sync_interval``
+    - ``remote_trace_sync_peers``
+    - ``remote_check_sync_consistency``
+
+- The following constants were used as part of deprecated functionality in version 2.6
+  or below and are removed from this release:
+
+    - ``PEER_ID_NONE``
+    - ``REMOTE_LOG_INFO``
+    - ``REMOTE_SRC_CHILD``
+    - ``REMOTE_SRC_PARENT``
+    - ``REMOTE_SRC_SCRIPT``
 
 - The deprecated script ``policy/protocols/smb/__load__.bro`` was removed.
   Instead of ``@load policy/protocols/smb`` use ``@load base/protocols/smb``.
 
+- Broccoli, which had been deprecated in version 2.6 and was no longer built by default
+  was removed from the source tree.
+
+- Support for the &persistent and the &synchronized attributes, which were deprecated
+  in Bro 2.6, was removed. The ``-g`` command-line option (dump-config) which relied on
+  this functionality was also removed.
+
 Deprecated Functionality
 ------------------------
 
@@ -269,6 +307,11 @@ Deprecated Functionality
   such that existing code will not break, but will emit a deprecation
   warning.
 
+- The ``rotate_file``, ``rotate_file_by_name`` and ``calc_next_rotate`` functions
+  were marked as deprecated. These functions were used with the old pre-2.0 logging
+  framework and are no longer used. They also were marked as deprecated in their
+  documentation, however the functions themselves did not carry the deprecation marker.
+
 Bro 2.6
 =======
 

doc

@@ -1 +1 @@
-Subproject commit 8aa690e20d19f79805d7f680e454e4ea10231add
+Subproject commit 6c099d4bff68f9f9d97952dfaca048425f12027a

man/bro.8

@@ -36,9 +36,6 @@ augment loaded policies by given code
 \fB\-f\fR,\ \-\-filter <filter>
 tcpdump filter
 .TP
-\fB\-g\fR,\ \-\-dump\-config
-dump current config into .state dir
-.TP
 \fB\-h\fR,\ \-\-help|\-?
 command line help
 .TP

src/Attr.cc

@@ -556,8 +556,7 @@ bool Attributes::DoSerialize(SerialInfo* info) const
 		{
 		Attr* a = (*attrs)[i];
 
-		// Broccoli doesn't support expressions.
-		Expr* e = (! info->broccoli_peer) ? a->AttrExpr() : 0;
+		Expr* e = a->AttrExpr();
 		SERIALIZE_OPTIONAL(e);
 
 		if ( ! SERIALIZE(char(a->Tag())) )

src/DebugLogger.cc

@@ -11,9 +11,9 @@ DebugLogger debug_logger;
 
 // Same order here as in DebugStream.
 DebugLogger::Stream DebugLogger::streams[NUM_DBGS] = {
-	{ "serial", 0, false }, { "rules", 0, false }, { "comm", 0, false },
+	{ "serial", 0, false }, { "rules", 0, false },
 	{ "state", 0, false }, { "chunkedio", 0, false },
-	{ "compressor", 0, false }, {"string", 0, false },
+	{"string", 0, false },
 	{ "notifiers", 0, false },  { "main-loop", 0, false },
 	{ "dpd", 0, false }, { "tm", 0, false },
 	{ "logging", 0, false }, {"input", 0, false },

src/DebugLogger.h

@@ -16,10 +16,8 @@
 enum DebugStream {
 	DBG_SERIAL,	// Serialization
 	DBG_RULES,	// Signature matching
-	DBG_COMM,	// Remote communication
 	DBG_STATE,	// StateAccess logging
 	DBG_CHUNKEDIO,	// ChunkedIO logging
-	DBG_COMPRESSOR,	// Connection compressor
 	DBG_STRING,	// String code
 	DBG_NOTIFIERS,	// Notifiers (see StateAccess.h)
 	DBG_MAINLOOP,	// Main IOSource loop

src/SerialInfo.h

@@ -17,7 +17,6 @@ public:
 		pid_32bit = false;
 		include_locations = true;
 		new_cache_strategy = false;
-		broccoli_peer = false;
 		}
 
 	SerialInfo(const SerialInfo& info)
@@ -32,7 +31,6 @@ public:
 		pid_32bit = info.pid_32bit;
 		include_locations = info.include_locations;
 		new_cache_strategy = info.new_cache_strategy;
-		broccoli_peer = info.broccoli_peer;
 		}
 
 	// Parameters that control serialization.
@@ -51,11 +49,6 @@ public:
 	// If true, we support keeping objs in cache permanently.
 	bool new_cache_strategy;
 
-	// If true, we're connecting to a Broccoli. If so, serialization
-	// specifics may be adapted for functionality Broccoli does not
-	// support.
-	bool broccoli_peer;
-
 	ChunkedIO::Chunk* chunk; // chunk written right before the serialization
 
 	// Attributes set during serialization.
@@ -80,7 +73,6 @@ public:
 		print = 0;
 		pid_32bit = false;
 		new_cache_strategy = false;
-		broccoli_peer = false;
 		}
 
 	UnserialInfo(const UnserialInfo& info)
@@ -97,7 +89,6 @@ public:
 		print = info.print;
 		pid_32bit = info.pid_32bit;
 		new_cache_strategy = info.new_cache_strategy;
-		broccoli_peer = info.broccoli_peer;
 		}
 
 	// Parameters that control unserialization.
@@ -118,11 +109,6 @@ public:
 	// If true, we support keeping objs in cache permanently.
 	bool new_cache_strategy;
 
-	// If true, we're connecting to a Broccoli. If so, serialization
-	// specifics may be adapted for functionality Broccoli does not
-	// support.
-	bool broccoli_peer;
-
 	// If a global ID already exits, of these policies is used.
 	enum {
 		Keep,	// keep the old ID and ignore the new