Bump version from 0.104.0 -> 0.105.0-devel-${TODAY}

Also increase FLEVEL from 140 -> 150.
This commit is contained in:
Micah Snyder 2021-08-21 15:45:20 -07:00 committed by Micah Snyder
parent 872a83fbfe
commit b47745b691
7 changed files with 37 additions and 17 deletions

View file

@ -18,10 +18,10 @@ cmake_policy(SET CMP0087 NEW) # support generator expressions in install(CODE) a
# For release candidate: set(VERSION_SUFFIX "-rc") # For release candidate: set(VERSION_SUFFIX "-rc")
# For release: set(VERSION_SUFFIX "") # For release: set(VERSION_SUFFIX "")
string(TIMESTAMP TODAY "%Y%m%d") string(TIMESTAMP TODAY "%Y%m%d")
set(VERSION_SUFFIX "-rc2") set(VERSION_SUFFIX "-devel-${TODAY}")
project( ClamAV project( ClamAV
VERSION "0.104.0" VERSION "0.105.0"
DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." ) DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." )
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

20
Jenkinsfile vendored
View file

@ -4,37 +4,37 @@ properties(
parameters( parameters(
[ [
string(name: 'VERSION', string(name: 'VERSION',
defaultValue: '0.104.0', defaultValue: '0.105.0',
description: 'ClamAV version string'), description: 'ClamAV version string'),
string(name: 'FRAMEWORK_BRANCH', string(name: 'FRAMEWORK_BRANCH',
defaultValue: '0.104', defaultValue: '0.105',
description: 'test-framework branch'), description: 'test-framework branch'),
string(name: 'TESTS_BRANCH', string(name: 'TESTS_BRANCH',
defaultValue: '0.104', defaultValue: '0.105',
description: 'tests branch'), description: 'tests branch'),
string(name: 'TESTS_CUSTOM_BRANCH', string(name: 'TESTS_CUSTOM_BRANCH',
defaultValue: '0.104', defaultValue: '0.105',
description: 'tests-custom branch'), description: 'tests-custom branch'),
string(name: 'TESTS_FUZZ_BRANCH', string(name: 'TESTS_FUZZ_BRANCH',
defaultValue: '0.104', defaultValue: '0.105',
description: 'tests-fuzz-regression branch'), description: 'tests-fuzz-regression branch'),
string(name: 'BUILD_PIPELINE', string(name: 'BUILD_PIPELINE',
defaultValue: 'build-0.104', defaultValue: 'build-0.105',
description: 'test-pipelines branch for build acceptance'), description: 'test-pipelines branch for build acceptance'),
string(name: 'REGULAR_PIPELINE', string(name: 'REGULAR_PIPELINE',
defaultValue: 'regular-0.104', defaultValue: 'regular-0.105',
description: 'test-pipelines branch for regular tests.'), description: 'test-pipelines branch for regular tests.'),
string(name: 'CUSTOM_PIPELINE', string(name: 'CUSTOM_PIPELINE',
defaultValue: 'custom-0.104', defaultValue: 'custom-0.105',
description: 'test-pipelines branch for custom tests'), description: 'test-pipelines branch for custom tests'),
string(name: 'FUZZ_PIPELINE', string(name: 'FUZZ_PIPELINE',
defaultValue: 'fuzz-regression-0.104', defaultValue: 'fuzz-regression-0.105',
description: 'test-pipelines branch for fuzz regression tests'), description: 'test-pipelines branch for fuzz regression tests'),
string(name: 'FUZZ_CORPUS_BRANCH', string(name: 'FUZZ_CORPUS_BRANCH',
defaultValue: 'master', defaultValue: 'master',
description: 'private-fuzz-corpus branch'), description: 'private-fuzz-corpus branch'),
string(name: 'APPCHECK_PIPELINE', string(name: 'APPCHECK_PIPELINE',
defaultValue: 'appcheck-0.104', defaultValue: 'appcheck-0.105',
description: 'test-pipelines branch for appcheck'), description: 'test-pipelines branch for appcheck'),
string(name: 'SHARED_LIB_BRANCH', string(name: 'SHARED_LIB_BRANCH',
defaultValue: 'master', defaultValue: 'master',

18
NEWS.md
View file

@ -3,6 +3,24 @@
Note: This file refers to the source tarball. Things described here may differ Note: This file refers to the source tarball. Things described here may differ
slightly from the binary packages. slightly from the binary packages.
## 0.105.0
ClamAV 0.105.0 includes the following improvements and changes.
### New Requirements
### Major changes
### Notable changes
### Other improvements
### Bug fixes
### Acknowledgements
The ClamAV team thanks the following individuals for their code submissions:
## 0.104.0 ## 0.104.0
ClamAV 0.104.0 includes the following improvements and changes. ClamAV 0.104.0 includes the following improvements and changes.

View file

@ -1,7 +1,7 @@
# ClamAV # ClamAV
<p align="center"> <p align="center">
<img width="250" height="250" src="https://raw.githubusercontent.com/Cisco-Talos/clamav-devel/dev/0.104/logo.png" alt='Maeve, the ClamAV mascot'> <img width="250" height="250" src="https://raw.githubusercontent.com/Cisco-Talos/clamav/main/logo.png" alt='Maeve, the ClamAV mascot'>
</p> </p>
<p align="center"> <p align="center">

View file

@ -151,6 +151,8 @@ enum FunctionalityLevels {
FUNC_LEVEL_0103_3 = 124, /**< LibClamAV release 0.103.2 */ FUNC_LEVEL_0103_3 = 124, /**< LibClamAV release 0.103.2 */
FUNC_LEVEL_0104 = 140, /**< LibClamAV release 0.104.0 */ FUNC_LEVEL_0104 = 140, /**< LibClamAV release 0.104.0 */
FUNC_LEVEL_0105 = 150, /**< LibClamAV release 0.105.0 */
}; };
/** /**

View file

@ -72,7 +72,7 @@
* in re-enabling affected modules. * in re-enabling affected modules.
*/ */
#define CL_FLEVEL 140 #define CL_FLEVEL 150
#define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_DCONF CL_FLEVEL
#define CL_FLEVEL_SIGTOOL CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL
@ -996,7 +996,7 @@ const char *cli_strerror(int errnum, char *buf, size_t len);
#ifdef _WIN32 #ifdef _WIN32
/** /**
* @brief Attempt to get a filename from an open file handle. * @brief Attempt to get a filename from an open file handle.
* *
* Windows only. * Windows only.
* *
* @param hFile File handle * @param hFile File handle

View file

@ -6,8 +6,8 @@
#define REPO_VERSION VERSION #define REPO_VERSION VERSION
#endif #endif
#define RES_VER_Q 0,104,0,0 #define RES_VER_Q 0,105,0,0
#define RES_VER_S "ClamAV 0.104.0" #define RES_VER_S "ClamAV 0.105.0"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION RES_VER_Q FILEVERSION RES_VER_Q