[Forensics-changes] [yara] 05/09: Merge tag 'upstream/3.3.0'

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository yara.

commit 8f4699214605179b9875190d65d0c91dbbba452d
Merge: 382c176 2ce34a9
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Feb 10 14:18:33 2015 +0100

    Merge tag 'upstream/3.3.0'
    
    Upstream version 3.3.0

 Makefile.am                                    |    6 +-
 README.md                                      |    1 +
 args.c                                         |  278 ++++++
 args.h                                         |   92 ++
 bootstrap.sh                                   |   70 +-
 configure.ac                                   |    7 +-
 docs/capi.rst                                  |   31 +-
 docs/conf.py                                   |    4 +-
 docs/gettingstarted.rst                        |    2 +-
 docs/modules.rst                               |    1 +
 docs/modules/math.rst                          |  100 ++
 docs/modules/pe.rst                            |  158 ++-
 docs/writingmodules.rst                        |  103 +-
 docs/writingrules.rst                          |   16 +-
 docs/yarapython.rst                            |    5 +-
 libyara/Makefile.am                            |   16 +-
 libyara/ahocorasick.c                          |    8 +-
 libyara/arena.c                                |    6 +-
 libyara/atoms.c                                |  204 ++--
 libyara/compiler.c                             |  145 ++-
 libyara/exec.c                                 |  794 +++++++++------
 libyara/exefiles.c                             |   18 -
 libyara/filemap.c                              |  182 +++-
 libyara/grammar.c                              | 1248 ++++++++++++------------
 libyara/grammar.h                              |  112 +--
 libyara/grammar.y                              |  379 +++----
 libyara/hash.c                                 |    5 +-
 libyara/include/yara/ahocorasick.h             |    2 +-
 libyara/include/yara/arena.h                   |    1 +
 libyara/include/yara/compiler.h                |   20 +-
 libyara/include/yara/exec.h                    |  172 ++--
 libyara/include/yara/exefiles.h                |   10 -
 libyara/include/yara/filemap.h                 |   15 +-
 libyara/include/yara/lexer.h                   |   17 +
 libyara/include/yara/libyara.h                 |   13 +
 libyara/include/yara/mem.h                     |    1 +
 libyara/include/yara/modules.h                 |   83 +-
 libyara/include/yara/object.h                  |   24 +-
 libyara/include/yara/parser.h                  |   14 +
 libyara/include/yara/pe.h                      |   50 +-
 libyara/include/yara/re.h                      |   33 +-
 libyara/include/yara/rules.h                   |    6 +
 libyara/include/yara/sizedstr.h                |   13 +-
 libyara/include/yara/strutils.h                |    2 +-
 libyara/include/yara/types.h                   |   27 +-
 libyara/include/yara/utils.h                   |    4 +-
 libyara/lexer.c                                |  641 ++++++------
 libyara/lexer.l                                |   56 +-
 libyara/libyara.c                              |    3 +-
 libyara/libyara.sym                            |    3 +
 libyara/mem.c                                  |    2 +
 libyara/modules.c                              |   26 +-
 libyara/modules/elf.c                          |  176 ++--
 libyara/modules/hash.c                         |   47 +-
 libyara/modules/math.c                         |  567 +++++++++++
 libyara/modules/module_list                    |    1 +
 libyara/modules/pe.c                           |  788 +++++++++++----
 libyara/modules/pe_utils.c                     |    6 +-
 libyara/modules/tests.c                        |   38 +-
 libyara/object.c                               |  192 +++-
 libyara/parser.c                               |  174 +++-
 libyara/proc.c                                 |   66 +-
 libyara/re.c                                   |  157 ++-
 libyara/re_grammar.c                           |  254 ++---
 libyara/re_grammar.h                           |    8 +-
 libyara/re_grammar.y                           |   14 +
 libyara/re_lexer.c                             |  263 ++---
 libyara/re_lexer.l                             |   64 +-
 libyara/rules.c                                |   38 +-
 libyara/scan.c                                 |   32 +-
 libyara/{include/yara/libyara.h => sizedstr.c} |   47 +-
 libyara/strutils.c                             |    2 +-
 libyara/yara.pc.in                             |   11 +
 windows/libyara/Debug/CL.read.1.tlog           |  Bin 369568 -> 0 bytes
 windows/libyara/libyara.vcxproj                |   15 +-
 windows/yara/yara.vcxproj                      |   13 +-
 windows/yarac/yarac.vcxproj                    |   10 +-
 yara-python/setup.py                           |    5 +-
 yara-python/setupwin32.py                      |    2 +-
 yara-python/setupwin64.py                      |    2 +-
 yara-python/tests.py                           |   97 +-
 yara-python/yara-python.c                      |   52 +-
 yara.c                                         |  889 ++++++++---------
 yara.man                                       |   28 +-
 yarac.c                                        |  269 ++---
 85 files changed, 6276 insertions(+), 3280 deletions(-)

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