Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
134 commits 387 branches 195 tags 255 MiB
Commit graph

134 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jon Siwek
7936782057 Changes for CPack binary packaging 2011-01-12 16:26:25 -06:00
Jon Siwek
5d1f1e9edb Fix package configuration macro returning from sub-project too early 2011-01-11 19:30:31 -06:00
Jon Siwek
911230b037 Add warning when building and installing are done by different users 2011-01-11 15:59:25 -06:00
Jon Siwek
f5715e7c14 Fix for PackageMaker not accepting non-numeric versions 2011-01-10 12:58:40 -06:00
Jon Siwek
3f6aa735e9 Fix for OS X 10.5 compile error wrt llabs() 
GCC < 4.1.0 possibly has a problem w/ choosing an llabs()
unambigiously from stdlib.h and cstdlib

See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13943
 2011-01-06 17:06:51 -06:00
Jon Siwek
e1ebf81f76 Prefer static libraries for some dependencies on OS X 
This makes binary packaging easier because OS X doesn't ship with
all the shared libraries we may link against (libmagic and libGeoIP
in this case)
 2011-01-06 16:59:48 -06:00
Jon Siwek
b496d63632 Added OS X configures options for SDK & minimum version 2011-01-06 16:57:25 -06:00
Jon Siwek
fa07bcd233 Changes to allow source packaging via CPack 
- Refactored all packaging related stuff into a single CMake module
- Build should no longer fail when optional sources (e.g. broctl)
  do not exist in the source directory, instead a warning is issued
- Additional configure options to change packaging behavior
 2011-01-05 12:05:39 -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
0ebcf2dff4 Setting executable bit for bro-dev-path.in. 2010-12-09 02:51:11 -08:00
Robin Sommer
3facb6a9ea Merge remote branch 'origin/topic/cmake-port' 2010-12-09 02:00:46 -08:00
Jon Siwek
51d561c156 Fix wrong variable names in bro-path-dev script 2010-12-08 09:51:20 -06:00
Jon Siwek
943b5edee0 Merge branch 'master' into topic/cmake-port 2010-12-08 09:48:21 -06:00
Robin Sommer
a5890e304a Updating modules. 2010-12-08 04:48: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