libarchive: Add version 3.7.9 (#27057)

apekshaBudhkar · jcar87 · web-flow · commit f6fc0b0953ab · 2025-04-03T10:54:20.000+01:00
* libarchive: Add versions 3.7.8 and 3.7.9

* libarchive: Remove 3.7.8 version

* libarchive: Fix a mistake in 3.7.9 patch

* libarchive: Specify minimum cmake version to comply with library requirements

* Update recipes/libarchive/all/conanfile.py

* Remove v.3.7.8 from config yaml

* Fix a line in patch file to remove glibc check for memmove

---------

Co-authored-by: Luis Caro Campos &lt;3535649+jcar87@users.noreply.github.com&gt;
diff --git a/recipes/libarchive/all/conandata.yml b/recipes/libarchive/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.7.9":
+    url: "https://github.com/libarchive/libarchive/releases/download/v3.7.9/libarchive-3.7.9.tar.xz"
+    sha256: "ed8b5732e4cd6e30fae909fb945cad8ff9cb7be5c6cdaa3944ec96e4a200c04c"
   "3.7.7":
     url: "https://github.com/libarchive/libarchive/releases/download/v3.7.7/libarchive-3.7.7.tar.xz"
     sha256: "879acd83c3399c7caaee73fe5f7418e06087ab2aaf40af3e99b9e29beb29faee"
@@ -15,6 +18,16 @@ sources:
     url: "https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.xz"
     sha256: "04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb"
 patches:
+  "3.7.9":
+    - patch_file: "patches/0003-3.7.9-cmake.patch"
+      patch_description: "Make CMake build-system compatible with Conan"
+      patch_type: "conan"
+    - patch_file: "patches/0005-3.7.9-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.7.9-fix-msvc-build.patch"
+      patch_description: "Fix MSVC build"
+      patch_type: "conan"
   "3.7.7":
     - patch_file: "patches/0003-3.7.7-cmake.patch"
       patch_description: "Make CMake build-system compatible with Conan"
diff --git a/recipes/libarchive/all/conanfile.py b/recipes/libarchive/all/conanfile.py
@@ -113,6 +113,10 @@ def requirements(self):
         if self.options.get_safe("with_pcre2"):
             self.requires("pcre2/10.43")
 
+    def build_requirements(self):
+        if Version(self.version) >= "3.7.9":
+            self.tool_requires("cmake/[>=3.17 <4]")
+
     def validate(self):
         if self.settings.os != "Windows" and self.options.with_cng:
             # TODO: add cng when available in CCI
diff --git a/recipes/libarchive/all/patches/0003-3.7.9-cmake.patch b/recipes/libarchive/all/patches/0003-3.7.9-cmake.patch
@@ -0,0 +1,92 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c2f7100..42e4ac1b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
+ 
+ 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()
+@@ -445,7 +445,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)
+     #
+     # Test if ZLIB_WINAPI macro is needed to use.
+@@ -535,7 +535,7 @@ ELSE(LIBLZMA_FOUND)
+ # LZMA not found and will not be used.
+   SET(HAVE_LZMA_STREAM_ENCODER_MT 0)
+ ENDIF(LIBLZMA_FOUND)
+-MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
++MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIRS)
+ MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
+ 
+ #
+@@ -606,7 +606,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)
+@@ -829,7 +829,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 dd0b2808..c8c9988b 100644
+--- a/libarchive/CMakeLists.txt
++++ b/libarchive/CMakeLists.txt
+@@ -247,7 +247,7 @@ 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 
++  SET_TARGET_PROPERTIES(archive PROPERTIES
+                         VERSION ${SOVERSION_FULL}
+                         SOVERSION ${SOVERSION}
+                         MACHO_COMPATIBILITY_VERSION ${MACHO_COMPATIBILITY_VERSION}
+@@ -255,6 +255,7 @@ IF(BUILD_SHARED_LIBS)
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # archive_static is a static library
++IF(NOT BUILD_SHARED_LIBS)
+ ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
+ TARGET_INCLUDE_DIRECTORIES(archive_static PUBLIC .)
+ TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
+@@ -264,6 +265,7 @@ SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
+ IF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS)
+   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
+ ENDIF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS)
++ENDIF()
+ 
+ IF(ENABLE_INSTALL)
+   # How to install the libraries
+@@ -272,11 +274,12 @@ IF(ENABLE_INSTALL)
+             RUNTIME DESTINATION bin
+             LIBRARY DESTINATION lib
+             ARCHIVE DESTINATION lib)
+-  ENDIF(BUILD_SHARED_LIBS)
++  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/0005-3.7.9-try-compile-cmakedeps.patch b/recipes/libarchive/all/patches/0005-3.7.9-try-compile-cmakedeps.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c2f7100..b2ec9ed3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -870,8 +870,10 @@ ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Haiku")
+ # required libraries.
+ #
+ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
++    include(CMakePushCheckState)
+     FOREACH(ALGORITHM ${ALGORITHMS})
+       IF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
++      cmake_push_check_state()
+       STRING(TOLOWER "${ALGORITHM}" lower_algorithm)
+       STRING(TOUPPER "${ALGORITHM}" algorithm)
+       IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
+@@ -904,8 +906,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
+ 	    SET(TRY_CRYPTO_REQUIRED_LIBS
+ 	        "-DLINK_LIBRARIES:STRING=${NETTLE_LIBRARY}")
+ 	ELSEIF("${IMPLEMENTATION}" MATCHES "^LIBMD$" AND LIBMD_FOUND)
+-	    SET(TRY_CRYPTO_REQUIRED_LIBS
+-	        "-DLINK_LIBRARIES:STRING=${LIBMD_LIBRARY}")
++	    SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+ 	ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
+ 
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
diff --git a/recipes/libarchive/all/patches/0006-3.7.9-fix-msvc-build.patch b/recipes/libarchive/all/patches/0006-3.7.9-fix-msvc-build.patch
@@ -0,0 +1,45 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 683b2d75..190c1bf2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1474,7 +1474,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)
+@@ -1510,11 +1510,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_symbol_exists(wcscmp wchar.h HAVE_WCSCMP)
+-check_symbol_exists(wcscpy wchar.h HAVE_WCSCPY)
+-check_symbol_exists(wcslen wchar.h 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(_fseeki64 HAVE__FSEEKI64)
+ CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
+ CHECK_SYMBOL_EXISTS(ctime_s "time.h" HAVE_CTIME_S)
+@@ -1527,10 +1527,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/recipes/libarchive/config.yml b/recipes/libarchive/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.7.9":
+    folder: all
   "3.7.7":
     folder: all
   "3.7.6":
