clamav: upgrade to 1.0.6 (#8850)

Co-authored-by: Betty Lakes <bettylakes@microsoft.com>

SPECS/clamav/clamav.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "clamav-0.105.2.tar.gz": "3827f6f22c08a83c52cd29f3562d780af6db65e825b0e0969608061209a90aa5",
-  "clamav-clamav-0.105.2-cargo-rev2.tar.gz": "08f7b90bb8662ae1acc4a78f6688d8e03d62d4a8db913d6c896ba5b30a74791b"
+  "clamav-1.0.6.tar.gz": "7a9691525bd150f9419c337d25d8c28402ed35beea7aa19563aabcddc248de52",
+  "clamav-1.0.6-cargo.tar.gz": "20b6179033c32ad81023ccc4a4262730d10fa80cd7ae678b386f139305b1e31f"
  }
 }

SPECS/clamav/clamav.spec

@@ -1,7 +1,7 @@
 Summary:        Open source antivirus engine
 Name:           clamav
-Version:        0.105.2
-Release:        5%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 License:        ASL 2.0 AND BSD AND bzip2-1.0.4 AND GPLv2 AND LGPLv2+ AND MIT AND Public Domain AND UnRar
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -14,8 +14,7 @@ Source0:        https://github.com/Cisco-Talos/clamav/archive/refs/tags/%{name}-
 
 # Note: Required an updated cargo cache when rust was updated to 1.72.0, added "-rev2" to the filename to indicate the new cache for this
 # specific event. Revert back to the original filename when a new cache is created for a different version.
-Source1:        %{name}-%{name}-%{version}-cargo-rev2.tar.gz
-Patch0:         CVE-2022-48579.patch
+Source1:        %{name}-%{version}-cargo.tar.gz
 BuildRequires:  bzip2-devel
 BuildRequires:  check-devel
 BuildRequires:  cmake
@@ -35,6 +34,7 @@ BuildRequires:  python3-pytest
 BuildRequires:  rust
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  valgrind
 BuildRequires:  zlib-devel
 Requires:       openssl
@@ -56,7 +56,7 @@ mkdir -p $HOME
 pushd $HOME
 tar xf %{SOURCE1} --no-same-owner
 popd
-%autosetup -p1 -n clamav-clamav-%{version}
+%autosetup -n clamav-clamav-%{version}
 
 %build
 export CARGO_NET_OFFLINE=true
@@ -77,11 +77,10 @@ cmake \
     -D ENABLE_SYSTEMD=ON \
     -D ENABLE_MILTER=OFF \
     -D ENABLE_EXAMPLES=OFF
-%cmake_build
+%cmake3_build
 
 %check
-cd build
-ctest --verbose
+%ctest3 -- -E valgrind
 
 %install
 %cmake_install
@@ -137,6 +136,9 @@ fi
 %dir %attr(-,clamav,clamav) %{_sharedstatedir}/clamav
 
 %changelog
+* Thu Apr 18 2024 Betty Lakes <bettylakes@microsoft.com> - 1.0.6-1
+- Upgrade to version 1.0.6
+
 * Wed Apr 17 2024 Andrew Phelps <anphel@microsoft.com> - 0.105.2-5
 - Fix build break by adding BR for systemd
 

cgmanifest.json

@@ -1747,8 +1747,8 @@
         "type": "other",
         "other": {
           "name": "clamav",
-          "version": "0.105.2",
-          "downloadUrl": "https://github.com/Cisco-Talos/clamav/archive/refs/tags/clamav-0.105.2.tar.gz"
+          "version": "1.0.6",
+          "downloadUrl": "https://github.com/Cisco-Talos/clamav/archive/refs/tags/clamav-1.0.6.tar.gz"
         }
       }
     },