Robin Sommer
7696c8b365
Merge remote-tracking branch 'origin/topic/jsiwek/require-libmagic-libz'
...
* origin/topic/jsiwek/require-libmagic-libz:
Promote libz and libmagic to required dependencies.
Conflicts:
doc/quickstart.rst
Closes #674
2011-11-15 17:08:24 -08:00
Robin Sommer
6b70f340aa
Merge remote-tracking branch 'origin/topic/jsiwek/parallel-make-recursion'
...
* origin/topic/jsiwek/parallel-make-recursion:
Fix parallel make from top-level to work on more platforms
Closes #673 .
2011-11-15 17:04:55 -08:00
Robin Sommer
8de3614afa
Merge remote-tracking branch 'origin/topic/jsiwek/custom-b64-alphabet'
...
* origin/topic/jsiwek/custom-b64-alphabet:
Add decode_base64_custom BiF to allow alternate base64 alphabets.
Simplified the code a little bit.
Closes #670 .
2011-11-15 17:03:23 -08:00
Robin Sommer
6b207c9c95
Merge remote-tracking branch 'origin/topic/jsiwek/broxygen-cleanup'
...
* origin/topic/jsiwek/broxygen-cleanup:
Fix documentation interlinkage and normalize console directive bodies.
Adapt more www niceties to broxygen (stylesheets, pygments); add more docs
Finished dissolving the sphinx source directory into doc/ and doc/scripts/
Move sphinx source tree up a level.
Broxygen doc style tweaks.
Better adaptation of Bro website style in Broxygen docs.
Start Broxygen cleanup with crude adaptation of website styles.
Closes #650 .
2011-11-15 16:47:13 -08:00
Jon Siwek
72aa13968b
Fix documentation interlinkage and normalize console directive bodies.
2011-11-15 16:27:06 -06:00
Jon Siwek
ea2c89f2d7
Adapt more www niceties to broxygen (stylesheets, pygments); add more docs
2011-11-15 15:39:31 -06:00
Jon Siwek
fdf01a1ba6
Finished dissolving the sphinx source directory into doc/ and doc/scripts/
2011-11-15 11:52:52 -06:00
Jon Siwek
83aa4b535f
Move sphinx source tree up a level.
2011-11-15 10:10:30 -06:00
Robin Sommer
21146abda2
Updating submodule(s).
2011-11-15 07:56:48 -08:00
Robin Sommer
fa76330afb
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
Binary packaging script tweaks.
More default "weird" tuning for the "SYN_with_data" notice.
Tiny bugfix for http file extraction along with test.
2011-11-15 07:53:36 -08:00
Jon Siwek
d1787523fc
Binary packaging script tweaks.
...
- Now requiring CMake 2.8.6
- Make moving of packages into build/ independent of package names.
- Bro-all package renamed to Bro and Bro renamed to Bro-minimal
which is more similar to source packages now.
2011-11-14 15:13:20 -06:00
Seth Hall
4942767c4d
More default "weird" tuning for the "SYN_with_data" notice.
...
- I think the default tuning should be that anything not requiring
a session to be established should use ACTION_LOG_PER_ORIG.
- We need to get some tie-in with the metrics framework in place
so that we can find when lots of these values are being suppressed.
2011-11-14 16:12:38 -05:00
Seth Hall
d14349a6f8
Merge remote-tracking branch 'origin/master' into fastpath
2011-11-14 16:06:44 -05:00
Seth Hall
b12d2c768e
Tiny bugfix for http file extraction along with test.
2011-11-14 15:24:15 -05:00
Jon Siwek
5865bf3850
Add decode_base64_custom BiF to allow alternate base64 alphabets.
...
Addresses #670
2011-11-11 13:48:11 -06:00
Jon Siwek
d750c3ba74
Promote libz and libmagic to required dependencies.
2011-11-11 12:39:00 -06:00
Jon Siwek
a92592d08d
Fix parallel make from top-level to work on more platforms
2011-11-11 11:18:49 -06:00
Jon Siwek
eb1b0b9502
Broxygen doc style tweaks.
2011-11-08 06:32:26 -06:00
Jon Siwek
5b1f0b1bc5
Merge branch 'master' into topic/jsiwek/broxygen-cleanup
2011-11-08 06:23:58 -06:00
Robin Sommer
151664bc26
Updating submodule(s).
2011-11-07 05:56:40 -08:00
Robin Sommer
8935663981
Updating CHANGES and VERSION.
2011-11-07 05:44:38 -08:00
Robin Sommer
bd279d90fe
Updating submodule(s).
2011-11-06 19:27:22 -08:00
Jon Siwek
d594a84393
quickstart doc fixes
2011-11-04 17:25:10 -05:00
Robin Sommer
9aef0c0f5a
Fixing packet filter test.
...
Adapting the IPv6 one as well, though I believe that's already
broken anyway ...
2011-11-03 17:42:06 -07:00
Robin Sommer
506ce026ed
Updating submodule(s).
2011-11-03 16:10:40 -07:00
Robin Sommer
376a9853d5
Updating submodule(s).
2011-11-03 16:04:02 -07:00
Robin Sommer
28eed39836
Updating submodule(s).
2011-11-03 16:03:26 -07:00
Robin Sommer
aa8b3677f0
Updating submodule(s).
2011-11-03 16:01:16 -07:00
Robin Sommer
ad4bcec338
Updating submodule(s).
2011-11-03 15:36:28 -07:00
Robin Sommer
f4ce631231
Updating submodule(s).
2011-11-03 15:28:26 -07:00
Robin Sommer
41a443677b
Merge remote-tracking branch 'origin/fastpath'
...
* origin/fastpath:
No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-03 15:27:23 -07:00
Robin Sommer
3b1f13b861
Merge remote-tracking branch 'origin/topic/jsiwek/compiler-warnings'
...
* origin/topic/jsiwek/compiler-warnings:
Fixing compiler warnings (addresses #388 )
2011-11-03 15:18:11 -07:00
Jon Siwek
40f6e1e098
Better adaptation of Bro website style in Broxygen docs.
2011-11-03 16:53:24 -05:00
Jon Siwek
849046851f
Start Broxygen cleanup with crude adaptation of website styles.
2011-11-02 17:18:28 -05:00
Seth Hall
507b51c957
No longer write to the PacketFilter::LOG stream if not reading traffic.
2011-11-02 15:09:57 -04:00
Jon Siwek
ba3d711c9e
Merge branch 'master' into topic/jsiwek/compiler-warnings
2011-11-02 09:45:11 -05:00
Seth Hall
42e82b99cb
Slightly changing some doc wording.
2011-11-02 09:51:54 -04:00
Jon Siwek
cec4600d2e
Fixing compiler warnings (addresses #388 )
2011-11-01 14:44:38 -05:00
Seth Hall
89b69eaa8e
Merge branch 'master' of ssh://git.bro-ids.org/bro
2011-10-31 23:36:29 -04:00
Seth Hall
bbb1b47d83
Notice framework documentation update.
2011-10-31 23:36:17 -04:00
Robin Sommer
c2683afc01
Fixing links.
2011-10-31 13:30:45 -07:00
Seth Hall
60978b3b12
Updating broctl submodule.
2011-10-31 13:27:53 -04:00
Jon Siwek
80b7016ea3
Update broccoi submodule
2011-10-28 14:59:59 -05:00
Jon Siwek
dbd078c04c
Update broccoli submodule
2011-10-28 14:06:00 -05:00
Robin Sommer
cc7bd720ac
Updating CHANGES and VERSION.
2011-10-27 18:03:27 -07:00
Robin Sommer
e75fb1dd8b
Updating submodule(s).
2011-10-27 17:46:28 -07:00
Robin Sommer
38876ac899
Updating submodule(s).
2011-10-27 13:00:33 -07:00
Robin Sommer
69b61be0ef
Merge branch 'master' of ssh://git.bro-ids.org/bro
...
Conflicts:
scripts/policy/frameworks/control/controller.bro
2011-10-27 12:41:18 -07:00
Seth Hall
75e470ac9a
The control framework no longer sends functions with the configuration_update command.
2011-10-27 15:29:28 -04:00
Robin Sommer
9762591993
Updating submodule(s).
2011-10-27 11:57:11 -07:00
