Merge branch 'fix/allow-inline-comments' of https://github.com/userwi…

…ths/clamav into fix/allow-inline-comments

.github/workflows/clang-format.yml

@@ -56,9 +56,9 @@ jobs:
           - check: "win32/compat"
             exclude: ""
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run clang-format style check for C/C++ programs.
-        uses: jidicula/clang-format-action@v4.4.1
+        uses: jidicula/clang-format-action@v4.13.0
         with:
           clang-format-version: "16"
           check-path: ${{ matrix.path['check'] }}

.github/workflows/cmake.yml

@@ -29,17 +29,17 @@ jobs:
         run: rm /usr/bin/link.exe
         shell: bash
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install Build Tools
-        uses: crazy-max/ghaction-chocolatey@v1
+        uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: install wixtoolset
 
       - name: Install pytest for easier to read test results
         run: python3 -m pip install pytest
 
-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0
 
       # Restore from cache the previously built ports. If cache-miss, download, build vcpkg ports.
       - name: Restore vcpkg ports from cache or install vcpkg
@@ -91,7 +91,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install Build Tools
         run: brew install bison flex pipx
@@ -102,7 +102,7 @@ jobs:
       - name: Install pytest for easier to read test results
         run: pipx install pytest
 
-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0
 
       - name: Create Build Directory
         shell: bash
@@ -142,7 +142,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Update package listings
         run: sudo apt-get update
@@ -156,7 +156,7 @@ jobs:
       - name: Install pytest for easier to read test results
         run: pipx install pytest
 
-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0
 
       - name: Create Build Directory
         shell: bash

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 "-rc")
+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})
@@ -36,9 +36,9 @@ set(PACKAGE_URL       "https://www.clamav.net/")
 HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH})
 
 # libtool library versioning rules: http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(LIBCLAMAV_CURRENT  13)
-set(LIBCLAMAV_REVISION 0)
-set(LIBCLAMAV_AGE      1)
+set(LIBCLAMAV_CURRENT  12)
+set(LIBCLAMAV_REVISION 3)
+set(LIBCLAMAV_AGE      0)
 
 math(EXPR LIBCLAMAV_SOVERSION "${LIBCLAMAV_CURRENT} - ${LIBCLAMAV_AGE}")
 set(LIBCLAMAV_VERSION "${LIBCLAMAV_SOVERSION}.${LIBCLAMAV_AGE}.${LIBCLAMAV_REVISION}")
@@ -61,6 +61,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(C_LINUX 1)
 elseif(APPLE OR CMAKE_SYSTEM_NAME MATCHES "BSD")
     set(C_BSD 1)
+elseif(CMAKE_SYSTEM_NAME MATCHES "AIX")
+    set(AIX TRUE)
 endif()
 
 # Git optionally used to add commit info into build to differentiate in bug reports.

INSTALL.md

@@ -642,7 +642,7 @@ Options for a custom LLVM install path, or to select a specific version if you
 have multiple LLVM installations:
 ```sh
   -D LLVM_ROOT_DIR="_path to llvm install root_"
-  -D LLVM_FIND_VERSION="3.6.0"
+  -D LLVM_FIND_VERSION="8.0.1"
 ```
 
 ### `libcurl`
@@ -688,8 +688,7 @@ ClamAV has two bytecode runtimes:
    execution should be faster. Not all scans will run bytecode signatures, so
    performance testing will depend heavily depending on what files are tested.
 
-   We ran out of time in 0.104 development to update to support newer versions
-   of LLVM. LLVM 3.6.2 is the newest version supported in ClamAV 0.104.
+   We can work with LLVM 8.0 to 13.x. 
 
 #### Interpreter Bytecode Runtime
 
@@ -704,7 +703,7 @@ cmake .. -D BYTECODE_RUNTIME="interpreter"
 
 If you wish to build using LLVM JIT for the bytecode runtime instead of the
 bytecode interpreter, you will need to install the LLVM development libraries.
-ClamAV currently supports LLVM versions 8.0 through 12.0.
+ClamAV currently supports LLVM versions 8.0 through 13.x.
 
 To build with LLVM for the bytecode runtime, build with this option:
 ```sh