diff --git a/recipes/libarchive/all/conandata.yml b/recipes/libarchive/all/conandata.yml
index 77a39a634029a..01c85d94ab821 100644
--- a/recipes/libarchive/all/conandata.yml
+++ b/recipes/libarchive/all/conandata.yml
@@ -8,27 +8,6 @@ sources:
   "3.7.1":
     url: "https://github.com/libarchive/libarchive/releases/download/v3.7.1/libarchive-3.7.1.tar.xz"
     sha256: "b17403ce670ff18d8e06fea05a9ea9accf70678c88f1b9392a2e29b51127895f"
-  "3.6.2":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.6.2/libarchive-3.6.2.tar.xz"
-    sha256: "9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d"
-  "3.6.1":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.6.1/libarchive-3.6.1.tar.xz"
-    sha256: "5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6"
-  "3.6.0":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.6.0/libarchive-3.6.0.tar.xz"
-    sha256: "df283917799cb88659a5b33c0a598f04352d61936abcd8a48fe7b64e74950de7"
-  "3.5.2":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.5.2/libarchive-3.5.2.tar.xz"
-    sha256: "f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0"
-  "3.5.1":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.5.1/libarchive-3.5.1.tar.xz"
-    sha256: "0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b"
-  "3.4.3":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.4.3/libarchive-3.4.3.tar.xz"
-    sha256: "0bfc3fd40491768a88af8d9b86bf04a9e95b6d41a94f9292dbc0ec342288c05f"
-  "3.4.0":
-    url: "https://github.com/libarchive/libarchive/releases/download/v3.4.0/libarchive-3.4.0.tar.gz"
-    sha256: "8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e"
 patches:
   "3.7.3":
     - patch_file: "patches/0001-3.7.3-zlib-winapi.patch"
@@ -73,67 +52,3 @@ patches:
     - patch_file: "patches/0006-3.7.1-fix-msvc-build.patch"
       patch_description: "Fix MSVC build"
       patch_type: "conan"
-  "3.6.2":
-    - patch_file: "patches/0001-3.6.2-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.6.2-cmake.patch"
-      patch_description: "Make CMake build-system compatible with Conan"
-      patch_type: "conan"
-    - patch_file: "patches/0005-3.6.2-try-compile-cmakedeps.patch"
-      patch_description: "Patch try_compile check to work with imported CMake targets from Conan packages"
-      patch_type: "conan"
-    - patch_file: "patches/0006-3.6.2-fix-msvc-build.patch"
-      patch_description: "Fix MSVC build"
-      patch_type: "conan"
-  "3.6.1":
-    - patch_file: "patches/0001-3.6.0-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.6.0-cmake.patch"
-      patch_description: "Make CMake build-system compatible with Conan"
-      patch_type: "conan"
-    - patch_file: "patches/0004-3.6.0-android.patch"
-      patch_description: "Add missing include directory for Android"
-      patch_type: "portability"
-  "3.6.0":
-    - patch_file: "patches/0001-3.6.0-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.6.0-cmake.patch"
-      patch_description: "Make CMake cooperate with Conan"
-      patch_type: "conan"
-    - patch_file: "patches/0004-3.6.0-android.patch"
-      patch_description: "Add missing include directory for Android"
-      patch_type: "portability"
-  "3.5.2":
-    - patch_file: "patches/0001-3.4.3-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.5.2-cmake.patch"
-      patch_description: "Make CMake cooperate with Conan"
-      patch_type: "conan"
-  "3.5.1":
-    - patch_file: "patches/0001-3.4.3-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.5.1-cmake.patch"
-      patch_description: "Make CMake cooperate with Conan"
-      patch_type: "conan"
-  "3.4.3":
-    - patch_file: "patches/0001-3.4.3-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.4.3-cmake.patch"
-      patch_description: "Make CMake cooperate with Conan"
-      patch_type: "conan"
-  "3.4.0":
-    - patch_file: "patches/0001-3.4.0-zlib-winapi.patch"
-      patch_description: "Remove broken ZLIB WINAPI check"
-      patch_type: "portability"
-    - patch_file: "patches/0002-3.4.0-msvc-no-we4061.patch"
-      patch_description: "Remove MSVC compiler warning e4061"
-      patch_type: "portability"
-    - patch_file: "patches/0003-3.4.0-cmake.patch"
-      patch_description: "Make CMake cooperate with Conan"
-      patch_type: "conan"
diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py
index 6013bc25052c4..f83e7f6e3413d 100644
--- a/recipes/libarchive/all/conanfile.py
+++ b/recipes/libarchive/all/conanfile.py
@@ -69,8 +69,6 @@ def export_sources(self):
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
-        if Version(self.version) < "3.4.2":
-            del self.options.with_mbedtls
         if Version(self.version) < "3.7.3":
             del self.options.with_pcre2
 
@@ -89,9 +87,9 @@ def requirements(self):
         if self.options.with_bzip2:
             self.requires("bzip2/1.0.8")
         if self.options.with_libxml2:
-            self.requires("libxml2/2.12.3")
+            self.requires("libxml2/2.12.5")
         if self.options.with_expat:
-            self.requires("expat/2.5.0")
+            self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_iconv:
             self.requires("libiconv/1.17")
         if self.options.with_pcreposix:
@@ -158,8 +156,7 @@ def generate(self):
         tc.variables["ENABLE_UNZIP"] = False
         # too strict check
         tc.variables["ENABLE_WERROR"] = False
-        if Version(self.version) >= "3.4.2":
-            tc.variables["ENABLE_MBEDTLS"] = self.options.with_mbedtls
+        tc.variables["ENABLE_MBEDTLS"] = self.options.with_mbedtls
         if Version(self.version) >= "3.7.3":
             tc.variables["ENABLE_PCRE2POSIX"] = self.options.with_pcre2
         tc.variables["ENABLE_XATTR"] = self.options.with_xattr
diff --git a/recipes/libarchive/all/patches/0001-3.4.0-zlib-winapi.patch b/recipes/libarchive/all/patches/0001-3.4.0-zlib-winapi.patch
deleted file mode 100644
index 5acce6e86c2cd..0000000000000
--- a/recipes/libarchive/all/patches/0001-3.4.0-zlib-winapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4fd93d04..922efd15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -415,14 +415,7 @@ IF(ZLIB_FOUND)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-   IF(WIN32 AND NOT CYGWIN)
--    #
--    # Test if ZLIB_WINAPI macro is needed to use.
--    #
--    TRY_MACRO_FOR_LIBRARY(
--      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
--      RUNS
--      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
--      ZLIB_WINAPI)
-+    set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-       ADD_DEFINITIONS(-DZLIB_WINAPI)
-     ELSE(ZLIB_WINAPI)
diff --git a/recipes/libarchive/all/patches/0001-3.4.3-zlib-winapi.patch b/recipes/libarchive/all/patches/0001-3.4.3-zlib-winapi.patch
deleted file mode 100644
index b0d70de9dec3b..0000000000000
--- a/recipes/libarchive/all/patches/0001-3.4.3-zlib-winapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6b00410c..e0359b51 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -420,14 +420,7 @@ IF(ZLIB_FOUND)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-   IF(WIN32 AND NOT CYGWIN)
--    #
--    # Test if ZLIB_WINAPI macro is needed to use.
--    #
--    TRY_MACRO_FOR_LIBRARY(
--      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
--      RUNS
--      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
--      ZLIB_WINAPI)
-+    set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-       ADD_DEFINITIONS(-DZLIB_WINAPI)
-     ELSE(ZLIB_WINAPI)
diff --git a/recipes/libarchive/all/patches/0001-3.6.0-zlib-winapi.patch b/recipes/libarchive/all/patches/0001-3.6.0-zlib-winapi.patch
deleted file mode 100644
index dceed2848f701..0000000000000
--- a/recipes/libarchive/all/patches/0001-3.6.0-zlib-winapi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a0d300a..646e5ce7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -426,14 +426,7 @@ IF(ZLIB_FOUND)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-   IF(WIN32 AND NOT CYGWIN)
--    #
--    # Test if ZLIB_WINAPI macro is needed to use.
--    #
--    TRY_MACRO_FOR_LIBRARY(
--      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
--      RUNS
--      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
--      ZLIB_WINAPI)
-+    set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-       ADD_DEFINITIONS(-DZLIB_WINAPI)
-     ELSE(ZLIB_WINAPI)
diff --git a/recipes/libarchive/all/patches/0001-3.6.2-zlib-winapi.patch b/recipes/libarchive/all/patches/0001-3.6.2-zlib-winapi.patch
deleted file mode 100644
index 9e88323972df9..0000000000000
--- a/recipes/libarchive/all/patches/0001-3.6.2-zlib-winapi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 713e3bc..2315da5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -430,14 +430,14 @@ IF(ZLIB_FOUND)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-   IF(WIN32 AND NOT CYGWIN)
--    #
--    # Test if ZLIB_WINAPI macro is needed to use.
--    #
--    TRY_MACRO_FOR_LIBRARY(
--      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
--      RUNS
--      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
--      ZLIB_WINAPI)
-+
-+
-+
-+
-+
-+
-+
-+    set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-       ADD_DEFINITIONS(-DZLIB_WINAPI)
-     ELSE(ZLIB_WINAPI)
diff --git a/recipes/libarchive/all/patches/0002-3.4.0-msvc-no-we4061.patch b/recipes/libarchive/all/patches/0002-3.4.0-msvc-no-we4061.patch
deleted file mode 100644
index ff6f218ef3e36..0000000000000
--- a/recipes/libarchive/all/patches/0002-3.4.0-msvc-no-we4061.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 922efd15..4ffd0930 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,7 +157,6 @@ IF (MSVC)
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-   # Enable level 4 C4061: The enumerate has no associated handler in a switch
-   #                       statement.
--  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061")
-   # Enable level 4 C4254: A larger bit field was assigned to a smaller bit
-   #                       field.
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254")
diff --git a/recipes/libarchive/all/patches/0003-3.4.0-cmake.patch b/recipes/libarchive/all/patches/0003-3.4.0-cmake.patch
deleted file mode 100644
index 7b34085f1a3a2..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.4.0-cmake.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ffd0930..01e8592c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -412,7 +412,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
-     set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-@@ -474,7 +474,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -491,7 +491,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -561,7 +561,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -757,7 +757,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-@@ -1316,7 +1316,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1348,11 +1348,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1364,10 +1364,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index ec775bb4..8ef2d620 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -235,11 +235,15 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- ENDIF()
- 
- # Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
-+
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
-+else()
-+
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -249,13 +253,21 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
-+endif()
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  if (BUILD_SHARED_LIBS)
-+  INSTALL(TARGETS archive
-+          RUNTIME DESTINATION bin
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  else()
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0003-3.4.3-cmake.patch b/recipes/libarchive/all/patches/0003-3.4.3-cmake.patch
deleted file mode 100644
index 45a9561474f8e..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.4.3-cmake.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6013d9e6..125b1cb3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -418,7 +418,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
-     set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-@@ -480,7 +480,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -497,7 +497,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -567,7 +567,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -783,7 +783,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-@@ -1349,7 +1349,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1371,6 +1371,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(strchr HAVE_STRCHR)
- CHECK_FUNCTION_EXISTS_GLIBC(strdup HAVE_STRDUP)
- CHECK_FUNCTION_EXISTS_GLIBC(strerror HAVE_STRERROR)
- CHECK_FUNCTION_EXISTS_GLIBC(strncpy_s HAVE_STRNCPY_S)
-+CHECK_FUNCTION_EXISTS_GLIBC(strnlen HAVE_STRNLEN)
- CHECK_FUNCTION_EXISTS_GLIBC(strrchr HAVE_STRRCHR)
- CHECK_FUNCTION_EXISTS_GLIBC(symlink HAVE_SYMLINK)
- CHECK_FUNCTION_EXISTS_GLIBC(timegm HAVE_TIMEGM)
-@@ -1381,11 +1382,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1398,10 +1399,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index 9389bbc9..76e0b5c7 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -236,11 +236,15 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- ENDIF()
- 
- # Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
-+
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
-+else()
-+
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -250,13 +254,21 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
-+endif()
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  if (BUILD_SHARED_LIBS)
-+  INSTALL(TARGETS archive
-+          RUNTIME DESTINATION bin
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  else()
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0003-3.5.1-cmake.patch b/recipes/libarchive/all/patches/0003-3.5.1-cmake.patch
deleted file mode 100644
index 181a183093fc3..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.5.1-cmake.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 256b966e..30c42967 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -418,7 +418,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
-     set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-@@ -480,7 +480,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -497,7 +497,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -567,7 +567,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -783,7 +783,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-@@ -1349,7 +1349,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1382,11 +1382,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1399,10 +1399,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index 9389bbc9..76e0b5c7 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -236,11 +236,15 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- ENDIF()
- 
- # Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
-+
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
-+else()
-+
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -250,13 +254,21 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
-+endif()
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  if (BUILD_SHARED_LIBS)
-+  INSTALL(TARGETS archive
-+          RUNTIME DESTINATION bin
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  else()
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0003-3.5.2-cmake.patch b/recipes/libarchive/all/patches/0003-3.5.2-cmake.patch
deleted file mode 100644
index 46955b7f8f7ce..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.5.2-cmake.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0359b51..3927a742 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -418,7 +418,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
-     set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-@@ -480,7 +480,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -497,7 +497,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -567,7 +567,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -783,7 +783,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-@@ -1350,7 +1350,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1383,11 +1383,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1400,10 +1400,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index e1d76a51..792b26b3 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -238,11 +238,15 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- ENDIF()
- 
- # Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
-+
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
-+else()
-+
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -252,13 +256,21 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
-+endif()
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  if (BUILD_SHARED_LIBS)
-+  INSTALL(TARGETS archive
-+          RUNTIME DESTINATION bin
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  else()
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0003-3.6.0-cmake.patch b/recipes/libarchive/all/patches/0003-3.6.0-cmake.patch
deleted file mode 100644
index 3c89010df2aba..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.6.0-cmake.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 646e5ce7..9bca273f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,7 +9,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -424,7 +424,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
-     set(ZLIB_WINAPI yes)
-     IF(ZLIB_WINAPI)
-@@ -486,7 +486,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -503,7 +503,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -573,7 +573,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -790,7 +790,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-@@ -1357,7 +1357,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1390,11 +1390,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1407,10 +1407,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index e1d76a51..713c6496 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -5,6 +5,10 @@
- #
- ############################################
- 
-+if (ANDROID)
-+    include_directories(${PROJECT_SOURCE_DIR}/contrib/android/include)
-+endif()
-+
- # Public headers
- SET(include_HEADERS
-   archive.h
-@@ -238,11 +242,15 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
- ENDIF()
- 
- # Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
-+
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
-+else()
-+
- # archive_static is a static library
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
-@@ -252,13 +260,21 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
-+endif()
- 
- IF(ENABLE_INSTALL)
-   # How to install the libraries
--  INSTALL(TARGETS archive archive_static
-+  if (BUILD_SHARED_LIBS)
-+  INSTALL(TARGETS archive
-+          RUNTIME DESTINATION bin
-+          LIBRARY DESTINATION lib
-+          ARCHIVE DESTINATION lib)
-+  else()
-+  INSTALL(TARGETS archive_static
-           RUNTIME DESTINATION bin
-           LIBRARY DESTINATION lib
-           ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0003-3.6.2-cmake.patch b/recipes/libarchive/all/patches/0003-3.6.2-cmake.patch
deleted file mode 100644
index aca2961950d2d..0000000000000
--- a/recipes/libarchive/all/patches/0003-3.6.2-cmake.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4a9284a..f5dbccac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,7 +9,7 @@ endif()
- #
- PROJECT(libarchive C)
- #
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)
- endif()
-@@ -428,7 +428,7 @@ IF(ZLIB_FOUND)
-   SET(HAVE_LIBZ 1)
-   SET(HAVE_ZLIB_H 1)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
--  LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+  LIST(APPEND ADDITIONAL_LIBS ZLIB::ZLIB)
-   IF(WIN32 AND NOT CYGWIN)
- 
- 
-@@ -497,7 +497,7 @@ IF(LIBLZMA_FOUND)
-   SET(HAVE_LIBLZMA 1)
-   SET(HAVE_LZMA_H 1)
-   CMAKE_PUSH_CHECK_STATE()
--  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
-+  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIRS})
-   SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
-   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
-   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
-@@ -514,7 +514,7 @@ IF(LIBLZMA_FOUND)
- ELSE(LIBLZMA_FOUND)
- # LZMA not found and will not be used.
- ENDIF(LIBLZMA_FOUND)
--MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
-+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
- MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
- 
- #
-@@ -584,7 +584,7 @@ IF(ENABLE_LZ4)
-   ENDIF (LZ4_INCLUDE_DIR)
- 
-   FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
--  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-+  FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4 lz4_static liblz4_static)
-   INCLUDE(FindPackageHandleStandardArgs)
-   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
- ELSE(ENABLE_LZ4)
-@@ -806,7 +806,7 @@ ENDIF(ENABLE_NETTLE)
- # Find OpenSSL
- # (Except on Mac, where OpenSSL is deprecated.)
- #
--IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
-+IF(ENABLE_OPENSSL)
-   FIND_PACKAGE(OpenSSL)
-   IF(OPENSSL_FOUND)
-     SET(HAVE_LIBCRYPTO 1)
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index ff7ade00..8c867130 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -242,13 +242,13 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
- ENDIF()
- 
--# Libarchive is a shared library
-+if (BUILD_SHARED_LIBS)
- ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
- TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
- 
--# archive_static is a static library
-+else()
- ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
- TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
- SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
-@@ -257,13 +257,13 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
- IF(NOT WIN32 OR CYGWIN)
-   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
- ENDIF(NOT WIN32 OR CYGWIN)
--
-+endif()
- IF(ENABLE_INSTALL)
--  # How to install the libraries
--  INSTALL(TARGETS archive archive_static
--          RUNTIME DESTINATION bin
--          LIBRARY DESTINATION lib
--          ARCHIVE DESTINATION lib)
-+  if (BUILD_SHARED_LIBS)
-+    INSTALL(TARGETS archive RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+  else()
-+    INSTALL(TARGETS archive_static RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+  endif()
-   INSTALL_MAN(${libarchive_MANS})
-   INSTALL(FILES ${include_HEADERS} DESTINATION include)
- ENDIF()
diff --git a/recipes/libarchive/all/patches/0004-3.6.0-android.patch b/recipes/libarchive/all/patches/0004-3.6.0-android.patch
deleted file mode 100644
index c4c91d3ecb18a..0000000000000
--- a/recipes/libarchive/all/patches/0004-3.6.0-android.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index 792b26b3..713c6496 100644
---- a/libarchive/CMakeLists.txt
-+++ b/libarchive/CMakeLists.txt
-@@ -5,6 +5,10 @@
- #
- ############################################
- 
-+if (ANDROID)
-+    include_directories(${PROJECT_SOURCE_DIR}/contrib/android/include)
-+endif()
-+
- # Public headers
- SET(include_HEADERS
-   archive.h
diff --git a/recipes/libarchive/all/patches/0005-3.6.2-try-compile-cmakedeps.patch b/recipes/libarchive/all/patches/0005-3.6.2-try-compile-cmakedeps.patch
deleted file mode 100644
index 69e42f1f5678b..0000000000000
--- a/recipes/libarchive/all/patches/0005-3.6.2-try-compile-cmakedeps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5dbccac..ea7ff16a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -830,12 +830,11 @@ IF(NOT OPENSSL_FOUND)
- ENDIF(NOT OPENSSL_FOUND)
- 
- #
--# How to prove that CRYPTO functions, which have several names on various
--# platforms, just see if archive_digest.c can compile and link against
--# required libraries.
- #
- MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
--    FOREACH(ALGORITHM ${ALGORITHMS})
-+    FOREACH(ALGORITHM ${ALGORITHMS}) 
-+      include(CMakePushCheckState)
-+      cmake_push_check_state()
-       IF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
-       STRING(TOLOWER "${ALGORITHM}" lower_algorithm)
-       STRING(TOUPPER "${ALGORITHM}" algorithm)
-@@ -856,8 +855,8 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
- 	IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
- 	    SET(TRY_CRYPTO_REQUIRED_INCLUDES
- 	      "${TRY_CRYPTO_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
--	    SET(TRY_CRYPTO_REQUIRED_LIBS
--	        "-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}")
-+       set(CMAKE_REQUIRED_LIBRARIES
-+               ${OPENSSL_LIBRARIES})
- 	ELSEIF("${IMPLEMENTATION}" MATCHES "^MBEDTLS$" AND MBEDTLS_FOUND)
- 	    SET(TRY_CRYPTO_REQUIRED_INCLUDES
- 	      "${TRY_CRYPTO_REQUIRED_INCLUDES};${MBEDTLS_INCLUDE_DIRS}")
-@@ -934,6 +933,7 @@ main(int argc, char **argv)
-         ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
-       ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
-       ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
-+      cmake_pop_check_state()
-     ENDFOREACH(ALGORITHM ${ALGORITHMS})
- ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
- 
diff --git a/recipes/libarchive/all/patches/0006-3.6.2-fix-msvc-build.patch b/recipes/libarchive/all/patches/0006-3.6.2-fix-msvc-build.patch
deleted file mode 100644
index c0903cf80cf94..0000000000000
--- a/recipes/libarchive/all/patches/0006-3.6.2-fix-msvc-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 713e3bc5..9bc36214 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1374,7 +1374,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
- CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
- CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
--CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+set(HAVE_MEMMOVE 1)
- CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
- CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
- CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1407,11 +1407,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
- CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
- CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
- CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
--CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
--CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
--CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
--CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+set(HAVE_WCRTOMB 1)
-+set(HAVE_WCSCMP 1)
-+set(HAVE_WCSCPY 1)
-+set(HAVE_WCSLEN 1)
-+set(HAVE_WCTOMB 1)
- CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
- CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
- CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1424,10 +1424,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
- CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
- CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
- CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
--CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
--CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
--CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
--CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+set(HAVE_VPRINTF 1)
-+set(HAVE_WMEMCMP 1)
-+set(HAVE_WMEMCPY 1)
-+set(HAVE_WMEMMOVE 1)
- 
- CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
- 
--- 
-2.33.0.windows.1
-
diff --git a/recipes/libarchive/config.yml b/recipes/libarchive/config.yml
index 628dfea5b0312..c448b0fce710b 100644
--- a/recipes/libarchive/config.yml
+++ b/recipes/libarchive/config.yml
@@ -5,17 +5,3 @@ versions:
     folder: all
   "3.7.1":
     folder: all
-  "3.6.2":
-    folder: all
-  "3.6.1":
-    folder: all
-  "3.6.0":
-    folder: all
-  "3.5.2":
-    folder: all
-  "3.5.1":
-    folder: all
-  "3.4.3":
-    folder: all
-  "3.4.0":
-    folder: all