diff --git a/configure b/configure index 382634578..f3c8a09d2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0-beta. +# Generated by GNU Autoconf 2.69 for ClamAV 0.101.0-rc. # # Report bugs to . # @@ -592,8 +592,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ClamAV' PACKAGE_TARNAME='clamav' -PACKAGE_VERSION='0.101.0-beta' -PACKAGE_STRING='ClamAV 0.101.0-beta' +PACKAGE_VERSION='0.101.0-rc' +PACKAGE_STRING='ClamAV 0.101.0-rc' PACKAGE_BUGREPORT='https://bugzilla.clamav.net/' PACKAGE_URL='https://www.clamav.net/' @@ -1543,7 +1543,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ClamAV 0.101.0-beta to adapt to many kinds of systems. +\`configure' configures ClamAV 0.101.0-rc to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1614,7 +1614,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ClamAV 0.101.0-beta:";; + short | recursive ) echo "Configuration of ClamAV 0.101.0-rc:";; esac cat <<\_ACEOF @@ -1838,7 +1838,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ClamAV configure 0.101.0-beta +ClamAV configure 0.101.0-rc generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2428,7 +2428,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ClamAV $as_me 0.101.0-beta, which was +It was created by ClamAV $as_me 0.101.0-rc, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4185,7 +4185,7 @@ fi # Define the identity of the package. PACKAGE='clamav' - VERSION='0.101.0-beta' + VERSION='0.101.0-rc' # Some tools Automake needs. @@ -5913,7 +5913,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } -VERSION="0.101.0-beta" +VERSION="0.101.0-rc" LC_CURRENT=9 LC_REVISION=0 @@ -29787,7 +29787,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.101.0-beta, which was +This file was extended by ClamAV $as_me 0.101.0-rc, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29854,7 +29854,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.101.0-beta +ClamAV config.status 0.101.0-rc configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -32670,7 +32670,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ClamAV $as_me 0.101.0-beta, which was +This file was extended by ClamAV $as_me 0.101.0-rc, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32737,7 +32737,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ClamAV config.status 0.101.0-beta +ClamAV config.status 0.101.0-rc configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index dc197a80e..1a5c22e6d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl MA 02110-1301, USA. AC_PREREQ([2.59]) dnl For a release change [devel] to the real version [0.xy] dnl also change VERSION below -AC_INIT([ClamAV], [0.101.0-beta], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/]) +AC_INIT([ClamAV], [0.101.0-rc], [https://bugzilla.clamav.net/], [clamav], [https://www.clamav.net/]) dnl enable C++ AC_PROG_CXX() diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h index b56213de8..90c18e119 100644 --- a/libclamav/bytecode_api.h +++ b/libclamav/bytecode_api.h @@ -115,6 +115,7 @@ enum FunctionalityLevels { FUNC_LEVEL_0100_1 = 92, /**< LibClamAV release 0.100.1 */ FUNC_LEVEL_0100_2 = 93, /**< LibClamAV release 0.100.2 */ FUNC_LEVEL_0101_0_BETA = 100, /* LibClamAV beta release 0.101.0-beta */ + FUNC_LEVEL_0101_0 = 101, /* LibClamAV release 0.101.0, 0.101.0-rc */ FUNC_LEVEL_100 = 255 /* future release candidate */ }; diff --git a/libclamav/others.h b/libclamav/others.h index 407c5bed8..a821ace4a 100644 --- a/libclamav/others.h +++ b/libclamav/others.h @@ -72,7 +72,7 @@ * in re-enabling affected modules. */ -#define CL_FLEVEL 100 +#define CL_FLEVEL 101 #define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL diff --git a/m4/reorganization/version.m4 b/m4/reorganization/version.m4 index 44b173475..677b20916 100644 --- a/m4/reorganization/version.m4 +++ b/m4/reorganization/version.m4 @@ -1,6 +1,6 @@ dnl change this on a release dnl VERSION="devel-`date +%Y%m%d`" -VERSION="0.101.0-beta" +VERSION="0.101.0-rc" LC_CURRENT=9 LC_REVISION=0 diff --git a/win32/ClamAV-Installer.iss b/win32/ClamAV-Installer.iss index c726bfd35..9efe2cc8a 100644 --- a/win32/ClamAV-Installer.iss +++ b/win32/ClamAV-Installer.iss @@ -20,7 +20,7 @@ UninstallDisplayName=ClamAV Compression=lzma2 SolidCompression=yes OutputDir=. -OutputBaseFilename=ClamAV-0.101.0-beta +OutputBaseFilename=ClamAV-0.101.0-rc WizardImageFile=demon.bmp WizardSmallImageFile=talos.bmp diff --git a/win32/clamav-config.h b/win32/clamav-config.h index 83ac0dfdb..fc773342d 100644 --- a/win32/clamav-config.h +++ b/win32/clamav-config.h @@ -469,7 +469,7 @@ #define PACKAGE_NAME "ClamAV" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ClamAV 0.101.0-beta" +#define PACKAGE_STRING "ClamAV 0.101.0-rc" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "clamav" @@ -478,7 +478,7 @@ #define PACKAGE_URL "https://www.clamav.net/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.101.0-beta" +#define PACKAGE_VERSION "0.101.0-rc" /* scan buffer size */ #define SCANBUFF 131072 @@ -514,7 +514,7 @@ /* #undef USE_SYSLOG */ /* Version number of package */ -#define VERSION "0.101.0-beta" +#define VERSION "0.101.0-rc" /* Version suffix for package */ #define VERSION_SUFFIX "" diff --git a/win32/res/common.rc b/win32/res/common.rc index 3cdc6bae6..84aa9d75a 100644 --- a/win32/res/common.rc +++ b/win32/res/common.rc @@ -7,7 +7,7 @@ #endif #define RES_VER_Q 0,101,0,0 -#define RES_VER_S "ClamAV 0.101.0-beta" +#define RES_VER_S "ClamAV 0.101.0-rc" VS_VERSION_INFO VERSIONINFO FILEVERSION RES_VER_Q