[Forensics-changes] [yara] 266/368: Merge remote-tracking branch 'upstream/master'

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit dfc2f2acb476bf393de3766d5818c2b6d31136a6
Merge: 20070c0 f50dec1
Author: Christian Blichmann <cblichmann at google.com>
Date:   Fri Apr 29 12:57:05 2016 +0200

    Merge remote-tracking branch 'upstream/master'

 .gitignore                             |   25 +
 .travis.yml                            |    8 +
 Makefile.am                            |    6 +-
 README.md                              |    2 +
 configure.ac                           |   76 +-
 docs/commandline.rst                   |   12 +-
 docs/writingrules.rst                  |  114 ++-
 docs/yarapython.rst                    |   24 +-
 libyara/Makefile.am                    |    3 +
 libyara/ahocorasick.c                  |   89 +++
 libyara/compiler.c                     |   10 +-
 libyara/exception.h                    |    2 +-
 libyara/exec.c                         |   10 +-
 libyara/filemap.c                      |   42 +-
 libyara/grammar.c                      |  810 ++++++++++----------
 libyara/grammar.y                      |   22 +
 libyara/hex_lexer.c                    |  191 ++---
 libyara/hex_lexer.l                    |   25 +-
 libyara/include/yara/error.h           |    3 +-
 libyara/include/yara/filemap.h         |    8 +-
 libyara/include/yara/lexer.h           |    4 +-
 libyara/include/yara/libyara.h         |   19 +
 libyara/include/yara/limits.h          |    2 +-
 libyara/include/yara/object.h          |    8 +
 libyara/include/yara/pe.h              |    2 +-
 libyara/include/yara/re.h              |    1 +
 libyara/include/yara/strutils.h        |    6 +-
 libyara/include/yara/threading.h       |   52 ++
 libyara/include/yara/types.h           |   12 +-
 libyara/lexer.c                        |  299 ++++----
 libyara/lexer.l                        |   13 +-
 libyara/libyara.c                      |  149 ++--
 libyara/mem.c                          |    2 +-
 libyara/modules/cuckoo.c               |    2 +-
 libyara/modules/hash.c                 |   10 +-
 libyara/modules/pe.c                   |  167 ++--
 libyara/object.c                       |    2 +-
 libyara/parser.c                       |   20 +-
 libyara/proc.c                         |    2 +-
 libyara/re.c                           |  466 +++++++-----
 libyara/re_lexer.c                     |  238 +++---
 libyara/re_lexer.l                     |   38 +-
 libyara/rules.c                        |   58 +-
 libyara/scan.c                         |   45 +-
 libyara/threading.c                    |  196 +++++
 tests/blob.h                           |  167 ++++
 tests/data/cdak_1024x768.exe           |  Bin 0 -> 4095 bytes
 tests/data/old_ArmaFP.exe              |  Bin 0 -> 20464 bytes
 tests/data/tiny-idata-51ff.exe         |  Bin 0 -> 32768 bytes
 tests/data/tiny-idata-5200.exe         |  Bin 0 -> 32768 bytes
 tests/data/tiny.exe                    |  Bin 0 -> 32768 bytes
 tests/data/tiny.notes                  |   22 +
 tests/test-alignment.c                 |   16 +-
 tests/test-pe.c                        |   19 +
 tests/test-rules.c                     | 1300 ++++++++++++++++++++++++++++++++
 tests/util.c                           |  228 ++++++
 tests/util.h                           |  150 ++++
 threading.c                            |   24 +-
 threading.h                            |    8 +-
 windows/include/jansson.h              |    2 +-
 windows/vs2015/libyara/libyara.vcxproj |  219 ++++++
 windows/vs2015/libyara/packages.config |    4 +
 windows/vs2015/yara-2015.sln           |   54 ++
 windows/vs2015/yara/packages.config    |    4 +
 windows/vs2015/yara/yara.vcxproj       |  190 +++++
 windows/vs2015/yarac/packages.config   |    4 +
 windows/vs2015/yarac/yarac.vcxproj     |  189 +++++
 yara.c                                 |   53 +-
 yara.man                               |    4 +
 yarac.c                                |    1 -
 70 files changed, 4620 insertions(+), 1333 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git