Skip to content

Commit

Permalink
Merging master->stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Rossi authored and Jeremy Rossi committed Apr 25, 2015
2 parents 5753d61 + e2c2cab commit 30391aa
Show file tree
Hide file tree
Showing 575 changed files with 36,087 additions and 44,886 deletions.
78 changes: 41 additions & 37 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,45 @@

# Auto generated build files
src/LOCATION
src/Config.OS
src/headers/zconf.h
src/headers/zlib.h
src/headers/cJSON.h
src/external/zlib-1.2.8/configure.log
src/external/zlib-1.2.8/Makefile
src/external/zlib-1.2.8/zconf.h
src/external/zlib-1.2.8/zlib.pc
src/isbigendian.c
src/analysisd/compiled_rules/compiled_rules.h
src/os_auth/agent-auth
src/os_auth/ossec-authd
etc/ossec.mc


# Compiled programs
bin/**
src/addagent/manage_agents
src/agentlessd/ossec-agentlessd
src/analysisd/ossec-analysisd
src/analysisd/ossec-logtest
src/client-agent/ossec-agentd
src/logcollector/ossec-logcollector
src/monitord/ossec-monitord
src/monitord/ossec-reportd
src/os_auth/agent-auth
src/os_auth/ossec-authd
src/os_csyslogd/ossec-csyslogd
src/os_dbd/ossec-dbd
src/os_execd/ossec-execd
src/os_maild/ossec-maild
src/remoted/ossec-remoted
src/syscheckd/ossec-syscheckd
src/util/agent_control
src/util/clear_stats
src/util/list_agents
src/util/rootcheck_control
src/util/syscheck_control
src/util/syscheck_update
src/analysisd/ossec-makelists
src/agent-auth
src/agent_control
src/clear_stats
src/external/lua-5.2.3/src/ossec-lua
src/external/lua-5.2.3/src/ossec-luac
src/isbigendian
src/util/ossec-regex
src/util/verify-agent-conf
src/list_agents
src/manage_agents
src/ossec-agentd
src/ossec-agentlessd
src/ossec-analysisd
src/ossec-authd
src/ossec-csyslogd
src/ossec-dbd
src/ossec-execd
src/ossec-logcollector
src/ossec-logtest
src/ossec-maild
src/ossec-makelists
src/ossec-monitord
src/ossec-regex
src/ossec-remoted
src/ossec-reportd
src/ossec-syscheckd
src/rootcheck_control
src/syscheck_control
src/syscheck_update
src/verify-agent-conf


# Eclipse files
.cproject
Expand All @@ -61,8 +62,11 @@ src/util/verify-agent-conf
# test and coverage files
*.gcno
*.gcda
src/tests/coverage-report/
src/tests/ossec.test
src/tests/test_os_regex
src/tests/test_os_xml
src/tests/test_os_zlib
src/coverage-report/
src/ossec.test
src/test_os_crypto
src/test_os_net
src/test_os_regex
src/test_os_xml
src/test_os_zlib
src/test_shared
68 changes: 53 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,76 @@ language: c
notifications:
irc:
- "chat.freenode.net#ossec-dev"
slack:
secure: Cz1InEL5G+z2huuzilXe7BqfxlEjN4io5ylJa5jgPvGMlB5sIQZTQQ7PDrzcK0iwn+5xgDkXKwbNPV2k+NHNTtNFiuBrcnJbyeA8PjghtAw4hg/Vpl5+5ovySZT9pGSV7ySsA8nGD73hlcQFgWnYDhsugQ6UZyRXAN8vLLCLjPg=

env:
- DB=mysql OSSEC_TYPE=all GEOIP=yes
- DB=mysql OSSEC_TYPE=all GEOIP=no
- DB=none OSSEC_TYPE=all GEOIP=yes
- DB=none OSSEC_TYPE=all GEOIP=no
- DB=mysql OSSEC_TYPE=server GEOIP=yes
- DB=mysql OSSEC_TYPE=server GEOIP=no
- DB=pgsql OSSEC_TYPE=server GEOIP=yes
- DB=pgsql OSSEC_TYPE=server GEOIP=no
- DB=none OSSEC_TYPE=server GEOIP=yes
- DB=none OSSEC_TYPE=server GEOIP=no
- DB=none OSSEC_TYPE=server PRELUDE=yes ZEROMQ=yes PICVIZ=yes
- DB=none OSSEC_TYPE=local GEOIP=no
- DB=none OSSEC_TYPE=hybrid GEOIP=no
- DB=none OSSEC_TYPE=agent GEOIP=no
- DB=none OSSEC_TYPE=windows_agent GEOIP=no
- DB=none OSSEC_TYPE=winagent GEOIP=no
- OSSEC_TYPE=test

- OSSEC_TYPE=server RULES=test


compiler:
- gcc
- clang


matrix:
fast_finish: true
exclude:
- compiler: clang
env: DB=none OSSEC_TYPE=winagent GEOIP=no
- compiler: clang
env: OSSEC_TYPE=server RULES=test



before_script:
- if [[ "$DB" == "mysql" ]]; then ( cd src && make setdb ); fi
- if [[ "$GEOIP" == "yes" ]]; then ( sudo apt-get install geoip-bin geoip-database libgeoip-dev libgeoip1 ); fi
- if [[ "$GEOIP" == "yes" ]]; then ( cd src && make setgeoip ); fi
- if [[ "$OSSEC_TYPE" == "windows_agent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
- if [[ "$OSSEC_TYPE" == "test" ]]; then ( sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main " && sudo apt-get update && sudo apt-get install check ); fi
- sudo apt-get update -qq
- if [[ "${GEOIP}" == "yes" ]]; then ( sudo apt-get install geoip-bin geoip-database libgeoip-dev libgeoip1 ); fi
- if [[ "${PRELUDE}" == "yes" ]]; then ( sudo apt-get install libprelude-dev ); fi
- if [[ "${ZEROMQ}" == "yes" ]]; then ( sudo apt-get install libzmq3-dev
&& wget http://download.zeromq.org/czmq-2.2.0.tar.gz
&& tar xfz czmq-2.2.0.tar.gz && cd czmq-2.2.0/
&& ./configure && make all -j && sudo make install
); fi
- if [[ "${OSSEC_TYPE}" == "winagent" ]]; then ( sudo apt-get install aptitude && sudo aptitude -y install mingw-w64 nsis ); fi
- if [[ "${OSSEC_TYPE}" == "test" ]]; then ( sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main " && sudo apt-get update && sudo apt-get install check valgrind ); fi



script:
- ( cd src && sudo make $OSSEC_TYPE )
- COMMAND="V=1 TARGET=${OSSEC_TYPE}"
&& if ! [[ "${DB}" = "none" ]]; then COMMAND="${COMMAND} DATABASE=${DB}"; fi
&& if [[ "${GEOIP}" = "yes" ]]; then COMMAND="${COMMAND} USE_GEOIP=1"; fi
&& if [[ "${PRELUDE}" = "yes" ]]; then COMMAND="${COMMAND} USE_PRELUDE=1"; fi
&& if [[ "${PICVIZ}" = "yes" ]]; then COMMAND="${COMMAND} USE_PICVIZ=1"; fi
&& if [[ "${ZEROMQ}" = "yes" ]]; then COMMAND="${COMMAND} USE_ZEROMQ=1"; fi
&& ( cd src/ && make --warn-undefined-variables ${COMMAND} settings && make --warn-undefined-variables ${COMMAND} -j )
&& if ! [[ "${OSSEC_TYPE}" = "test" || "${OSSEC_TYPE}" = "winagent" ]]; then ( cd src/ && sudo make --warn-undefined-variables ${COMMAND} install ) fi

before_deploy:
- mkdir travis-builds
- if [[ "$OSSEC_TYPE" == "windows_agent" ]]; then ( cp src/win-pkg/ossec-agent.exe travis-builds/ossec-agent-bid:$TRAVIS_JOB_NUMBER-br:$TRAVIS_BRANCH.exe ); fi
- if [[ "${OSSEC_TYPE}" == "test" ]]; then ( cd src/ && make --warn-undefined-variables test_valgrind ) fi
- if [[ "${RULES}" == "test" ]]; then ( cd src/ && sudo make V=1 TARGET=server test-rules ) fi


deploy:
provider: releases
api_key:
secure: "DiVPTCt1C8XCmFlzcpmFkqfRmxz85/RCE2euvU/c1EiABjfO20aZARCC9zsepAwAGWWsq3uGRLp0aVuJuh4LvTdGxIJDOqYR8z1pByfY4epgE7zmRCIWjx+nAwBpLlfYalMWFpt7vmPp9mKycFkUR2NFoiEfOgoO9wGN0ZgmwSM="
file: src/win-pkg/ossec-win32-agent.exe
skip_cleanup: true
on:
tags: true
all_branches: true
repo: ossec/ossec-hids
condition: $OSSEC_TYPE = winagent
138 changes: 81 additions & 57 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,76 @@ who helped us since our first release (0.1).
(if you feel you should be here, but it is not, let us know).

-Development
- Daniel B. Cid <dcid ( at ) ossec.net>
- Jeremy Rossi <jrossi ( at ) ptnsecurity.com>
- Daniel B. Cid <dcid@ossec.net>
- Jeremy Rossi <jeremy@jeremyrossi.com>
- Michael Starks
- Dan Parriott <ddpbsd at gmail.com>
- Meir Michanie <meirgotroot ( at ) gmail.com>
- Slava Semushin <php-coder at altlinux.org>
- Ahmet Ozturk <oahmet ( at ) metu.edu.tr>
- Scott R. Shinn
- Dan Parriott <ddpbsd@gmail.com>
- Meir Michanie <meirgotroot@gmail.com>
- Slava Semushin <php-coder@altlinux.org>
- Ahmet Ozturk <oahmet@metu.edu.tr>
- Scott R. Shinn
- George Kargiotakis
- Jason Stelzer
- Xavier Mertens
- Stjepan Gros
- Brad Lhotsky
- cmlara
- Christian Gottsche (cgzones)
- Christian Gottsche <cgzones@googlemail.com>
- Dominic
- JB Cheng
- Cristobel Rosa ( at ) alienvault
- JB Cheng <[email protected]>
- Cristobel <rosa@alienvault>
- jp.zurbrugg
- bil_hays (at) unc edu
- github.com/awiddersheim
- github.com/danpop60
- Bil Hays <[email protected]>
- Andrew Widdersheim <[email protected]>
- Wouter Clarie <[email protected]>
- Mario Weigel
- Christian Beer <[email protected]>
- Gael Muller <[email protected]>
- Ky-Anh Huynh <[email protected]>
- Dan Garthwaite <[email protected]>
- Lance A. Brown <[email protected]>
- danpop60 <[email protected]>
- Martin DiViaio <[email protected]>
- Michael Boyd <[email protected]>
- ibatten <[email protected]>
- rhelfter <[email protected]>
- Peter Drake <[email protected]>
- Mikey Austin <[email protected]>
- Harshil Mathur <[email protected]>
- Ryan Schulze <[email protected]>
- navtej <[email protected]>
- Hakisho Nukama <[email protected]>
- Danny Fullerton <[email protected]>
- Justin Gerace <[email protected]>
- jknockaert <[email protected]>
- Jason Stelzer <[email protected]>


-Testing/Patches Rules and other contributions.
- Cédric Bleimling <cedri at dryades.org
- Dean Takemori <dtakemori at thdfsg.com>
- Sebastien Tricaud <toady at gscore.org>
- Jeff Schroeder <jeffschroeder ( at ) computer.org>
- Giannis Vrentzos <gvre ( at ) gvre.gr>
- Peter Ahlert <peter ( at ) ifup.de>
- Rafael Capovilla <under ( at ) underlinux.com.br>
- Andre Alexandre Gaio <aagaio ( at ) linwork.com.br>
- Liliane A. Cid <liliane.cid ( at ) gmail.com>
- Marcus Maciel - <marcus @ ( at ) underlinux.com.br>
- Stephen Kreusch <stephen.kreusch at gmail.com>
- Kayvan A. Sylvan <kayvan@ ( at ) sylvan.com>
- Dianzhi Wang <wangdz@ ( at ) leadsec.com.cn>
- Meir Michanie <meirgotroot@ ( at ) gmail.com>
- Stephen Bunn <sbunn ( at ) roguesoftware.net>
- Jonathan Scheidell <jscheidell ( at ) secnap.net>
- |SaMaN| <saman ( at ) ttnet.net.tr>
- ChuckD <mdmonk at gmail.com>
- Jorge Augusto Senger <jorge ( at ) br10.com.br> - ossec2mysql (contrib)
- Cédric Bleimling <cedri@dryades.org
- Dean Takemori <dtakemori@thdfsg.com>
- Sebastien Tricaud <toady@gscore.org>
- Jeff Schroeder <jeffschroeder@computer.org>
- Giannis Vrentzos <gvre@gvre.gr>
- Peter Ahlert <peter@ifup.de>
- Rafael Capovilla <under@underlinux.com.br>
- Andre Alexandre Gaio <aagaio@linwork.com.br>
- Liliane A. Cid <liliane.cid@gmail.com>
- Marcus Maciel <marcus@underlinux.com.br>
- Stephen Kreusch <stephen.kreusch@gmail.com>
- Kayvan A. Sylvan <[email protected]>
- Dianzhi Wang <[email protected]>
- Meir Michanie <[email protected]>
- Stephen Bunn <sbunn@roguesoftware.net>
- Jonathan Scheidell <jscheidell@secnap.net>
- |SaMaN| <saman@ttnet.net.tr>
- ChuckD <mdmonk@gmail.com>
- Jorge Augusto Senger <jorge@br10.com.br> - ossec2mysql (contrib)
- David J. Bianco <david at vorant.com>
- Ivan Lotina <lotke at lotke.com>
- Robert Millan [ackstorm] <rmillan at ackstorm.es>
- Martin West <martin at objectgizmos.com>
- Rafael Capovilla <under ( at ) underlinux.com.br>
- Ivan Lotina <lotke@lotke.com>
- Robert Millan [ackstorm] <rmillan@ackstorm.es>
- Martin West <martin@objectgizmos.com>
- Rafael Capovilla <under@underlinux.com.br>
- Florian Crouzqat
- Danny Fullerton
- Jeremy Hanmer
Expand All @@ -65,47 +86,50 @@ who helped us since our first release (0.1).
- carlopmart
- Ash Kumar
- Alexandro Silva


- Mike Downey <[email protected]>
- Hai Nguyen <[email protected]>
- Jeffrey Jackson <[email protected]>
- Ben Chavet <[email protected]>
- Bill Parker <[email protected]>


-Translations

-Dutch:
- Martijn de Boer - martijn ( at ) oceanius.com
- Martijn de Boer <martijn@oceanius.com>

-Serbian:
- Maja Michanie - majam ( at ) riunx.com
- Maja Michanie <majam@riunx.com>

-Portuguese:
- Daniel Barcellos <danielpoa.rs ( at ) gmail.com>
- Allan Soares <allan.soares ( at ) gmail.com>
- Willian Itiho Amano <itihoitiho ( at ) gmail.com>
- Liliane Cid - <liliane.cid ( at ) gmail.com>
- Daniel Barcellos <danielpoa.rs@gmail.com>
- Allan Soares <allan.soares@gmail.com>
- Willian Itiho Amano <itihoitiho@gmail.com>
- Liliane Cid <liliane.cid@gmail.com>

-German:
- Peter Ahlert <peter ( at ) ifup.de>
- Peter Ahlert <peter@ifup.de>

-Turkish
- Ahmet Ozturk - <oahmet @ ( at ) metu.edu.tr>
- Ahmet Ozturk <oahmet@metu.edu.tr>

-Polish
- Dziankowski Krzysztof - <odpadki @ ( at ) poczta.onet.pl>
- Dziankowski Krzysztof <odpadki@poczta.onet.pl>

-Italian
- Alberto Furia - <straluna ( at ) email.it>
- Alberto Furia <straluna@email.it>

-French
- Yves Bigliazzi - <yves.bigliazzi ( at ) gmail.com>
- Yves Bigliazzi <yves.bigliazzi@gmail.com>

-Japanese
- Kuzuno Hiroki - <kuzuno ( at )gmail.com>
- Kuzuno Hiroki <kuzuno@gmail.com>

-Russian
- Yuri Slobodyanyuk - <yurisk ( at ) inbox.ru>
- Yuri Slobodyanyuk <yurisk@inbox.ru>

-Spanish
- Meir Michanie <meirgotroot@ ( at ) gmail.com>
- Meir Michanie <[email protected]>

-Chinese
- Brian Wang - <junchangwang ( at ) gmail.com>

#EOF
- Brian Wang <[email protected]>
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Fast way steps:
4- Enjoy.


= Installation and Running (99,99% should read ABOVE) =
= Installation and Running (99.99% should read ABOVE) =


By Hand Installation steps:
Expand Down
Loading

0 comments on commit 30391aa

Please sign in to comment.