[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-43-g0e955cc

[OISF Git]

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  0e955ccf3a8d46790dff241148515d707fc0359b (commit)
       via  a54cef31ea81f4fdc41adf657e83a96e32cd4e5f (commit)
       via  e2c557cfdb48ac13ed535ee672d49d58b5a772c5 (commit)
       via  1e8142c6994cbffe69dee917f2705a7c71905bc2 (commit)
       via  4c6a7bea30eb87aa3017dd0be21dc0d72c810100 (commit)
       via  636e3d93c03ce8050e37e3d7015f538303498b66 (commit)
       via  7d73db9b80a89d462ddb72c48b40273a93a02558 (commit)
       via  39d667ff56899fcbacd4452230d98d13494e52b3 (commit)
       via  f11e237d7791c5fe6d49ae68a39e525291e9b5da (commit)
      from  4f8f53d080c6807f959a772279fdee5982384a9e (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 0e955ccf3a8d46790dff241148515d707fc0359b
Author: Eric Leblond <eric at regit.org>
Date:   Wed May 20 21:45:25 2015 +0200

    suri-graphite: add ouput to file option
    
    The --ooutput option allows to write the stats to a file given as
    argument the format used is JSON for easy parsing.

commit a54cef31ea81f4fdc41adf657e83a96e32cd4e5f
Author: Eric Leblond <eric at regit.org>
Date:   Sun May 17 19:02:37 2015 +0200

    suri-graphite: add daemonization capability
    
    You can now use -d or --daemon to daemonize the process.

commit e2c557cfdb48ac13ed535ee672d49d58b5a772c5
Author: Eric Leblond <eric at regit.org>
Date:   Sun May 17 18:57:48 2015 +0200

    suri-graphite: fix port option
    
    If port is specified on command line we need to convert it as an
    integer before using it as argument to connect.

commit 1e8142c6994cbffe69dee917f2705a7c71905bc2
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 22 14:23:18 2015 +0200

    logfile: rename ALERT_ types to LOGFILE_TYPE_

commit 4c6a7bea30eb87aa3017dd0be21dc0d72c810100
Author: Eric Leblond <eric at regit.org>
Date:   Wed May 20 13:40:01 2015 +0200

    output-json: suppress global variable
    
    It uses the new type field in the LogFileCtx instead.
    
    This fixes the problem of not being able to use two eve-json
    instance with different logging methods.

commit 636e3d93c03ce8050e37e3d7015f538303498b66
Author: Eric Leblond <eric at regit.org>
Date:   Wed May 20 13:38:10 2015 +0200

    log file: add type flag
    
    It will be used to store if the file is syslog or a real file.

commit 7d73db9b80a89d462ddb72c48b40273a93a02558
Author: Eric Leblond <eric at regit.org>
Date:   Sat Feb 7 11:36:37 2015 +0100

    suricata.yaml: fix the name of EVE module
    
    It is netflow and not newflow.

commit 39d667ff56899fcbacd4452230d98d13494e52b3
Author: Eric Leblond <eric at regit.org>
Date:   Sat Feb 7 01:58:28 2015 +0100

    output-json: fix type of data parameter
    
    The cast of data to AlertJsonThread was not correct as the real
    type of the void pointer is a OutputJsonCtx. This was working by
    luck because they both have a file_ctx as first element.

commit f11e237d7791c5fe6d49ae68a39e525291e9b5da
Author: Alexander Gozman <a.gozman at securitycode.ru>
Date:   Wed May 13 21:18:43 2015 +0300

    Feature #1440: support wildcards in rule filenames

-----------------------------------------------------------------------

Summary of changes:
 configure.ac              |   1 +
 contrib/suri-graphite     |  67 +++++++++++++++++-------
 src/detect.c              | 128 +++++++++++++++++++++++++++++-----------------
 src/detect.h              |   8 +++
 src/output-json-alert.c   |   2 +-
 src/output-json-file.c    |   4 +-
 src/output-json-flow.c    |   4 +-
 src/output-json-http.c    |   4 +-
 src/output-json-netflow.c |   4 +-
 src/output-json-smtp.c    |   4 +-
 src/output-json-ssh.c     |   4 +-
 src/output-json-tls.c     |   4 +-
 src/output-json.c         |  30 +++++------
 src/output-json.h         |   8 +--
 src/util-logopenfile.h    |   8 +++
 suricata.yaml.in          |   2 +-
 16 files changed, 179 insertions(+), 103 deletions(-)


hooks/post-receive
-- 
OISF