[clamav] Fix the conflicts with libmspack (#17168)

* [clamav] Fix the conflicts with libmspack

* Update versions

6 files changed, 70 insertions, 7 deletions

diff --git a/ports/clamav/CONTROL b/ports/clamav/CONTROL
deleted file mode 100644
index 3646e75cc..000000000
--- a/ports/clamav/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: clamav
-Version: 0.103.0
-Homepage: https://www.clamav.net
-Description: ClamAV is an open-source anti-virus toolkit.
-Build-Depends: openssl, json-c, libxml2, pcre2, pthreads, zlib, bzip2
-Supports: !uwp & !static
diff --git a/ports/clamav/mspack.patch b/ports/clamav/mspack.patch
new file mode 100644
index 000000000..567788763
--- /dev/null
+++ b/ports/clamav/mspack.patch
@@ -0,0 +1,44 @@
+diff --git a/cmake/FindMSPack.cmake b/cmake/FindMSPack.cmake
+index cad448f..4ce4f87 100644
+--- a/cmake/FindMSPack.cmake
++++ b/cmake/FindMSPack.cmake
+@@ -50,7 +50,7 @@ find_path(MSPack_INCLUDE_DIR
+   PATH_SUFFIXES mspack
+ )
+ find_library(MSPack_LIBRARY
+-  NAMES mspack
++  NAMES libmspack
+   PATHS ${PC_MSPack_LIBRARY_DIRS}
+ )
+ 
+diff --git a/libclamav/CMakeLists.txt b/libclamav/CMakeLists.txt
+index 136ea30..72db826 100644
+--- a/libclamav/CMakeLists.txt
++++ b/libclamav/CMakeLists.txt
+@@ -504,7 +504,7 @@ target_link_libraries( clamav_obj
+         yara
+         tomsfastmath
+         bytecode_runtime
+-        ClamAV::libmspack
++        ${MSPack_LIBRARIES}
+         ClamAV::libclamunrar_iface_iface
+         OpenSSL::SSL
+         OpenSSL::Crypto
+@@ -547,7 +547,7 @@ if(ENABLE_SHARED_LIB)
+             yara
+             tomsfastmath
+             bytecode_runtime
+-            ClamAV::libmspack
++            ${MSPack_LIBRARIES}
+             ClamAV::libclamunrar_iface_iface
+             OpenSSL::SSL
+             OpenSSL::Crypto
+@@ -588,7 +588,7 @@ if(ENABLE_STATIC_LIB)
+             yara
+             tomsfastmath
+             bytecode_runtime
+-            ClamAV::libmspack
++            ${MSPack_LIBRARIES}
+             ClamAV::libclamunrar_iface_iface
+             OpenSSL::SSL
+             OpenSSL::Crypto
diff --git a/ports/clamav/portfile.cmake b/ports/clamav/portfile.cmake
index a7a32f90d..2276adafd 100644
--- a/ports/clamav/portfile.cmake
+++ b/ports/clamav/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
       "build.patch"
       "cmakefiles.patch"
       "curl.patch"
+      "mspack.patch"
 )
 
 vcpkg_configure_cmake(
@@ -21,6 +22,7 @@ vcpkg_configure_cmake(
       -DENABLE_DOCS=OFF
       -DENABLE_SHARED_LIB=ON
       -DENABLE_STATIC_LIB=OFF
+      -DENABLE_EXTERNAL_MSPACK=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/clamav/vcpkg.json b/ports/clamav/vcpkg.json
new file mode 100644
index 000000000..12f2b6bc7
--- /dev/null
+++ b/ports/clamav/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "clamav",
+  "version-semver": "0.103.0",
+  "port-version": 1,
+  "description": "ClamAV is an open-source anti-virus toolkit.",
+  "homepage": "https://www.clamav.net",
+  "supports": "!uwp & !static",
+  "dependencies": [
+    "bzip2",
+    "json-c",
+    "libmspack",
+    "libxml2",
+    "openssl",
+    "pcre2",
+    "pthreads",
+    "zlib"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 6501460ab..d8a482880 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1222,7 +1222,7 @@
     },
     "clamav": {
       "baseline": "0.103.0",
-      "port-version": 0
+      "port-version": 1
     },
     "clapack": {
       "baseline": "3.2.1",
diff --git a/versions/c-/clamav.json b/versions/c-/clamav.json
index dc6c236ed..ea2cee24d 100644
--- a/versions/c-/clamav.json
+++ b/versions/c-/clamav.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b6b4287e62ba66791d4f3b1af99f795f7cd8df15",
+      "version-semver": "0.103.0",
+      "port-version": 1
+    },
+    {
       "git-tree": "30eb9215db50ee898f34f2405682017ac2424e58",
       "version-string": "0.103.0",
       "port-version": 0