[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta3-151-gf7a25f2
OISF Git
noreply at openinfosecfoundation.org
Tue Apr 7 11:33:59 UTC 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".
The branch, master has been updated
via f7a25f2b241fa3cc93f3c82654e6891f231a86ba (commit)
via 0b64b992c96cbd8a4c7c35c4a09e7e666dd08895 (commit)
via 8a0ebc4ade1d67e8290c516ed3e601a72e2ca0e9 (commit)
via fe45f2a342a35c4b9684a1e1d76acd4ac96253a5 (commit)
via ef627816cc1c7d303b034be9123ba2bf0a7ac32c (commit)
via a3c921f0a610d0b7e17a42ae88830f1a26285e3e (commit)
via fbe5db500ce9faadfa4cc1feba65492963bd2c4d (commit)
via f12e6fdcdabf8a3fccb0de27032a058bded2c867 (commit)
via be473fa71233d53a9742c0c30aa5ce561b300eff (commit)
via 1180fc1ac732912096766f2ee2c1ca944790ae91 (commit)
via dd6f9a6298e14e655d264467d181bda90844ce5f (commit)
via 3b827fd649726fe8dad58939143aecbd574ad38a (commit)
via 45ba20bcb09e03ca7a69d0d6107e6e4da5f04a60 (commit)
via 754ea3d849a0fbccf1a7197555761ffba5bd61e0 (commit)
via bd0041470f7b47fba5920354845ee5aa9035afd9 (commit)
via 605ef339727e013c9ea6f8917fd1d165408d8ae8 (commit)
via 9fb82390ab5864cf4cff13746e553f17ca2c2abb (commit)
via e5ae808b0f656a9da3073e0e162309d39ade599e (commit)
via ef3290bb2e5741f968ee37aa2f4766a23d30c9d0 (commit)
from 8e83d0073e4655388e8dd13c785875996faa494d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f7a25f2b241fa3cc93f3c82654e6891f231a86ba
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 13 09:55:27 2015 +0100
prscript: rework option logic
Handle cleanly the case where user start docker handling command
without having the dependency installed. The help message does
now say:
```
-d, --docker use docker based testing
-C, --create create docker container (disabled)
-s, --start start docker container (disabled)
-S, --stop stop docker container (disabled)
You need to install Python docker module to enable docker container handling
options.
```
And running a disabled options says:
```
$ qa/prscript.py -s
You need to install python docker to use docker handling features.
```
commit 0b64b992c96cbd8a4c7c35c4a09e7e666dd08895
Author: Eric Leblond <eric at regit.org>
Date: Thu Mar 12 18:01:03 2015 +0100
prscript: fix error message in non local test
Indicate to user that non local test needs a github user.
commit 8a0ebc4ade1d67e8290c516ed3e601a72e2ca0e9
Author: Eric Leblond <eric at regit.org>
Date: Thu Mar 12 15:39:32 2015 +0100
prscript: improve command line
You can now directly access to docker related command:
qa/prscript.py -C # create container
qa/prscript.py -s # start container
qa/prscript.py -S # stop container
The build option does not change:
qa/prscript.pu -l -d MY_BRANCH # build test of branch MY_BRANCH
commit fe45f2a342a35c4b9684a1e1d76acd4ac96253a5
Author: Eric Leblond <eric at regit.org>
Date: Wed Mar 11 19:56:12 2015 +0100
prscript: add notification system
If Python pynotify is installed, prscript can now send notification
via the -n flag.
commit ef627816cc1c7d303b034be9123ba2bf0a7ac32c
Author: Eric Leblond <eric at regit.org>
Date: Wed Mar 11 19:15:14 2015 +0100
prscript: improve wordings
commit a3c921f0a610d0b7e17a42ae88830f1a26285e3e
Author: Eric Leblond <eric at regit.org>
Date: Wed Mar 11 19:08:37 2015 +0100
prscript: suppress useless message
No build run faster than 2 seconds.
commit fbe5db500ce9faadfa4cc1feba65492963bd2c4d
Author: Eric Leblond <eric at regit.org>
Date: Wed Mar 11 18:07:15 2015 +0100
prscript: iterate on builds when checking status
This patch is changing the logic when using docker mode. We are
iterating over each builds so we know when one build is over in
the 5 seconds following the event instead of getting the result
when the builds that are checked before are others.
On OISF's build system, the two builds comes out in order so there
is no problem.
commit f12e6fdcdabf8a3fccb0de27032a058bded2c867
Author: Eric Leblond <eric at regit.org>
Date: Wed Mar 11 15:01:58 2015 +0100
prscript: read buildbot config from source
This patch change the logic of the Docker buildbot system. The
buildbot configuration is now the one available in qa/docker
directory.
This way, developers can test features in docker buildbot that
could require some specific flags to be set. They just need to
edit the buildbot.cfg for instance to enable a new feature.
In the same way, the tested pcap files are the one which are in
the qa/docker/pcaps/ directory. So to test some private ones it is
enough to put them in that directory.
To take into consideration a buildbot.cfg modification or a new
pcap, it is enough to stop and restart the container:
sudo qa/prscript.py -l -d -S master
sudo qa/prscript.py -l -d -s master
This patch also fixes the container update issue. A local modification
to the buildbot will be kept. It is also fixing the issue when working
on old code that could possibly not support the same build flag as
the one of buildbot. Here the configuration will remains in sync.
commit be473fa71233d53a9742c0c30aa5ce561b300eff
Author: Eric Leblond <eric at regit.org>
Date: Tue Mar 10 19:55:23 2015 +0100
prscript: add a comment on the SELinux issue
commit 1180fc1ac732912096766f2ee2c1ca944790ae91
Author: Eric Leblond <eric at regit.org>
Date: Tue Mar 10 16:12:45 2015 +0100
prscript: add docker handling support
You can now create the docker image necessary to run a
suricata builbot in docker. To do that you need to have
docker and python-docker installed on the system.
Then you can go to the qa directory.
You need to run once the creattion procedure:
sudo ./prscript.py -C -d master -l
This will create a container named 'suri-buildbot'.
You can start it with:
sudo ./prscript.py -s -d master -l
And stop it with:
sudo ./prscript.py -S -d master -l
To start a test, you can do:
./prscript.py -d my_branch -l
commit dd6f9a6298e14e655d264467d181bda90844ce5f
Author: Eric Leblond <eric at regit.org>
Date: Tue Mar 10 13:15:15 2015 +0100
prscript: refactor for docker
With the current work in progress on docker we need to update the
script to handle this case.
This patch adds two options:
- -d to run in docker mode. In that case the build is started in
the local dockerized buildbot instance
- -l to not test the tested branch synchronization with github.
The -l option allows user to run a complete test without publishing
the code on github and without Internet access.
commit 3b827fd649726fe8dad58939143aecbd574ad38a
Author: Jason Ish <ish at unx.ca>
Date: Mon Apr 6 17:05:16 2015 -0600
Duplicate rule ID.
commit 45ba20bcb09e03ca7a69d0d6107e6e4da5f04a60
Author: Alexander Gozman <a.gozman at securitycode.ru>
Date: Mon Mar 23 20:06:47 2015 +0300
DetectAddressParseString(): fix IPv6 address handling
commit 754ea3d849a0fbccf1a7197555761ffba5bd61e0
Author: Jason Ish <ish at unx.ca>
Date: Mon Mar 16 22:33:51 2015 -0600
prscript - fallback to json is simplejson not available.
commit bd0041470f7b47fba5920354845ee5aa9035afd9
Author: Eric Leblond <eric at regit.org>
Date: Thu Apr 2 18:21:40 2015 +0200
rules: add app layer events rules
Some application layer events are defined but the corresponding
rules were not available in the rules directory.
commit 605ef339727e013c9ea6f8917fd1d165408d8ae8
Author: Eric Leblond <eric at regit.org>
Date: Wed Apr 1 17:59:54 2015 +0200
runmodes: improve listing output
This patch removes some multiple line displayed before the
information about unix socket mode.
commit 9fb82390ab5864cf4cff13746e553f17ca2c2abb
Author: Eric Leblond <eric at regit.org>
Date: Thu Mar 5 11:09:03 2015 +0100
suricata.yaml: add missing mpm-algo
commit e5ae808b0f656a9da3073e0e162309d39ade599e
Author: Eric Leblond <eric at regit.org>
Date: Wed Apr 1 13:58:25 2015 +0200
runmodes: fix typo in output
commit ef3290bb2e5741f968ee37aa2f4766a23d30c9d0
Author: Eric Leblond <eric at regit.org>
Date: Fri Mar 20 10:24:39 2015 +0100
flow-manager: don't set cpu affinity twice
It is already set in the thread creation function.
-----------------------------------------------------------------------
Summary of changes:
qa/docker/buildbot.cfg | 235 ++++++++++++++++++++++++++++++++++++
qa/docker/pcaps/tls.pcap | Bin 0 -> 160944 bytes
qa/prscript.py | 272 +++++++++++++++++++++++++++++++++---------
rules/Makefile.am | 1 +
rules/app-layer-events.rules | 14 +++
rules/files.rules | 2 +-
src/detect-engine-address.c | 6 +-
src/flow-manager.c | 4 -
src/runmodes.c | 8 +-
suricata.yaml.in | 3 +-
10 files changed, 477 insertions(+), 68 deletions(-)
create mode 100644 qa/docker/buildbot.cfg
create mode 100644 qa/docker/pcaps/tls.pcap
create mode 100644 rules/app-layer-events.rules
hooks/post-receive
--
OISF
More information about the Oisf-devel
mailing list