* origin/topic/seth/fix-compiler-warnings:
Fixed problem with PRI macros.
PRI macros are currently not working for some reason.
Two more small compile time error fixes.
Cleaned up the output from running binpac.
Added line to expect shift/reduce errors in parse.in
Cleaned up g++ warnings.
Addition: I fixed a few more warnings I was getting, and tweaked some
of the existing changes slightly.
* remotes/origin/topic/robin/work:
*Now* this passes the test suite.
Fixes to SSL/TLS analyzer
Added new TLS ciphers
Removing some apparently unnecessary lines.
A few smaller tweaks.
Prepared the old analyzer for extracting SSL extensions.
Fixed bug in do_split implementation.
Removed an accidental debugging printf.
Readded the other changes to remove CheckString calls from strings.bif.
Fixed the problem with do_split function which caused it to bail 1 separator early.
Modification from rmkml to support SSL extensions.
Updated SSL analyzer and Bro script with lots of new ciphers.
* origin/topic/robin/work:
Smarter way to increase the parent/child pipe's socket buffer. (Craig Leres).
Fixing bug with defining bro_int_t and bro_uint_t as 64-bit in some platforms.
* remotes/origin/topic/bro_dns_fake_message:
Reworded BRO_DNS_FAKE message.
Added a BRO_DNS_FAKE message to the help output.
Changed to show on/off rather than the variable's content.
* origin/topic/jsiwek/packaging:
Changes for packaging
Changes to CMake logic for binary packaging
Changes for CPack binary packaging
Fix package configuration macro returning from sub-project too early
Add warning when building and installing are done by different users
Fix for PackageMaker not accepting non-numeric versions
Fix for OS X 10.5 compile error wrt llabs()
Prefer static libraries for some dependencies on OS X
Added OS X configures options for SDK & minimum version
Changes to allow source packaging via CPack
