Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2499 commits 387 branches 195 tags 259 MiB
Commit graph

273 commits

Author SHA1 Message Date
Robin Sommer
f090764ac6 Merge remote branch 'origin/topic/jsiwek/CMake-IDE-tweaks' 
* origin/topic/jsiwek/CMake-IDE-tweaks:
  Adding files to CMake build targets so they show up in generated IDE projects.

Conflicts:
	aux/binpac
 2011-04-18 12:50:15 -07:00
Robin Sommer
f72ec9a39b Updating submodule(s). 2011-04-17 20:29:04 -07:00
Robin Sommer
65016dc5e8 Updating istate tests. 
Some still don't pass:

    - events-ssl doesn't work; not clear yet why, there may be some
      problem with SSL connections.

    - broccoli needs the changes topic/jsiwek/64bit-val-fix, plus
    adaption of the protocol version.

    - pybroccoli crashes even with the 64bit-val-fix changes. Reason
      unclear.
 2011-04-17 19:53:56 -07:00
Jon Siwek
7d2938dac6 Adding files to CMake build targets so they show up in generated IDE projects. 
This includes flex/bison/binpac/bifcl input files as well as C/C++ header
files.  Header files for the bro target are determined dynamically at
configure time from a given list of source files.

This addresses #413.
 2011-04-12 12:01:04 -05:00
Robin Sommer
68a30a0b5a Updating submodule(s). 2011-04-01 16:29:15 -07:00
Robin Sommer
a3a075174b Merging in 'topic/robin/cleanup-rewriter'. 
Removing everything related to trace rewriting.

(I wasn't too careful in ensuring that I catch everything in the
scripts; Seth is working on those anyway.)

(Merging by cherry-picking the corresponding commit, as the branch was
accidentally made off of the logging stuff).
 2011-04-01 15:23:50 -07:00
Robin Sommer
1e54dfba34 Updating submodule(s). 2011-03-29 21:53:53 -07:00
Robin Sommer
871eff9f90 Updating submodule(s). 2011-03-21 16:35:22 -07:00
Robin Sommer
c92154994a Updating submodule(s). 2011-03-14 17:42:32 -07:00
Robin Sommer
88b41b6320 Merge remote branch 'origin/topic/jsiwek/cmake-compiler-check' 
* origin/topic/jsiwek/cmake-compiler-check:
  Add explicit CMake check for compiler

Conflicts:
	aux/broccoli
	aux/broctl
 2011-03-14 17:42:25 -07:00
Robin Sommer
b68d50d717 Updating submodule(s). 2011-03-11 18:41:45 -08:00
Jon Siwek
9282e0adff Add explicit CMake check for compiler 2011-03-09 11:48:00 -06:00
Robin Sommer
e5d3654266 Updating submodule(s). 2011-02-28 15:39:24 -08:00
Gregor Maier
c54c1e0dce Revert "Updating submodule to current master" 
This reverts commit 8b42bfed7c.
Master seems to have outdated submodules. Reverting to previous ones on
fastpath.
 2011-02-25 21:11:06 -08:00
Gregor Maier
8b42bfed7c Updating submodule to current master 2011-02-25 20:43:53 -08:00
Robin Sommer
888719e922 Adding new aux/btest submodule. 2011-02-08 14:28:15 -08:00
Robin Sommer
0d9de7d719 Updating submodule(s). 2011-02-07 14:07:29 -08:00
Robin Sommer
ee6abcba72 Updating submodule(s). 2011-02-03 21:57:11 -08:00
Robin Sommer
88b31a04d0 Updating submodule(s). 2011-01-31 15:36:01 -08:00
Robin Sommer
7432761558 Updating submodule(s). 2011-01-31 08:48:41 -08:00
Robin Sommer
7de348da11 Merge remote branch 'origin/topic/jsiwek/missing-config-options' 
* origin/topic/jsiwek/missing-config-options:
  Adding more configure options for finding dependencies

Conflicts:
	aux/binpac
 2011-01-31 08:48:12 -08:00
Jon Siwek
da3fb85e5c Adding more configure options for finding dependencies 2011-01-28 10:10:16 -06:00
Robin Sommer
91d7c48ced Updating submodule(s). 2011-01-25 17:58:09 -08:00
Robin Sommer
2bf7461d9c Updating submodule(s). 2011-01-24 15:21:39 -08:00
Jon Siwek
4817f7de4e Configure wrapper now deletes previous CMake cache 2011-01-24 11:26:29 -06:00
Robin Sommer
fa87a81a96 Merge remote branch 'origin/topic/jsiwek/add-config-status' 
* origin/topic/jsiwek/add-config-status:
  Changed configure wrapper to create config.status
 2011-01-20 16:35:24 -08:00
Jon Siwek
bbe078e06c Changed configure wrapper to create config.status 2011-01-20 12:37:38 -06:00
Robin Sommer
0a3f84681a Updating submodules. 2011-01-19 18:12:41 -08:00
Robin Sommer
814cb0f091 Merge remote branch 'origin/topic/jsiwek/macports-fink-fix' 
Conflicts:
	aux/broccoli
	aux/broctl
 2011-01-19 18:09:58 -08:00
Robin Sommer
420d8ac4b7 Merge remote branch 'origin/topic/jsiwek/packaging' 
* origin/topic/jsiwek/packaging:
  Changed behavior of how binary packaging installs config files.
 2011-01-19 18:07:38 -08:00
Jon Siwek
5247a64eaa Changed behavior of how binary packaging installs config files. 
The pre/post install scripts for RPMs should not perform any logic
to backup config files, instead relying on the standard logic
that RPMs normally do.

For Mac packages, when an existing config file differs from the package's
version, the previous version is always kept and an alert is displayed to
the user explaining the situation.
 2011-01-19 16:56:30 -06:00
Jon Siwek
6ea8def6f6 MacPorts & Fink paths now prepended to default search prefixes 2011-01-19 14:57:06 -06:00
Robin Sommer
aa0691ba21 Updating submodule(s). 2011-01-15 16:45:18 -08:00
Jon Siwek
1d8ad8e946 Changes for packaging 
- Added 'dist' target to top-level Makefile for doing source packages
- Added 'make-*-packages' scripts for generating binary packages
- Fixes for the ConfigurePackaging CMake script
  - No longer fails when package version doesn't include a patch-level
  - Now considers the case when a package doesn't install any
    config files and the INSTALLED_CONFIG_FILES var is empty
 2011-01-14 22:25:10 -06:00
Jon Siwek
8d4f487add Changes to CMake logic for binary packaging 
- pre/post install scripts now track configuration files that may
  be clobbered on package install/upgrade through the
  INSTALLED_CONFIG_FILES CMake variable and attempts to make backups
  when the distribution's file differs from the existing file.
 2011-01-13 21:58:25 -06:00
Robin Sommer
edfdd9d436 Updating submodule 2010-12-20 12:03:58 -08:00
Robin Sommer
017367d362 Updating submodules 2010-12-20 12:01:26 -08:00
Robin Sommer
d24f7a6aad Update submodules 2010-12-10 01:44:25 -08:00
Robin Sommer
a5890e304a Updating modules. 2010-12-08 04:48:38 -08: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
a9113e6f46 Submodule updates 2010-11-30 15:32:57 -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
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
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