Update 3.7.7

recipe/meta.yaml

@@ -1,24 +1,18 @@
-{% set version = "3.7.4" %}
+{% set version = "3.7.7" %}
 
 package:
   name: libarchive
   version: {{ version }}
 
 source:
   url: https://github.com/libarchive/libarchive/releases/download/v{{ version }}/libarchive-{{ version }}.tar.gz
-  sha256: 7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8
+  sha256: 4cc540a3e9a1eebdefa1045d2e4184831100667e6d7d5b315bb1cbc951f8ddff
   patches:
     - patches/0001-Add-lib-to-CMAKE_FIND_LIBRARY_PREFIXES-for-lzma.patch
-    - patches/0003-VC9-compatibility-test-for-BCryptDeriveKeyPBKDF2.patch
-    - patches/0004-VC9-compatibility-define-BCRYPT_SUCCESS.patch
-    - patches/0006-VC-openssl-define-inline-as-__inline.patch
-    # These warnings are errors when compiling lz-4 support
-    - patches/0007-CMake-VC9-compatibility-ignore-some-warnings.patch
-    - patches/0008-VC9-compatibility-remove-C99.patch
     - patches/0009-CMake-Force-Multi-threaded-DLL-runtime.patch
+
 build:
   number: 0
-  #skip: true  # [win and vc<14]
   run_exports:
     # https://abi-laboratory.pro/index.php?view=timeline&l=libarchive
     - {{ pin_subpackage('libarchive', max_pin='x.x') }}
@@ -34,11 +28,10 @@ requirements:
     - patch       # [not win]
     - m2-patch    # [win]
   host:
-    - msinttypes  # [win and vc<14]
-    - bzip2
-    - libiconv    # [not linux]
-    - lz4-c
-    - xz
+    - bzip2 {{ bzip2 }}
+    - libiconv 1.16    # [not linux]
+    - lz4-c 1.9
+    - xz {{ xz }}
     # This is GPL-v2+, the libarchive authors explicitly ask that
     # people do not link to this (and if we do, this would need to
     # also be released as GPL-v2+, and that is against their wishes
@@ -75,16 +68,14 @@ test:
     - test -f "${PREFIX}/lib/libarchive${SHLIB_EXT}"   # [unix]
 
     # Check for commands
-    - if not exist "%LIBRARY_BIN%\\bsdcat.exe" exit 1   # [win32]
-    - if not exist "%LIBRARY_BIN%\\bsdcpio.exe" exit 1  # [win32]
-    - bsdcat --version      # [unix or win64]
-    - bsdcpio --version     # [unix or win64]
-    - bsdtar --version      # [unix or win64]
-    - pushd test-archives   # [unix or win64]
-    -   bsdtar -vxf hello_world.xar 2>&1 | rg "x hello_world"   # [unix or win64]
-    -   bsdtar -vxf archive.7z 2>&1 | rg "x 7zip-archive"       # [unix or win64]
-    -   bsdtar -vxf hello_world.tar.zst 2>&1 | rg "greets"      # [unix or win64]
-    - popd   # [unix or win64]
+    - bsdcat --version
+    - bsdcpio --version
+    - bsdtar --version
+    - pushd test-archives
+    -   bsdtar -vxf hello_world.xar 2>&1 | rg "x hello_world"
+    -   bsdtar -vxf archive.7z 2>&1 | rg "x 7zip-archive"
+    -   bsdtar -vxf hello_world.tar.zst 2>&1 | rg "greets"
+    - popd
 
 about:
   home: https://libarchive.org/
@@ -93,11 +84,11 @@ about:
   license_family: BSD
   summary: Multi-format archive and compression library
   description: |
-    Libarchive is an open-source BSD-licensed C programming library that provides streaming access 
-    to a variety of different archive formats, including tar, cpio, pax, Zip, and ISO9660 images. 
-    The distribution also includes bsdtar and bsdcpio, full-featured implementations of tar and cpio 
+    Libarchive is an open-source BSD-licensed C programming library that provides streaming access
+    to a variety of different archive formats, including tar, cpio, pax, Zip, and ISO9660 images.
+    The distribution also includes bsdtar and bsdcpio, full-featured implementations of tar and cpio
     that use libarchive.
-    When reading archives, libarchive uses a robust automatic format detector that can automatically handle archives 
+    When reading archives, libarchive uses a robust automatic format detector that can automatically handle archives
     that have been compressed with gzip, bzip2, xz, lzip, and several other popular compression algorithms.
   dev_url: https://github.com/libarchive/libarchive
   doc_url: https://github.com/libarchive/libarchive/wiki
@@ -106,7 +97,4 @@ extra:
   recipe-maintainers:
     - jakirkham
     - mingwandroid
-    - ocefpaf
-  skip-lints:
-    - missing_tests
-    - host_section_needs_exact_pinnings
+    - ocefpaf

recipe/patches/0001-Add-lib-to-CMAKE_FIND_LIBRARY_PREFIXES-for-lzma.patch

@@ -1,6 +1,8 @@
---- work/CMakeLists.txt.orig	2017-12-15 16:52:54.709341000 -0600
-+++ work/CMakeLists.txt	2017-12-15 16:54:40.943948000 -0600
-@@ -454,7 +454,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bfe68acd..660f3b75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -530,7 +530,10 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
  # Find LZMA
  #
  IF(ENABLE_LZMA)
@@ -9,5 +11,7 @@
    FIND_PACKAGE(LibLZMA)
 +  SET(CMAKE_FIND_LIBRARY_PREFIXES "${OLD_CMAKE_FIND_LIBRARY_PREFIXES}")
  ELSE()
-   SET(LIBZMA_FOUND FALSE) # Override cached value
+   SET(LIBLZMA_FOUND FALSE) # Override cached value
  ENDIF()
+-- 
+2.39.3 (Apple Git-146)