Jon Siwek
943b5edee0
Merge branch 'master' into topic/cmake-port
2010-12-08 09:48:21 -06:00
Robin Sommer
007bd744c9
Merge branch 'master' into fastpath
2010-12-08 04:49:06 -08:00
Robin Sommer
a5890e304a
Updating modules.
2010-12-08 04:48:38 -08:00
Robin Sommer
690120b757
Merge branch 'master' into fastpath
2010-12-08 04:47:38 -08:00
Robin Sommer
c6631d1483
Reversing the null-byte change to strings.bif once more.
...
I'm actually not sure how that got back in again, but it did ...
Must have been during the merges.
2010-12-08 04:46:10 -08:00
Robin Sommer
dc5d3560f7
Merge with Subversion repository as of r7137. Incorporated change:
...
* Fix for packet processing resumption when a remote Bro dies
during state synchronization (Robin Sommer).
2010-12-08 04:10:26 -08:00
Robin Sommer
c690a8b2f3
Merge remote branch 'origin/fastpath'
2010-12-08 04:01:40 -08:00
Robin Sommer
2ad1f61bdb
Merge remote branch 'origin/topic/cmake-port'
2010-12-08 03:08:46 -08:00
Seth Hall
846237a280
Applied Gregor's patch from ticket #247 to fix compile
...
time errors with OpenSSL support.
2010-12-06 15:43:32 -05:00
Jon Siwek
f3885f0c89
Updated submodules to master versions
2010-12-06 12:04:40 -06:00
Jon Siwek
f5e6856bd6
Merge branch 'master' into topic/cmake-port
...
Conflicts:
aux/binpac
aux/broctl
2010-12-06 11:58:06 -06:00
Jon Siwek
81b8a4176f
Update binpac submodule to point to master version
2010-12-06 11:53:32 -06:00
Jon Siwek
e89182dcc0
Changes to make running bro from build dir easier.
...
The 'bro-path-dev' script is configured at make time to echo the
right paths to policy files.
2010-12-06 11:30:52 -06:00
Robin Sommer
5faaa21fa9
Updating submodules
2010-12-03 17:26:22 -08:00
Jon Siwek
efbd22a33f
Allow CMake generators to pass through configure
...
The default generator is Unix Makefiles for most platforms, but this
lets the builder easily select a different build framework depending
on their platform (e.g. Xcode, CodeBlocks, Eclipse ...)
2010-12-02 14:23:20 -06:00
Jon Siwek
a9113e6f46
Submodule updates
2010-11-30 15:32:57 -06:00
Jon Siwek
a9c9fe7950
Removed some unset()'s that were missed
2010-11-30 15:17:49 -06:00
Jon Siwek
1442af616f
Merge branch 'master' into topic/cmake-port
...
Resolved Conflicts:
CMakeLists.txt
INSTALL
aux/binpac
aux/bro-aux
aux/broccoli
aux/broctl
cmake/CheckTypes.cmake
cmake/FindBIND.cmake
cmake/OSSpecific.cmake
cmake/OpenSSLTests.cmake
cmake/PCAPTests.cmake
src/CMakeLists.txt
2010-11-30 15:07:29 -06:00
jsiwek
ba0ae22da7
More CMake 2.6 compat changes
...
unset() macro only in later patch-level versions of 2.6
2010-11-30 14:49:20 -06:00
Jon Siwek
0f854e201b
CMake 2.6 compatibility changes
...
Also removed Mac specific feature of rewriting optional library
install_names.
2010-11-30 13:21:30 -06:00
Robin Sommer
4cc2419616
Updating modules to master.
2010-11-27 20:39:35 -08:00
Robin Sommer
e47e8f7913
Updating modules to master versions.
2010-11-27 20:29:50 -08:00
Robin Sommer
deacce40e9
Merge remote branch 'origin/topic/robin/cleanup'
2010-11-27 20:10:05 -08:00
Robin Sommer
a2a7ee8679
Reinserting an accidentally deleted line.
2010-11-27 19:54:58 -08:00
Robin Sommer
c925bd43d8
Portability fix for Linux: this removes the need for linux-include.
2010-11-27 17:57:04 -08:00
Robin Sommer
121ff3965c
Merge remote branch 'origin/topic/robin/svn-merge' into devel
2010-11-27 17:31:26 -08:00
Robin Sommer
ffdd469e01
Merge remote branch 'origin/topic/robin/cleanup' into devel
2010-11-27 17:30:34 -08:00
Robin Sommer
49cd330110
Merge branch 'master' into devel
2010-11-27 17:25:09 -08:00
Robin Sommer
fabc59b2cd
Deleteing aux directories in preparation for merge
2010-11-27 17:25:09 -08:00
Robin Sommer
b0cb05de64
Merge with Subversion repository as of r7098.
2010-11-27 12:50:01 -08:00
Robin Sommer
e95adb8055
Another test commit.
2010-11-27 12:00:34 -08:00
Robin Sommer
fb76d7fe26
Removing the linux-include directory from the search path.
...
I think we don't need this anymore, but still need to verify that.
2010-11-26 15:32:24 -08:00
Robin Sommer
4714af9657
New Makefile wrapper in top-level directory.
...
This wrapper has a few standard target for convinience, mostly
forwarding them build/Makefile.
Also adding a .gitignore to let git skip the build/ directory.
2010-11-26 15:31:00 -08:00
Robin Sommer
2ee218fec8
Updating CHANGES and VERSION.
...
I'm starting a new version series, 1.6-dev, to not confuse these
with further commits to SVN.
2010-11-26 15:14:00 -08:00
Robin Sommer
3f0ce359a2
Cleanup of the Bro distribution.
...
* Deleting a lot of old stuff no longer maintained or needed.
* Updating some of the top-level instructions.
2010-11-26 13:45:54 -08:00
Robin Sommer
818f5f4c0a
aux/bro-aux was still pointing to the topic branch.
2010-11-26 12:07:50 -08:00
Robin Sommer
702e2ec0f1
Updating submodules.
2010-11-24 21:32:52 -08:00
Robin Sommer
610d081c4b
Merge with origin/topic/cmake-port.
...
Needed to readd the broctl/broccoli/binpac submodules manually, as
git seemed to get confused by the existing directories.
2010-11-24 21:02:08 -08:00
Robin Sommer
c1768336c4
Removing aux/{broctl,binpac,broccoli} in preparation for merge.
2010-11-24 20:33:34 -08:00
Jon Siwek
5964da43fb
Better way to get source dir of configure script
...
And updated submodules
2010-11-22 21:19:02 -06:00
Jon Siwek
8901b30236
Enable broccoli, broctl, aux tools by default
...
The configure wrapper now only provides --disable options for each
aux. package.
2010-11-22 19:42:37 -06:00
Jon Siwek
426b940b4c
Updated broctl submodule
2010-11-20 22:43:48 -06:00
Jon Siwek
1b7c6b469e
Fix to allow tilde ($HOME) in install prefix.
2010-11-20 20:40:54 -06:00
Jon Siwek
3b459c368c
Added uninstall target
2010-11-20 12:18:54 -06:00
Jon Siwek
f3f395e30e
Update to broctl submodule
2010-11-19 13:28:52 -06:00
Jon Siwek
4982c02eba
Source package excludes .git and generate only TGZ
2010-11-19 11:59:22 -06:00
Jon Siwek
0878e9b8f1
Configure wrapper fixes for Broctl
...
Made order of --enable-broctl and --enable-cluster not matter.
--enable-cluster always enables Broctl in cluster configuration even if
the other option is used.
--enable-broctl will enable Broctl in standalone configuration only if
--enable-cluster isn't present.
2010-11-19 11:28:43 -06:00
Jon Siwek
552177c33a
CPack's source package now ignores the build dir
2010-11-19 10:45:46 -06:00
Jon Siwek
e4d12ea1d3
Changed default CMAKE_BUILD_TYPE to RelWithDebInfo
...
The --enable-debug option of the configure wrapper changes it to Debug.
Removed --enable-release option of the configure wrapper.
Updated submodules
2010-11-18 11:34:29 -06:00
Jon Siwek
d9def9e7d5
Updated broccoli submodule
2010-11-17 21:08:44 -06:00
