From 24226f765f6bbfbc81d2ad530f413deb3c8e70c6 Mon Sep 17 00:00:00 2001 From: rsundriyal Date: Mon, 5 Feb 2024 13:40:30 -0500 Subject: [PATCH] Bumped version from 1.3.0 -> 1.4.0-devel for new release changes --- CMakeLists.txt | 4 ++-- Jenkinsfile | 18 +++++++++--------- NEWS.md | 14 ++++++++++++++ libclamav/bytecode_api.h | 2 ++ libclamav/others.h | 2 +- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eefb15ea7f..40494872c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.3.0" + VERSION "1.4.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}) diff --git a/Jenkinsfile b/Jenkinsfile index 5d2c564e16..60a7e67c30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,31 +10,31 @@ properties( parameters( [ string(name: 'VERSION', - defaultValue: '1.3.0', + defaultValue: '1.4.0', description: 'ClamAV version string'), string(name: 'FRAMEWORK_BRANCH', - defaultValue: '1.3', + defaultValue: '1.4', description: 'test-framework branch'), string(name: 'TESTS_BRANCH', - defaultValue: '1.3', + defaultValue: '1.4', description: 'tests branch'), string(name: 'TESTS_CUSTOM_BRANCH', - defaultValue: '1.3', + defaultValue: '1.4', description: 'tests-custom branch'), string(name: 'TESTS_FUZZ_BRANCH', - defaultValue: '1.3', + defaultValue: '1.4', description: 'tests-fuzz-regression branch'), string(name: 'BUILD_PIPELINE', - defaultValue: 'build-1.3', + defaultValue: 'build-1.4', description: 'test-pipelines branch for build acceptance'), string(name: 'REGULAR_PIPELINE', - defaultValue: 'regular-1.3', + defaultValue: 'regular-1.4', description: 'test-pipelines branch for regular tests.'), string(name: 'CUSTOM_PIPELINE', - defaultValue: 'custom-1.3', + defaultValue: 'custom-1.4', description: 'test-pipelines branch for custom tests'), string(name: 'FUZZ_PIPELINE', - defaultValue: 'fuzz-regression-1.3', + defaultValue: 'fuzz-regression-1.4', description: 'test-pipelines branch for fuzz regression tests'), string(name: 'FUZZ_CORPUS_BRANCH', defaultValue: 'master', diff --git a/NEWS.md b/NEWS.md index 15eb18c465..70fa4ecaed 100644 --- a/NEWS.md +++ b/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.4.0 + +ClamAV 1.4.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.3.0 ClamAV 1.3.0 includes the following improvements and changes: diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h index 7c0bb9919f..51f3e360be 100644 --- a/libclamav/bytecode_api.h +++ b/libclamav/bytecode_api.h @@ -182,6 +182,8 @@ enum FunctionalityLevels { FUNC_LEVEL_1_2_2 = 192, /**< LibClamAV release 1.2.2 */ FUNC_LEVEL_1_3 = 200, /**< LibClamAV release 1.3.0 */ + + FUNC_LEVEL_1_4 = 210, /**< LibClamAV release 1.4.0 */ }; /** diff --git a/libclamav/others.h b/libclamav/others.h index 670189af88..8be4f1fd8c 100644 --- a/libclamav/others.h +++ b/libclamav/others.h @@ -73,7 +73,7 @@ * in re-enabling affected modules. */ -#define CL_FLEVEL 200 +#define CL_FLEVEL 210 #define CL_FLEVEL_DCONF CL_FLEVEL #define CL_FLEVEL_SIGTOOL CL_FLEVEL