[Forensics-changes] [yara] 02/04: Merge tag 'upstream/3.4.0+dfsg' into debian

[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 4fa200026e74631b06d7bc2b9f3bc4860b65daa7
Merge: bb1f1ec ea40639
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Jun 18 18:20:37 2015 +0200

    Merge tag 'upstream/3.4.0+dfsg' into debian
    
    Upstream version 3.4.0+dfsg

 .gitignore                                |    5 +
 AUTHORS                                   |    1 +
 CONTRIBUTORS                              |    3 +-
 README.md                                 |   13 +
 args.c                                    |    0
 args.h                                    |    0
 configure.ac                              |   20 +-
 dist/yara-python.spec                     |   35 +
 dist/yara.spec                            |   85 ++
 docs/capi.rst                             |  245 +++--
 docs/commandline.rst                      |   62 +-
 docs/conf.py                              |    6 +-
 docs/modules/elf.rst                      |   76 +-
 docs/modules/pe.rst                       |   35 +-
 docs/writingmodules.rst                   |    2 +-
 docs/yarapython.rst                       |   40 +-
 libyara/Makefile.am                       |   11 +-
 libyara/ahocorasick.c                     |    6 +-
 libyara/arena.c                           |  237 +++--
 libyara/atoms.c                           |    9 +-
 libyara/compiler.c                        |   20 +-
 libyara/exec.c                            |  146 +--
 libyara/filemap.c                         |  129 ++-
 libyara/grammar.c                         | 1392 ++++++++++++++++-------------
 libyara/grammar.h                         |  195 ++--
 libyara/grammar.y                         |  234 +++--
 libyara/hex_lexer.c                       |   98 +-
 libyara/hex_lexer.l                       |   12 +
 libyara/include/yara.h                    |    1 +
 libyara/include/yara/arena.h              |   15 +-
 libyara/include/yara/compiler.h           |   17 +-
 libyara/include/yara/elf.h                |   41 +-
 libyara/include/yara/error.h              |    3 +-
 libyara/include/yara/exec.h               |   34 +-
 libyara/include/yara/filemap.h            |   21 +-
 libyara/include/yara/libyara.h            |    6 +-
 libyara/include/yara/limits.h             |    2 +-
 libyara/include/yara/modules.h            |    2 -
 libyara/include/yara/object.h             |    3 +-
 libyara/include/yara/parser.h             |   32 +-
 libyara/include/yara/rules.h              |   21 +-
 libyara/include/yara/scan.h               |    7 +-
 libyara/include/yara/stream.h             |   59 ++
 libyara/include/yara/strutils.h           |    2 +-
 libyara/include/yara/types.h              |    8 +-
 libyara/include/yara/utils.h              |   22 +-
 libyara/lexer.c                           |  744 +++++++--------
 libyara/lexer.l                           |   19 +-
 libyara/libyara.sym                       |   31 -
 libyara/modules.c                         |   75 +-
 libyara/modules/elf.c                     |   96 +-
 libyara/modules/hash.c                    |    8 +-
 libyara/modules/magic.c                   |   40 +-
 libyara/modules/math.c                    |   10 +-
 libyara/modules/pe.c                      |  339 ++++---
 libyara/modules/pe_utils.c                |    1 +
 libyara/modules/tests.c                   |   10 +
 libyara/object.c                          |   72 +-
 libyara/parser.c                          |  174 ++--
 libyara/proc.c                            |    4 +
 libyara/re.c                              |  130 ++-
 libyara/re_grammar.c                      |  143 +--
 libyara/re_grammar.y                      |   11 +
 libyara/re_lexer.c                        |  138 +--
 libyara/re_lexer.l                        |   13 +
 libyara/rules.c                           |  236 +++--
 libyara/scan.c                            |  123 ++-
 libyara/{include/yara/scan.h => stream.c} |   39 +-
 libyara/strutils.c                        |   13 +-
 yara-python/setup.py                      |   15 +-
 yara-python/setupwin32.py                 |    2 +-
 yara-python/setupwin64.py                 |    2 +-
 yara-python/tests.py                      |   37 +-
 yara-python/yara-python.c                 |  553 ++++++++----
 yara.c                                    |   35 +-
 yara.man                                  |    5 +-
 76 files changed, 4077 insertions(+), 2454 deletions(-)

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