4 files changed, 29 insertions, 11 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index f4f9b8cdd..dfcfa66b3 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,4 +1,4 @@
 Source: libarchive
-Version: 3.3.1-1
+Version: 3.3.2-2
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch
index fcfe67c4f..59ffec3c9 100644
--- a/ports/libarchive/fix-buildsystem.patch
+++ b/ports/libarchive/fix-buildsystem.patch
@@ -132,8 +132,8 @@ index 1f85c01..11b2fb1 100644
 --- a/libarchive/CMakeLists.txt
 +++ b/libarchive/CMakeLists.txt
 @@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN)
-   LIST(APPEND libarchive_SOURCES filter_fork_windows.c)
- ENDIF(WIN32 AND NOT CYGWIN)
+   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
+ ENDIF()
  
 -# Libarchive is a shared library
 -ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch
new file mode 100644
index 000000000..6a3d974fc
--- /dev/null
+++ b/ports/libarchive/fix-lz4.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73bf07b3..76a1d61d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -515,7 +515,10 @@ IF (LZ4_INCLUDE_DIR)
+ ENDIF (LZ4_INCLUDE_DIR)
+
+ FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
+-FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
++FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d)
++FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4)
++INCLUDE(SelectLibraryConfigurations)
++SELECT_LIBRARY_CONFIGURATIONS(LZ4)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+ IF(LZ4_FOUND)
+
+ 
+\ No newline at end of file
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index 72958dfda..d361b7da8 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -4,19 +4,19 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
 endif()
 
 include(vcpkg_common_functions)
-set(ARCHIVE_VERSION 3.3.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libarchive-${ARCHIVE_VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/libarchive/libarchive/archive/v${ARCHIVE_VERSION}.zip"
-    FILENAME "libarchive-${ARCHIVE_VERSION}.zip"
-    SHA512 a54fe3c5c24c83df244f3f2346212a6aa8d8945cf4ddc407e54c891ebbf8c98b93492e5652c9813a6d5dc654a32479e08a40bb0d2af7400a29ac027028e986f5)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libarchive/libarchive
+    REF v3.3.2
+    SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
+    HEAD_REF master)
 
-vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch)
+        ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}