4 files changed, 1 insertions, 34 deletions

diff --git a/security/bro/files/patch-src-input-readers-Raw.cc b/security/bro/files/patch-src-input-readers-Raw.cc
deleted file mode 100644
index a620b505c588..000000000000
--- a/security/bro/files/patch-src-input-readers-Raw.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/readers/Raw.cc.orig	2014-01-06 21:04:06.000000000 +0200
-+++ src/input/readers/Raw.cc	2014-01-06 21:04:13.000000000 +0200
-@@ -352,7 +352,7 @@
- 		fname = source.substr(0, fname.length() - 1);
- 		}
- 
--	map<const char*, const char*>::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
-+	ReaderInfo::config_map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
- 	if ( it != info.config.end() )
- 		{
- 		stdin_string = it->second;
diff --git a/security/bro/files/patch-src-input-readers-SQLite.cc b/security/bro/files/patch-src-input-readers-SQLite.cc
deleted file mode 100644
index 7e728adfcf99..000000000000
--- a/security/bro/files/patch-src-input-readers-SQLite.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/input/readers/SQLite.cc.orig	2014-01-06 21:07:44.000000000 +0200
-+++ src/input/readers/SQLite.cc	2014-01-06 21:08:00.000000000 +0200
-@@ -85,7 +85,7 @@
- 	fullpath.append(".sqlite");
- 
- 	string query;
--	map<const char*, const char*>::const_iterator it = info.config.find("query");
-+	ReaderInfo::config_map::const_iterator it = info.config.find("query");
- 	if ( it == info.config.end() )
- 		{
- 		Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source));
diff --git a/security/bro/files/patch-src-logging-writers-SQLite.cc b/security/bro/files/patch-src-logging-writers-SQLite.cc
deleted file mode 100644
index dd4db628089e..000000000000
--- a/security/bro/files/patch-src-logging-writers-SQLite.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logging/writers/SQLite.cc.orig	2014-01-06 21:08:34.000000000 +0200
-+++ src/logging/writers/SQLite.cc	2014-01-06 21:08:45.000000000 +0200
-@@ -126,7 +126,7 @@
- 	fullpath.append(".sqlite");
- 	string tablename;
- 
--	map<const char*, const char*>::const_iterator it = info.config.find("tablename");
-+	WriterInfo::config_map::const_iterator it = info.config.find("tablename");
- 	if ( it == info.config.end() )
- 		{
- 		MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path));
diff --git a/security/bro/files/pkg-message.in b/security/bro/files/pkg-message.in
index 63b9d2a7d8c4..344601bc4094 100644
--- a/security/bro/files/pkg-message.in
+++ b/security/bro/files/pkg-message.in
@@ -5,6 +5,6 @@ are not deleted if you have edited them.  Instead
 the software will create a .sample file instead and the
 edited files will remain in place when you upgrade.  If you
 want to delete them, you have to delete them and the directory,
-%%PREFIX%%/etc/bro manually.
+%%PREFIX%%/etc manually.
 
 ********************PLEASE NOTE!!!***************************