Merge branch 'Cisco-Talos:main' into feature/fips-140-3-compliance

Cisco-Talos · Aug 29, 2024 · bc057fe · bc057fe
2 parents e6d93ef + 94a8917
commit bc057fe
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git 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.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})

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -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',
@@ -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',

diff --git a/NEWS.md b/NEWS.md
@@ -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:

diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h
@@ -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 */
 };
 
 /**

diff --git a/libclamav/others.h b/libclamav/others.h
@@ -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
 

diff --git a/unit_tests/freshclam_test.py b/unit_tests/freshclam_test.py
@@ -10,14 +10,10 @@
 from pathlib import Path
 import platform
 import shutil
-import subprocess
-import sys
-import time
 import unittest
 from functools import partial
 
 from http.server import HTTPServer, BaseHTTPRequestHandler
-import cgi
 
 import testcase
-Original file 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 @@