Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.5.0-devel version changes #1324

Merged
merged 1 commit into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0"
VERSION "1.5.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})
Expand Down
20 changes: 10 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ properties(
parameters(
[
string(name: 'VERSION',
defaultValue: '1.4.0',
defaultValue: '1.5.0',
description: 'ClamAV version string'),
string(name: 'FRAMEWORK_BRANCH',
defaultValue: '1.4',
defaultValue: '1.5',
description: 'test-framework branch'),
string(name: 'TESTS_BRANCH',
defaultValue: '1.4',
defaultValue: '1.5',
description: 'tests branch for the package and regular tests'),
string(name: 'TESTS_CUSTOM_BRANCH',
defaultValue: '1.4',
defaultValue: '1.5',
description: 'tests-custom branch'),
string(name: 'TESTS_FUZZ_BRANCH',
defaultValue: '1.4',
defaultValue: '1.5',
description: 'tests-fuzz-regression branch'),
string(name: 'BUILD_PIPELINES_PATH',
defaultValue: 'ClamAV/build-pipelines',
Expand All @@ -31,19 +31,19 @@ properties(
defaultValue: 'ClamAV/test-pipelines',
description: 'test-pipelines path for clamav in Jenkins'),
string(name: 'BUILD_PIPELINE',
defaultValue: 'build-1.4',
defaultValue: 'build-1.5',
description: 'test-pipelines branch for build acceptance'),
string(name: 'PACKAGE_PIPELINE',
defaultValue: 'package-1.4',
defaultValue: 'package-1.5',
description: 'test-pipelines branch for package tests.'),
string(name: 'REGULAR_PIPELINE',
defaultValue: 'regular-1.4',
defaultValue: 'regular-1.5',
description: 'test-pipelines branch for regular tests.'),
string(name: 'CUSTOM_PIPELINE',
defaultValue: 'custom-1.4',
defaultValue: 'custom-1.5',
description: 'test-pipelines branch for custom tests'),
string(name: 'FUZZ_PIPELINE',
defaultValue: 'fuzz-regression-1.4',
defaultValue: 'fuzz-regression-1.5',
description: 'test-pipelines branch for fuzz regression tests'),
string(name: 'FUZZ_CORPUS_BRANCH',
defaultValue: 'master',
Expand Down
15 changes: 15 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
Note: This file refers to the official packages. Things described here may
differ slightly from third-party binary packages.

## 1.5.0

ClamAV 1.5.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.4.0

ClamAV 1.4.0 includes the following improvements and changes:
Expand Down
2 changes: 2 additions & 0 deletions libclamav/bytecode_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ enum FunctionalityLevels {
FUNC_LEVEL_1_3_1 = 201, /**< LibClamAV release 1.3.1 */

FUNC_LEVEL_1_4 = 210, /**< LibClamAV release 1.4.0 */

FUNC_LEVEL_1_5 = 220, /**< LibClamAV release 1.5.0 */
};

/**
Expand Down
2 changes: 1 addition & 1 deletion libclamav/others.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* in re-enabling affected modules.
*/

#define CL_FLEVEL 210
#define CL_FLEVEL 220
#define CL_FLEVEL_DCONF CL_FLEVEL
#define CL_FLEVEL_SIGTOOL CL_FLEVEL

Expand Down
Loading