[Forensics-changes] [yara] 411/415: Imported Debian patch 2.1.0-1
Hilko Bengen
bengen at moszumanska.debian.org
Thu Apr 3 05:43:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository yara.
commit c0070425ef93127e644fc6232615548d130e50ff
Merge: fbe16d2 8d81484
Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
Date: Tue Mar 18 15:25:18 2014 -0300
Imported Debian patch 2.1.0-1
.gitignore | 46 +++++
AUTHORS | 15 +-
CONTRIBUTORS | 33 ++++
Makefile.am | 10 +-
README.md | 17 ++
bootstrap.sh | 10 +-
config.h | 16 +-
configure.ac | 28 ++-
debian/changelog | 18 ++
debian/changelog.upstream | 92 +--------
debian/clean | 1 -
debian/copyright | 4 +-
debian/exlib | 5 -
debian/libyara2.symbols | 52 ++---
debian/man/header.txt | 1 -
debian/man/yarac.txt | 35 ----
debian/patches/build-fixes | 78 --------
debian/patches/series | 1 -
debian/rules | 2 +-
debian/watch | 2 +-
debian/yara.manpages | 1 -
doc/YARA User's Manual.pdf | Bin 258130 -> 266491 bytes
libyara/Makefile.am | 3 +-
libyara/ahocorasick.c | 2 +-
libyara/ahocorasick.h | 2 +-
libyara/arena.c | 11 +-
libyara/arena.h | 6 +-
libyara/atoms.c | 2 +-
libyara/atoms.h | 6 +-
libyara/compiler.c | 34 ++--
libyara/compiler.h | 6 +-
libyara/configure.ac | 25 ---
libyara/elf.h | 2 +-
libyara/exec.c | 39 ++--
libyara/exec.h | 10 +-
libyara/exefiles.c | 36 +++-
libyara/exefiles.h | 6 +-
libyara/filemap.c | 4 +-
libyara/filemap.h | 8 +-
libyara/grammar.c | 137 ++++++-------
libyara/grammar.y | 5 +-
libyara/hash.c | 14 +-
libyara/hash.h | 6 +-
libyara/hex_grammar.c | 44 ++++-
libyara/hex_grammar.y | 26 ++-
libyara/hex_lexer.l | 2 +-
libyara/lexer.c | 408 ++++++++++++++++++++------------------
libyara/lexer.l | 47 ++++-
libyara/libyara.c | 2 +-
libyara/libyara.sym | 26 +++
libyara/mem.c | 16 +-
libyara/mem.h | 6 +-
libyara/parser.c | 59 ++++--
libyara/parser.h | 8 +-
libyara/pe.h | 3 +-
libyara/proc.c | 6 +-
libyara/proc.h | 7 +-
libyara/re.c | 426 ++++++++++++++++++++++++++--------------
libyara/re.h | 6 +-
libyara/re_grammar.y | 2 +-
libyara/re_lexer.c | 315 ++++++++++++++---------------
libyara/re_lexer.h | 2 +-
libyara/re_lexer.l | 61 ++++--
libyara/rules.c | 163 +++++++++------
libyara/sizedstr.h | 5 +-
libyara/utils.c | 2 +-
libyara/utils.h | 6 +-
libyara/yara.h | 53 +++--
threading.c | 27 ++-
threading.h | 14 +-
windows/yara/yara.sln | 3 +-
windows/yara/yara.vcxproj | 3 +
windows/yarac/yarac.vcxproj | 1 +
yara-python/setup.py | 20 +-
yara-python/setupwin32.py | 22 ++-
yara-python/setupwin64.py | 24 ++-
yara-python/tests.py | 40 +++-
yara-python/yara-python.c | 285 +++++++++++++++++----------
yara.c | 27 ++-
yara.man | 2 +-
yarac.c | 2 +-
debian/man/yarac.1 => yarac.man | 4 +-
82 files changed, 1784 insertions(+), 1222 deletions(-)
diff --cc debian/changelog
index 84c27dd,0000000..88b58d6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,77 -1,0 +1,95 @@@
++yara (2.1.0-1) unstable; urgency=medium
++
++ * New upstream release.
++ * debian/clean: removed because the upstream fixed the source code.
++ * changelog.upstream: updated.
++ * debian/copyright: updated the upstream copyright years.
++ * debian/exlib: removed this useless file.
++ * debian/libyara2.symbols: updated.
++ * debian/{man/,yara.manpages}: removed. The upstream adopted the
++ manpage provided by last Debian package.
++ * debian/patch/build-fixes: removed. The upstream fixed the source
++ code. Thanks Victor.
++ * debian/rules: updated the override_dh_installchangelogs target,
++ changing from "-p libyara0" to "-p libyara2".
++ * debian/watch: fixed and improved.
++
++ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Tue, 18 Mar 2014 15:25:18 -0300
++
+yara (2.0.0-2) unstable; urgency=medium
+
+ * Removed PCRE build-dependency as Yara now uses its own RE engine
+ * Added our fixes to build scripts that were accepted upstream (Closes:
+ #734777)
+ * Fixed symbols file, corrected SONAME and name of library package
+
+ -- Hilko Bengen <bengen at debian.org> Sun, 12 Jan 2014 23:37:07 +0100
+
+yara (2.0.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/changelog.upstream: added to provide a upstream changelog to
+ libyara-dev, libyara0, python-yara, python3-yara and yara.
+ * debian/control:
+ - Added the X-Python-Version and X-Python3-Version fields.
+ - Changed from "Python" to "Python 3" in short description of the
+ python3-yara binary to avoid a lintian "duplicate-short-description"
+ message.
+ - Enabled the VCS fields.
+ * debian/copyright:
+ - Added Hilko Bengen as package maintainer.
+ - Added references to windows/include/{pcre,pcreposix}.h and
+ windows/yarac/getopt.c, all using BSD-3-Clause license.
+ - Removed references to:
+ - libyara/grammar.y and libyara/elf.h that were rewritten and
+ relicensed as Apache-2.0.
+ - libyara/lex.l that was removed from source code.
+ - Updated the upstream e-mail address.
+ - Updated the packaging years.
+ * debian/libyara0.symbols: updated.
+ * debian/man/: created to provide absent manpages. Currently, yarac.1.
+ * debian/patches/:
+ - Added a header to fix-python-build.
+ - Updated the fix-python-build and manpage patches.
+ * debian/{python,python3}-yara.lintian-overrides: added to explain a
+ specific situation to lintian.
+ * debian/README.Debian: updated.
+ * debian/rules:
+ - Added the override_dh_installchangelogs to install the
+ changelog.upstream file.
+ - Added a command to override_dh_auto_clean target to remove
+ yara-python/build directory.
+ * debian/watch: little adjustment.
+ * debian/yara.manpages: created to install the yarac manpage.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br> Sun, 05 Jan 2014 15:47:56 +0000
+
+yara (1.7.2-3) unstable; urgency=low
+
+ * Added files that are only used in Windows builds to debian/copyright
+ (Closes: #733522)
+
+ -- Hilko Bengen <bengen at debian.org> Sun, 29 Dec 2013 20:58:10 +0100
+
+yara (1.7.2-2) unstable; urgency=low
+
+ * Added Python3 bindings package
+ * Corrected license for libyara/grammar.y, libyara/lex.l
+
+ -- Hilko Bengen <bengen at debian.org> Sun, 29 Dec 2013 14:48:00 +0100
+
+yara (1.7.2-1) unstable; urgency=low
+
+ [ Joao Eriberto Mota Filho ]
+ * Initial release (Closes: #728934)
+
+ [ Hilko Bengen ]
+ * Added myself to uploaders, with permission from Joao Eriberto Mota
+ Filho who did the initial work on the package.
+ * Updated package from 1.7 to 1.7.2
+ * Bumped Standards-Version, no changes
+ * Fixed copyright, watch file
+ * Fixed Homepage field
+ * Added python-yara package
+
+ -- Hilko Bengen <bengen at debian.org> Sat, 21 Dec 2013 14:28:56 +0100
diff --cc debian/changelog.upstream
index f5de472,0000000..38e51df
mode 100644,000000..100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@@ -1,103 -1,0 +1,13 @@@
++2.1.0 (05/03/2014)
+2.0.0 (26/12/2013)
- * Faster matching algorithm
- * Command-line scanner is now multi-threaded
- * Compiled rules can be saved to and loaded from a file
- * Added support for unbounded jumps
- * New libyara API
-
+1.7.2 (02/12/2013)
- * BUGFIX: Regular expressions marked as both "wide" and "ascii" were treated as
- just "wide"
- * BUGFIX: Bug in "n of (<string_set>)" operator
- * BUGFIX: Bug in get_process_memory could cause infinite loop
-
+1.7.1 (25/11/2013)
- * BUGFIX: Fix SIGABORT in ARM
- * BUGFIX: Failing to detect one-byte strings at the end of a file.
- * BUGFIX: Strings being incorrectly printed when marked both as wide and ascii
- * BUGFIX: Stack overflow while following circular symlinks
- * BUGFIX: Expression "/re/ matches var" always matching if "var" was an empty
- string
- * BUGFIX: Strings marked as "fullword" were incorrectly matching in some cases.
-
+1.7 (29/03/2013)
- * Faster compilation
- * Added suport for modulus (%) and bitwise xor (|) operators
- * Better hashing of regular expressions
- * BUGFIX: yara-python segfault when using dir() on Rules and Match classes
- * BUGFIX: Integer overflow causing infinite loop
- * BUGFIX: Handling strings containing \x00 characters correctly
- * BUGFIX: Regular expressions not matching at the end of the file when compiled
- with RE2
- * BUGFIX: Memory leaks
- * BUGFIX: File handle leaks
-
+1.6 (04/08/2011)
- * Added support for bitwise operators
- * Added support for multi-line hex strings
- * Scan speed improvement for regular expressions (with PCRE)
- * yara-python ported to Python 3.x
- * yara-python support for 64-bits Python under Windows
- * BUGFIX: Buffer overflow in error printing
-
+1.5 (22/03/2011)
- * Added -l parameter to abort scanning after a number of matches
- * Added support for scanning processes memory
- * Entrypoint now works with ELF as well as PE files
- * Added support for linking with the faster RE2 library
- (http://code.google.com/p/re2/) instead of PCRE
- * Implemented index operator to access offsets where string was found
- * Implemented new operator
- "for < quantifier > < variable > in < set or range > : (< expression >) "
- * BUGFIX: Memory leaks in yara-python
- * BUGFIX: yara.compile namespaces not working with filesources
-
+1.4 (13/05/2010)
- * Added external variables
- * Scan speed improvements
- * Added fast scan mode
- * BUGFIX: crash in 64-bits Windows
-
+1.3 (26/10/2009)
- * Added a C-like "include" directive
- * Added support for multi-sources compilation in yara-python
- * Added support for metadata declaration in rules
- * BUGFIX: Incorrect handling of single-line comments at the end of the file
- * BUGFIX: Integer underflow when scanning files of size <= 2 bytes
-
+1.2.1 (14/04/2009)
- * libyara: added support for compiling rules directly from memory
- * libyara: interface refactored
- * libyara: is thread-safe now
- * BUGFIX: Invoking pcre_compile with non-terminated string
- * BUGFIX: Underscore not recognized in string identifiers
- * BUGFIX: Memory leak
- * BUGFIX: Access violation on xxcompare functions
-
+1.2 (13/01/2009)
- * Added support for global rules
- * Added support for declaring alternative sub-strings in hex strings
- * Added support for anonymous strings
- * Added support for intXX and uintXX functions
- * Operator "of" was enhanced
- * Implemented new operator "for..of"
- * "widechar" is now "wide" and can be used in conjuntion with "ascii"
- * Improved syntax error reporting in yara-python
- * "compile" method in yara-python was enhanced
- * "matchfile" method in yara-python was substituted by "match"
- * Some performance improvements
- * BUGFIX: Wrong behavior of escaped characters in regular expressions
- * BUGFIX: Fatal error in yara-python when invoking matchfile with invalid path
- twice
- * BUGFIX: Wrong precedence of OR and AND operators
- * BUGFIX: Access violation when scanning MZ files with e_lfanew == -1
- * BUGFIX: Incorrect handling of hex strings in lexer
-
+1.1 (05/01/2009)
- * Added support for strings containing null (\x00) chars
- * Added syntactic construct "x of them"
- * Regular expressions syntax changed
- * Now regular expressions can begin with any character
-
+1.0 (24/09/2008)
- * First release
diff --cc debian/copyright
index 989918f,0000000..21c7ec0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,64 -1,0 +1,64 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: yara
+Source: http://code.google.com/p/yara-project
+
+Files: *
- Copyright: 2007, 2011-2013 Victor M. Alvarez <vmalvarez at virustotal.com>
++Copyright: 2007, 2011-2014 Victor M. Alvarez <vmalvarez at virustotal.com>
+ 2011 Google, Inc., by Mike Wiacek <mjwiacek at google.com>
+License: Apache-2.0
+
+Files: windows/include/pcre.h windows/include/pcreposix.h
+Comment: Only used in Windows build
+Copyright: 1997-2006 University of Cambridge
+License: BSD-3-Clause
+
- Files: windows/yara/getopt.c windows/yarac/getopt.c
++Files: windows/yara/getopt.c windows/yarac/getopt.c
+Comment: Only used in Windows build
+Copyright: 1987-2002 The Regents of the University of California
+License: BSD-3-Clause
+
+Files: debian/*
+Copyright: 2013-2014 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>,
+ Hilko Bengen <bengen at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --cc debian/libyara2.symbols
index bbc3cc3,0000000..434296b
mode 100644,000000..100644
--- a/debian/libyara2.symbols
+++ b/debian/libyara2.symbols
@@@ -1,27 -1,0 +1,27 @@@
+libyara.so.2 libyara2 #MINVER#
- yr_compiler_add_file at Base 2.0.0
- yr_compiler_add_string at Base 2.0.0
- yr_compiler_create at Base 2.0.0
- yr_compiler_define_boolean_variable at Base 2.0.0
- yr_compiler_define_integer_variable at Base 2.0.0
- yr_compiler_define_string_variable at Base 2.0.0
- yr_compiler_destroy at Base 2.0.0
- yr_compiler_get_current_file_name at Base 2.0.0
- yr_compiler_get_error_message at Base 2.0.0
- yr_compiler_get_rules at Base 2.0.0
- yr_compiler_pop_file_name at Base 2.0.0
- yr_compiler_push_file_name at Base 2.0.0
- yr_finalize at Base 2.0.0
- yr_finalize_thread at Base 2.0.0
- yr_get_tidx at Base 2.0.0
- yr_initialize at Base 2.0.0
- yr_rules_define_boolean_variable at Base 2.0.0
- yr_rules_define_integer_variable at Base 2.0.0
- yr_rules_define_string_variable at Base 2.0.0
- yr_rules_destroy at Base 2.0.0
- yr_rules_load at Base 2.0.0
- yr_rules_save at Base 2.0.0
- yr_rules_scan_file at Base 2.0.0
- yr_rules_scan_mem at Base 2.0.0
- yr_rules_scan_proc at Base 2.0.0
- yr_set_tidx at Base 2.0.0
++ yr_compiler_add_file at Base 2.1.0
++ yr_compiler_add_string at Base 2.1.0
++ yr_compiler_create at Base 2.1.0
++ yr_compiler_define_boolean_variable at Base 2.1.0
++ yr_compiler_define_integer_variable at Base 2.1.0
++ yr_compiler_define_string_variable at Base 2.1.0
++ yr_compiler_destroy at Base 2.1.0
++ yr_compiler_get_current_file_name at Base 2.1.0
++ yr_compiler_get_error_message at Base 2.1.0
++ yr_compiler_get_rules at Base 2.1.0
++ yr_compiler_pop_file_name at Base 2.1.0
++ yr_compiler_push_file_name at Base 2.1.0
++ yr_finalize at Base 2.1.0
++ yr_finalize_thread at Base 2.1.0
++ yr_get_tidx at Base 2.1.0
++ yr_initialize at Base 2.1.0
++ yr_rules_define_boolean_variable at Base 2.1.0
++ yr_rules_define_integer_variable at Base 2.1.0
++ yr_rules_define_string_variable at Base 2.1.0
++ yr_rules_destroy at Base 2.1.0
++ yr_rules_load at Base 2.1.0
++ yr_rules_save at Base 2.1.0
++ yr_rules_scan_file at Base 2.1.0
++ yr_rules_scan_mem at Base 2.1.0
++ yr_rules_scan_proc at Base 2.1.0
++ yr_set_tidx at Base 2.1.0
diff --cc debian/patches/series
index e832c40,0000000..6da592e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+fix-python-build
+manpage
- build-fixes
diff --cc debian/rules
index 224b670,0000000..b04c8aa
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,31 -1,0 +1,31 @@@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+PYTHONS:=$(shell pyversions --installed; py3versions --installed)
+
+%:
+ dh $@ --with autoreconf,python2,python3
+
+override_dh_auto_build:
+ dh_auto_build
+ set -e; for python in $(PYTHONS); do \
+ ( cd yara-python && $$python setup.py build ); \
+ done
+
+override_dh_auto_install:
+ dh_auto_install
+ set -e; for python in $(PYTHONS); do \
+ ( cd yara-python && $$python setup.py install --skip-build --root ../debian/tmp --install-layout=deb ); \
+ done
+
+override_dh_auto_clean:
+ rm -rf yara-python/build
+ dh_auto_clean
+ dh_auto_clean --sourcedirectory=yara-python
+
+override_dh_install:
+ dh_install --fail-missing -X.la
+
+override_dh_installchangelogs:
+ dh_installchangelogs
- dh_installchangelogs -p libyara-dev -p libyara0 -p python-yara -p python3-yara -p yara debian/changelog.upstream
++ dh_installchangelogs -p libyara-dev -p libyara2 -p python-yara -p python3-yara -p yara debian/changelog.upstream
diff --cc debian/watch
index 9cbea7d,0000000..a2cec7b
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
- https://github.com/plusvic/yara/releases .*v(\d\S*)\.tar\.gz
++https://github.com/plusvic/yara/releases .*/v?(\d\S+)\.tar\.(?:bz2|gz|xz)
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list