[Forensics-changes] [yara] 256/415: Improve build system, remove unnecessary files and other minor changes

Hilko Bengen bengen at moszumanska.debian.org
Thu Apr 3 05:43:12 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 402eca1eefc80c691bce6531427042c700001d70
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Nov 26 10:56:09 2013 +0100

    Improve build system, remove unnecessary files and other minor changes
---
 AUTHORS             |   1 -
 ChangeLog           |  78 -----------
 INSTALL             | 370 ----------------------------------------------------
 Makefile.am         |   2 +-
 NEWS                |   0
 README => README.md |   0
 REVISION            |   1 -
 bootstrap.sh        |  97 +++++++++-----
 build.sh            |   4 +
 configure.ac        |   2 +-
 libyara/README      |   0
 yara.c              |   3 +-
 12 files changed, 69 insertions(+), 489 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b40dfb0..854814a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,2 @@
-
 Victor M. Alvarez <victor.alvarez at virustotal.com>
 Mike Wiacek <mjwiacek at google.com>
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 00bcd6b..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,78 +0,0 @@
-
-version 1.0 (24/09/2008)
-	* first release
-
-version 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
-
-version 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
-
-version 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
-
-version 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
-
-version 1.4 (13/05/2010)
-	* added external variables
-	* scan speed improvements
-	* added fast scan mode
-	* BUGFIX: crash in 64-bits Windows
-
-version 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 (@string[i])
-	* 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
-
-version 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
-
-version 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
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 6e90e07..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
-
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
diff --git a/Makefile.am b/Makefile.am
index d75988b..fe49a91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ yara_LDADD = libyara/.libs/libyara.a
 # man page
 man1_MANS = yara.man
 
-EXTRA_DIST = $(man1_MANS) REVISION
+EXTRA_DIST = $(man1_MANS) README.md
 
 if RE2
 nodist_EXTRA_yara_SOURCES = force.cpp
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md
diff --git a/REVISION b/REVISION
deleted file mode 100644
index 7e6742d..0000000
--- a/REVISION
+++ /dev/null
@@ -1 +0,0 @@
-#define REVISION "176"
diff --git a/bootstrap.sh b/bootstrap.sh
index 96c84ea..3145865 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,41 +1,68 @@
 #!/bin/sh
 
-# Quick and dirty script to reset everything
-# regarding libtool, autoconf, automake, etc.
+die() {
+    echo "$@"
+    exit 1
+}
 
-rm -rf m4
-rm -rf libyara/m4
+# Try to locate a program by using which, and verify that the file is an
+# executable
+locate_binary() {
+  for f in $@
+  do
+    file=`which $f 2>/dev/null | grep -v '^no '`
+    if test -n "$file" -a -x "$file"; then
+      echo $file
+      return 0
+    fi
+  done
 
-mkdir m4
-mkdir libyara/m4
+  echo ""
+  return 1
+}
 
-cd libyara
+autogen() {
+
+  echo "libtoolize..."
+  if test x$LIBTOOLIZE = x; then
+    LIBTOOLIZE=`locate_binary libtoolize glibtoolize`
+    if test x$LIBTOOLIZE = x; then
+      die "Did not find a supported aclocal"
+    fi
+  fi
+  $LIBTOOLIZE --force --quiet || exit 1
+
+  echo "aclocal..."
+  if test x$ACLOCAL = x; then
+    ACLOCAL=`locate_binary aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal19 aclocal-1.7 aclocal17 aclocal-1.5 aclocal15 aclocal`
+    if test x$ACLOCAL = x; then
+      die "Did not find a supported aclocal"
+    fi
+  fi
+  $ACLOCAL || exit 1
+
+  echo "autoheader..."
+  AUTOHEADER=${AUTOHEADER:-autoheader}
+  $AUTOHEADER || exit 1
 
-# Check if libtoolize exists, if not,
-# try with glibtoolize (Mac OS X name it that way)
-
-hash libtoolize &> /dev/null
-if [ $? -eq 1 ]; then
-    glibtoolize --force
-else
-    libtoolize --force
-fi
-
-aclocal
-autoheader
-automake --add-missing
-autoreconf
-
-cd ..
-
-hash libtoolize &> /dev/null
-if [ $? -eq 1 ]; then
-    glibtoolize --force
-else
-    libtoolize --force
-fi
-
-aclocal
-autoheader
-automake --add-missing
-autoreconf
\ No newline at end of file
+  echo "automake..."
+  if test x$AUTOMAKE = x; then
+    AUTOMAKE=`locate_binary automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.7`
+    if test x$AUTOMAKE = x; then
+      die "Did not find a supported automake"
+    fi
+  fi
+  $AUTOMAKE --foreign --add-missing || $AUTOMAKE --gnu --add-missing || exit 1
+
+  echo "autoconf..."
+  AUTOCONF=${AUTOCONF:-autoconf}
+  $AUTOCONF || exit 1
+
+}
+
+echo "== bootstraping yara"
+autogen
+echo "== bootstraping libyara"
+cd libyara
+autogen
+cd ..
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..90bb778
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+./bootstrap.sh
+./configure
+make
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 95e39ac..c1b97d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([yara], [1.7.1], [vmalvarez at virustotal.com])
 LT_INIT
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_LIBTOOL
diff --git a/libyara/README b/libyara/README
deleted file mode 100644
index e69de29..0000000
diff --git a/yara.c b/yara.c
index 5070548..66c25f0 100644
--- a/yara.c
+++ b/yara.c
@@ -33,7 +33,6 @@ limitations under the License.
 #include <yara.h>
 
 #include "config.h"
-#include "REVISION"
 
 #ifndef MAX_PATH
 #define MAX_PATH 255
@@ -403,7 +402,7 @@ int process_cmd_line(YARA_CONTEXT* context, int argc, char const* argv[])
         switch (c)
         {
             case 'v':
-                printf("%s (rev:%s)\n", PACKAGE_STRING, REVISION);
+                printf("%s\n", PACKAGE_STRING);
                 return 0;
 
             case 'r':

-- 
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