diff --git a/configure.ac b/configure.ac index 7a9bb6c2ad..1d83467378 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([yara], [4.0.0], [vmalvarez@virustotal.com]) +AC_INIT([yara], [4.0.1], [vmalvarez@virustotal.com]) AM_SILENT_RULES([yes]) AC_CONFIG_SRCDIR([yara.c]) diff --git a/docs/conf.py b/docs/conf.py index 742e73f7f3..d2ae90eee8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,7 @@ # The short X.Y version. version = '4.0' # The full version, including alpha/beta/rc tags. -release = '4.0.0' +release = '4.0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/libyara/Makefile.am b/libyara/Makefile.am index f1b92609ee..cb878b4223 100644 --- a/libyara/Makefile.am +++ b/libyara/Makefile.am @@ -144,7 +144,7 @@ dist_noinst_DATA = pb/yara.proto lib_LTLIBRARIES = libyara.la -libyara_la_LDFLAGS = -version-number 4:0:0 +libyara_la_LDFLAGS = -version-number 4:0:1 BUILT_SOURCES = \ lexer.c \ diff --git a/libyara/atoms.c b/libyara/atoms.c index 370de68710..8884fcf55f 100644 --- a/libyara/atoms.c +++ b/libyara/atoms.c @@ -1415,7 +1415,8 @@ int yr_atoms_extract_from_re( // This is to avoid the situation where we have "base64 wide" because // the wide has already been applied BEFORE the base64 encoding. if (modifier.flags & STRING_FLAGS_WIDE && - !(modifier.flags & STRING_FLAGS_BASE64 || modifier.flags & STRING_FLAGS_BASE64_WIDE)) + !(modifier.flags & STRING_FLAGS_BASE64 || + modifier.flags & STRING_FLAGS_BASE64_WIDE)) { FAIL_ON_ERROR_WITH_CLEANUP( _yr_atoms_wide(*atoms, &wide_atoms), diff --git a/libyara/include/yara/libyara.h b/libyara/include/yara/libyara.h index b5825195cf..e8bf229054 100644 --- a/libyara/include/yara/libyara.h +++ b/libyara/include/yara/libyara.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define YR_MAJOR_VERSION 4 #define YR_MINOR_VERSION 0 -#define YR_MICRO_VERSION 0 +#define YR_MICRO_VERSION 1 #define version_str(s) _version_str(s) #define _version_str(s) #s