[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta2-85-ga1eab4a

[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  a1eab4a2e22d100229407f3e168662a42396eca7 (commit)
       via  2b81caf73ecf7b47cbe061d36702a0d8fdd3074d (commit)
       via  485f34134ea1bce824a64f0759396f66a48bc7d3 (commit)
      from  f32d79dfe0ce98cbfc793a3e9ed78278315d70c3 (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 a1eab4a2e22d100229407f3e168662a42396eca7
Author: Travis Green <travis at travisgreen.net>
Date:   Tue Dec 23 15:10:21 2014 -0700

    Update reference.config
    
    Updated reference.config to match ET Open reference.config found here:
    https://rules.emergingthreats.net/open/suricata/reference.config
    
    Due to startup error shown here:
    root at xxxxxxx01:/etc/suricata/rules# /usr/bin/suricata -c /etc/suricata/suricata.yaml --pidfile /var/run/suricata.pid --af-packet
    23/12/2014 -- 22:07:56 - <Error> - [ERRCODE: SC_ERR_REFERENCE_UNKNOWN(150)] - unknown reference key "osvdb". Supported keys are defined in reference.config file.  Please have a look at the conf param "reference-config-file"
    <...>
    Killed

commit 2b81caf73ecf7b47cbe061d36702a0d8fdd3074d
Author: Jason Ish <jason.ish at emulex.com>
Date:   Mon Dec 29 10:04:37 2014 -0600

    Respect DESTDIR in install-conf and install-rules.

commit 485f34134ea1bce824a64f0759396f66a48bc7d3
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 6 13:11:38 2015 +0100

    unix socket: support profiling

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

Summary of changes:
 Makefile.am               |   40 ++++++++++++++++++++--------------------
 reference.config          |   15 +++++++++++----
 src/runmode-unix-socket.c |   12 ++++++++++++
 src/suricata.c            |   16 ++++++++++------
 src/util-profiling.c      |    3 +++
 5 files changed, 56 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
OISF