mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2025-10-19 10:23:17 +00:00
Bump version for 1.6.0-devel; Increase FLEVEL to 240 (#1595)
Also fixup to bytecode_api.h. Notably, I found that the FUNC_LEVEL_1.5 was incorrect. :-/
This commit is contained in:
Val S.
GitHub
parent
83fd7f14fb
commit
36f7c83ea1
5 changed files with 39 additions and 15 deletions
|
|
@ -19,10 +19,10 @@ cmake_policy(SET CMP0087 NEW) # support generator expressions in install(CODE) a
|
|||
# For release candidate: set(VERSION_SUFFIX "-rc")
|
||||
# For release: set(VERSION_SUFFIX "")
|
||||
string(TIMESTAMP TODAY "%Y%m%d")
|
||||
set(VERSION_SUFFIX "")
|
||||
set(VERSION_SUFFIX "-devel-${TODAY}")
|
||||
|
||||
project( ClamAV
|
||||
VERSION "1.5.0"
|
||||
VERSION "1.6.0"
|
||||
DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." )
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
||||
|
|
|
|||
20
Jenkinsfile
vendored
20
Jenkinsfile
vendored
|
|
@ -10,19 +10,19 @@ properties(
|
|||
parameters(
|
||||
[
|
||||
string(name: 'VERSION',
|
||||
defaultValue: '1.5.0',
|
||||
defaultValue: '1.6.0',
|
||||
description: 'ClamAV version string'),
|
||||
string(name: 'FRAMEWORK_BRANCH',
|
||||
defaultValue: '1.5',
|
||||
defaultValue: '1.6',
|
||||
description: 'test-framework branch'),
|
||||
string(name: 'TESTS_BRANCH',
|
||||
defaultValue: '1.5',
|
||||
defaultValue: '1.6',
|
||||
description: 'tests branch for the package and regular tests'),
|
||||
string(name: 'TESTS_CUSTOM_BRANCH',
|
||||
defaultValue: '1.5',
|
||||
defaultValue: '1.6',
|
||||
description: 'tests-custom branch'),
|
||||
string(name: 'TESTS_FUZZ_BRANCH',
|
||||
defaultValue: '1.5',
|
||||
defaultValue: '1.6',
|
||||
description: 'tests-fuzz-regression branch'),
|
||||
string(name: 'BUILD_PIPELINES_PATH',
|
||||
defaultValue: 'ClamAV/build-pipelines',
|
||||
|
|
@ -31,19 +31,19 @@ properties(
|
|||
defaultValue: 'ClamAV/test-pipelines',
|
||||
description: 'test-pipelines path for clamav in Jenkins'),
|
||||
string(name: 'BUILD_PIPELINE',
|
||||
defaultValue: 'build-1.5',
|
||||
defaultValue: 'build-1.6',
|
||||
description: 'test-pipelines branch for build acceptance'),
|
||||
string(name: 'PACKAGE_PIPELINE',
|
||||
defaultValue: 'package-1.5',
|
||||
defaultValue: 'package-1.6',
|
||||
description: 'test-pipelines branch for package tests.'),
|
||||
string(name: 'REGULAR_PIPELINE',
|
||||
defaultValue: 'regular-1.5',
|
||||
defaultValue: 'regular-1.6',
|
||||
description: 'test-pipelines branch for regular tests.'),
|
||||
string(name: 'CUSTOM_PIPELINE',
|
||||
defaultValue: 'custom-1.5',
|
||||
defaultValue: 'custom-1.6',
|
||||
description: 'test-pipelines branch for custom tests'),
|
||||
string(name: 'FUZZ_PIPELINE',
|
||||
defaultValue: 'fuzz-regression-1.5',
|
||||
defaultValue: 'fuzz-regression-1.6',
|
||||
description: 'test-pipelines branch for fuzz regression tests'),
|
||||
string(name: 'FUZZ_CORPUS_BRANCH',
|
||||
defaultValue: 'master',
|
||||
|
|
|
|||
14
NEWS.md
14
NEWS.md
|
|
@ -3,6 +3,20 @@
|
|||
Note: This file refers to the official packages. Things described here may
|
||||
differ slightly from third-party binary packages.
|
||||
|
||||
## 1.6.0
|
||||
|
||||
ClamAV 1.6.0 includes the following improvements and changes:
|
||||
|
||||
### Major changes
|
||||
|
||||
### Other improvements
|
||||
|
||||
### Bug fixes
|
||||
|
||||
### Acknowledgments
|
||||
|
||||
Special thanks to the following people for code contributions and bug reports:
|
||||
|
||||
## 1.5.0
|
||||
|
||||
ClamAV 1.5.0 includes the following improvements and changes:
|
||||
|
|
|
|||
|
|
@ -157,6 +157,7 @@ enum FunctionalityLevels {
|
|||
FUNC_LEVEL_0103_9 = 130, /**< LibClamAV release 0.103.9 */
|
||||
FUNC_LEVEL_0103_10 = 131, /**< LibClamAV release 0.103.10 */
|
||||
FUNC_LEVEL_0103_11 = 132, /**< LibClamAV release 0.103.11 */
|
||||
FUNC_LEVEL_0103_12 = 133, /**< LibClamAV release 0.103.12 */
|
||||
|
||||
FUNC_LEVEL_0104 = 140, /**< LibClamAV release 0.104.0 */
|
||||
FUNC_LEVEL_0104_1 = 141, /**< LibClamAV release 0.104.1 */
|
||||
|
|
@ -175,6 +176,9 @@ enum FunctionalityLevels {
|
|||
FUNC_LEVEL_1_0_4 = 164, /**< LibClamAV release 1.0.4 */
|
||||
FUNC_LEVEL_1_0_5 = 165, /**< LibClamAV release 1.0.5 */
|
||||
FUNC_LEVEL_1_0_6 = 166, /**< LibClamAV release 1.0.6 */
|
||||
FUNC_LEVEL_1_0_7 = 167, /**< LibClamAV release 1.0.7 */
|
||||
FUNC_LEVEL_1_0_8 = 168, /**< LibClamAV release 1.0.8 */
|
||||
FUNC_LEVEL_1_0_9 = 169, /**< LibClamAV release 1.0.9 */
|
||||
|
||||
FUNC_LEVEL_1_1 = 180, /**< LibClamAV release 1.1.0 */
|
||||
FUNC_LEVEL_1_1_1 = 181, /**< LibClamAV release 1.1.1 */
|
||||
|
|
@ -188,10 +192,16 @@ enum FunctionalityLevels {
|
|||
|
||||
FUNC_LEVEL_1_3 = 200, /**< LibClamAV release 1.3.0 */
|
||||
FUNC_LEVEL_1_3_1 = 201, /**< LibClamAV release 1.3.1 */
|
||||
FUNC_LEVEL_1_3_2 = 202, /**< LibClamAV release 1.3.2 */
|
||||
|
||||
FUNC_LEVEL_1_4 = 210, /**< LibClamAV release 1.4.0 */
|
||||
FUNC_LEVEL_1_4 = 210, /**< LibClamAV release 1.4.0 */
|
||||
FUNC_LEVEL_1_4_1 = 211, /**< LibClamAV release 1.4.1 */
|
||||
FUNC_LEVEL_1_4_2 = 212, /**< LibClamAV release 1.4.2 */
|
||||
FUNC_LEVEL_1_4_3 = 213, /**< LibClamAV release 1.4.3 */
|
||||
|
||||
FUNC_LEVEL_1_5 = 220, /**< LibClamAV release 1.5.0 */
|
||||
FUNC_LEVEL_1_5 = 230, /**< LibClamAV release 1.5.0 */
|
||||
|
||||
FUNC_LEVEL_1_6 = 240, /**< LibClamAV release 1.6.0 */
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
* in re-enabling affected modules.
|
||||
*/
|
||||
|
||||
#define CL_FLEVEL 230
|
||||
#define CL_FLEVEL 240
|
||||
#define CL_FLEVEL_DCONF CL_FLEVEL
|
||||
#define CL_FLEVEL_SIGTOOL CL_FLEVEL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue