Release 3.7.8

FreeBSD 13.4 -> 13.5
FreeBSD 14.1 -> 14.2

(cherry picked from commit 03e15babd6ea5ad6add33b070bb5ef50f79b052c)

.cirrus.yml

@@ -1,4 +1,3 @@
----
 env:
   CIRRUS_CLONE_DEPTH: 1
   ARCH: amd64
@@ -10,33 +9,22 @@ FreeBSD_task:
     env:
       BS: cmake
   matrix:
-    - name: 15.0-STABLE (UFS)
-      freebsd_instance:
-        image_family: freebsd-15-0-amd64-ufs-snap
-    - name: 15.0-RELEASE (UFS)
-      freebsd_instance:
-        image_family: freebsd-15-0-amd64-ufs
-    - name: 15.0-RELEASE (ZFS)
-      freebsd_instance:
-        image_family: freebsd-15-0-amd64-zfs
-    - name: 14.3-RELEASE
-      freebsd_instance:
-        image_family: freebsd-14-3
-    - name: 13.5-RELEASE
-      freebsd_instance:
-        image_family: freebsd-13-5
+    freebsd_instance:
+      image_family: freebsd-14-2
+    freebsd_instance:
+      image_family: freebsd-13-5
   prepare_script:
   - ./build/ci/cirrus_ci/ci.sh prepare
   configure_script:
   - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a autogen
-  - env MAKE=gmake CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
+  - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
   build_script:
-  - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a build
+  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a build
   test_script:
-  - env MAKE=gmake SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test
+  - env SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test
   - ./build/ci/cirrus_ci/ci.sh test
   install_script:
-  - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a install
+  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a install
 
 Windows_Cygwin_task:
   windows_container:

.github/workflows/ci.yml

@@ -12,9 +12,9 @@ jobs:
       matrix:
         bs: [autotools, cmake]
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Install dependencies
-      run: ./build/ci/github_actions/install-macos-dependencies.sh
+      run: ./build/ci/github_actions/macos.sh prepare
     - name: Autogen
       run: ./build/ci/build.sh -a autogen
       env:
@@ -23,31 +23,29 @@ jobs:
       run: ./build/ci/build.sh -a configure
       env:
         BS: ${{ matrix.bs }}
-        # Avoid using liblzma from the Xcode 16 / MacOSX15.0.sdk, which fails RISCV filter tests.
-        CMAKE_ARGS: -D LIBLZMA_LIBRARY=/opt/homebrew/lib/liblzma.dylib -D LIBLZMA_INCLUDE_DIR=/opt/homebrew/include/lzma.h
     - name: Build
       run: ./build/ci/build.sh -a build
       env:
         BS: ${{ matrix.bs }}
-        MAKE_ARGS: -j3
+        MAKE_ARGS: -j
     - name: Test
       run: ./build/ci/build.sh -a test
       env:
         BS: ${{ matrix.bs }}
         SKIP_OPEN_FD_ERR_TEST: 1
         IGNORE_TRAVERSALS_TEST4: 1
-        MAKE_ARGS: -j3
+        MAKE_ARGS: -j
         CTEST_OUTPUT_ON_FAILURE: ON
     - name: Install
       run: ./build/ci/build.sh -a install
       env:
         BS: ${{ matrix.bs }}
-        MAKE_ARGS: -j3
+        MAKE_ARGS: -j
     - name: Artifact
       run: ./build/ci/build.sh -a artifact
       env:
         BS: ${{ matrix.bs }}
-    - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:
         name: libarchive-macos-${{ matrix.bs }}-${{ github.sha }}
         path: libarchive.tar.xz
@@ -59,7 +57,7 @@ jobs:
         bs: [autotools, cmake]
         crypto: [mbedtls, nettle, openssl]
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Update apt cache
       run: sudo apt-get update
     - name: Install dependencies
@@ -77,13 +75,13 @@ jobs:
       run: ./build/ci/build.sh -a build
       env:
         BS: ${{ matrix.bs }}
-        MAKE_ARGS: -j4
+        MAKE_ARGS: -j
     - name: Test
       run: ./build/ci/build.sh -a test
       env:
         BS: ${{ matrix.bs }}
         SKIP_OPEN_FD_ERR_TEST: 1
-        MAKE_ARGS: -j4
+        MAKE_ARGS: -j
         CTEST_OUTPUT_ON_FAILURE: ON
     - name: Install
       run: ./build/ci/build.sh -a install
@@ -93,14 +91,14 @@ jobs:
       run: ./build/ci/build.sh -a artifact
       env:
         BS: ${{ matrix.bs }}
-    - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:
         name: libarchive-ubuntu-${{ matrix.bs }}-${{ matrix.crypto }}-${{ github.sha }}
         path: libarchive.tar.xz
   Ubuntu-distcheck:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Update package definitions
       run: sudo apt-get update
     - name: Install dependencies
@@ -115,7 +113,7 @@ jobs:
         SKIP_OPEN_FD_ERR_TEST: 1
     - name: Dist-Artifact
       run: ./build/ci/build.sh -a dist-artifact
-    - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:
         name: libarchive-${{ github.sha }}
         path: libarchive-dist.tar
@@ -127,7 +125,7 @@ jobs:
       matrix:
         be: [mingw-gcc, msvc]
     steps:
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Install mingw
       if:  ${{ matrix.be=='mingw-gcc' }}
       run: choco install mingw
@@ -163,7 +161,7 @@ jobs:
       shell: cmd
       env:
         BE: ${{ matrix.be }}
-    - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:
         name: libarchive-windows-${{ matrix.be }}-${{ github.sha }}
         path: libarchive.zip

.github/workflows/cifuzz.yml

@@ -21,7 +21,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/codeql.yml

@@ -26,18 +26,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/scorecard.yml

@@ -29,12 +29,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -52,7 +52,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif
@@ -60,6 +60,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           sarif_file: results.sarif

CMakeLists.txt

@@ -1,10 +1,20 @@
 #
-cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+if(APPLE AND CMAKE_VERSION VERSION_LESS "3.17.0")
+  message(WARNING "CMake>=3.17.0 required to make the generated shared library have the same Mach-O headers as autotools")
+endif()
 
-PROJECT(libarchive C)
+if(POLICY CMP0065)
+  cmake_policy(SET CMP0065 NEW) #3.4 don't use `-rdynamic` with executables
+endif()
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW) #3.12.0 `find_package()`` uses ``<PackageName>_ROOT`` variables.
+endif()
+if(POLICY CMP0075)
+  cmake_policy(SET CMP0075 NEW) #3.12.0 `check_include_file()`` and friends use ``CMAKE_REQUIRED_LIBRARIES``.
+endif()
 #
-# Include standard installation directories
-include(GNUInstallDirs)
+PROJECT(libarchive C)
 #
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
@@ -19,7 +29,7 @@ endif()
 #   MinSizeRel     : Release Min Size build
 #   None           : No build type
 IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
+  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the
 # value type is "UNINITIALIZED".
@@ -97,9 +107,6 @@ set(MACHO_CURRENT_VERSION "${MACHO_COMPATIBILITY_VERSION}.${_revision}")
 # saving and restoring the state of the variables.
 INCLUDE(CMakePushCheckState)
 
-# Enable the pkg-config helpers.
-INCLUDE(FindPkgConfig)
-
 # Initialize the state of the variables. This initialization is not
 # necessary but this shows you what value the variables initially have.
 SET(CMAKE_REQUIRED_DEFINITIONS)
@@ -139,12 +146,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
   # either of the following two, yet neither is supported as of 3.0.2
   # - check_linker_flag - does not exist
   # - try_compile - does not support linker flags
-  IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
-  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-    # SunOS linker doesn't support --gc-sections
-  ELSE()
+  IF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     # Place the functions and data into separate sections, allowing the linker
     # to garbage collect the unused ones.
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
@@ -153,7 +155,10 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
     # Printing the discarded section is "too much", so enable on demand.
     #SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -Wl,--print-gc-sections")
     #SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--print-gc-sections")
-  ENDIF()
+  ELSE()
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip")
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
+  ENDIF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
        CMAKE_C_COMPILER_ID MATCHES "^Clang$" AND NOT MSVC)
 IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
@@ -233,7 +238,6 @@ OPTION(ENABLE_ZLIB "Enable the use of the system ZLIB library if found" ON)
 OPTION(ENABLE_BZip2 "Enable the use of the system BZip2 library if found" ON)
 OPTION(ENABLE_LIBXML2 "Enable the use of the system libxml2 library if found" ON)
 OPTION(ENABLE_EXPAT "Enable the use of the system EXPAT library if found" ON)
-OPTION(ENABLE_WIN32_XMLLITE "Enable the use of the Windows XmlLite library if found" ON)
 OPTION(ENABLE_PCREPOSIX "Enable the use of the system PCREPOSIX library if found" ON)
 OPTION(ENABLE_PCRE2POSIX "Enable the use of the system PCRE2POSIX library if found" ON)
 OPTION(ENABLE_LIBGCC "Enable the use of the system LibGCC library if found" ON)
@@ -260,10 +264,6 @@ OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
 OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE)
 OPTION(ENABLE_INSTALL "Enable installing of libraries" ON)
 
-IF(WIN32 AND MSVC)
-  OPTION(MSVC_USE_STATIC_CRT "Use static CRT" OFF)
-ENDIF()
-
 SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support")
 SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)")
 SET(WINDOWS_VERSION "WIN10" CACHE STRING "Set Windows version to use (Windows only)")
@@ -293,6 +293,18 @@ IF(WIN32)
     SET(NTDDI_VERSION 0x06000100)
     SET(_WIN32_WINNT 0x0600)
     SET(WINVER 0x0600)
+  ELSEIF(WINDOWS_VERSION STREQUAL "VISTA")
+    SET(NTDDI_VERSION 0x06000000)
+    SET(_WIN32_WINNT 0x0600)
+    SET(WINVER 0x0600)
+  ELSEIF(WINDOWS_VERSION STREQUAL "WS03")
+    SET(NTDDI_VERSION 0x05020000)
+    SET(_WIN32_WINNT 0x0502)
+    SET(WINVER 0x0502)
+  ELSEIF(WINDOWS_VERSION STREQUAL "WINXP")
+    SET(NTDDI_VERSION 0x05010000)
+    SET(_WIN32_WINNT 0x0501)
+    SET(WINVER 0x0501)
   ELSE(WINDOWS_VERSION STREQUAL "WIN10")
     # Default to Windows Server 2003 API if we don't recognize the specifier
     SET(NTDDI_VERSION 0x05020000)
@@ -366,12 +378,10 @@ ENDMACRO (GENERATE_LIST_H)
 # Generate installation rules for man pages.
 #
 MACRO (INSTALL_MAN __mans)
-  IF(ENABLE_INSTALL)
-    FOREACH (_man ${ARGV})
-      STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
-      INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
-    ENDFOREACH (_man)
-  ENDIF(ENABLE_INSTALL)
+  FOREACH (_man ${ARGV})
+    STRING(REGEX REPLACE "^.+[.]([1-9])" "\\1" _mansect ${_man})
+    INSTALL(FILES ${_man} DESTINATION "share/man/man${_mansect}")
+  ENDFOREACH (_man)
 ENDMACRO (INSTALL_MAN __mans)
 #
 # Find out what macro is needed to use libraries on Windows.
@@ -596,7 +606,6 @@ IF(ENABLE_LIBB2)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBB2 DEFAULT_MSG LIBB2_LIBRARY LIBB2_INCLUDE_DIR)
 ELSE(ENABLE_LIBB2)
   SET(LIBB2_FOUND FALSE) # Override cached value
-  UNSET(LIBB2_PKGCONFIG_VERSION CACHE)
 ENDIF(ENABLE_LIBB2)
 IF(LIBB2_FOUND)
   SET(HAVE_LIBB2 1)
@@ -609,13 +618,8 @@ IF(LIBB2_FOUND)
   SET(CMAKE_REQUIRED_INCLUDES ${LIBB2_INCLUDE_DIR})
   CHECK_FUNCTION_EXISTS(blake2sp_init HAVE_LIBB2)
   CMAKE_POP_CHECK_STATE()
-  pkg_check_modules(LIBB2 libb2)
-  IF(LIBB2_VERSION)
-    SET(LIBB2_PKGCONFIG_VERSION LIBB2_VERSION)
-  ENDIF(LIBB2_VERSION)
 ELSE(LIBB2_FOUND)
   SET(ARCHIVE_BLAKE2 TRUE)
-  UNSET(LIBB2_PKGCONFIG_VERSION CACHE)
 ENDIF(LIBB2_FOUND)
 #
 # Find LZ4
@@ -678,7 +682,6 @@ IF(ZSTD_FOUND)
   SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR})
   CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
   CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
-  CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel)
   #
   # TODO: test for static library.
   #
@@ -687,6 +690,7 @@ ENDIF(ZSTD_FOUND)
 MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)
 
+
 #
 # Check headers
 #
@@ -780,22 +784,12 @@ IF(ENABLE_CNG)
   LA_CHECK_INCLUDE_FILE("bcrypt.h" HAVE_BCRYPT_H)
   IF(HAVE_BCRYPT_H)
     LIST(APPEND ADDITIONAL_LIBS "bcrypt")
-    # bcrypt supports these algorithms on all available versions
-    SET(ARCHIVE_CRYPTO_MD5        1)
-    SET(ARCHIVE_CRYPTO_MD5_WIN    1)
-    SET(ARCHIVE_CRYPTO_SHA1       1)
-    SET(ARCHIVE_CRYPTO_SHA1_WIN   1)
-    SET(ARCHIVE_CRYPTO_SHA256     1)
-    SET(ARCHIVE_CRYPTO_SHA256_WIN 1)
-    SET(ARCHIVE_CRYPTO_SHA384     1)
-    SET(ARCHIVE_CRYPTO_SHA384_WIN 1)
-    SET(ARCHIVE_CRYPTO_SHA512     1)
-    SET(ARCHIVE_CRYPTO_SHA512_WIN 1)
   ENDIF(HAVE_BCRYPT_H)
 ELSE(ENABLE_CNG)
   UNSET(HAVE_BCRYPT_H CACHE)
 ENDIF(ENABLE_CNG)
 # Following files need windows.h, so we should test it after windows.h test.
+LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H)
 LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H)
 
 #
@@ -827,7 +821,7 @@ IF(ENABLE_MBEDTLS)
     LA_CHECK_INCLUDE_FILE("mbedtls/aes.h" HAVE_MBEDTLS_AES_H)
     LA_CHECK_INCLUDE_FILE("mbedtls/md.h" HAVE_MBEDTLS_MD_H)
     LA_CHECK_INCLUDE_FILE("mbedtls/pkcs5.h" HAVE_MBEDTLS_PKCS5_H)
-    LA_CHECK_INCLUDE_FILE("mbedtls/version.h" HAVE_MBEDTLS_VERSION_H)
+
   ENDIF(MBEDTLS_FOUND)
   MARK_AS_ADVANCED(CLEAR MBEDTLS_INCLUDE_DIRS)
   MARK_AS_ADVANCED(CLEAR MBEDCRYPTO_LIBRARY)
@@ -850,7 +844,7 @@ IF(ENABLE_NETTLE)
     LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H)
     LA_CHECK_INCLUDE_FILE("nettle/ripemd160.h" HAVE_NETTLE_RIPEMD160_H)
     LA_CHECK_INCLUDE_FILE("nettle/sha.h" HAVE_NETTLE_SHA_H)
-    LA_CHECK_INCLUDE_FILE("nettle/version.h" HAVE_NETTLE_VERSION_H)
+
   ENDIF(NETTLE_FOUND)
   MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
   MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
@@ -869,7 +863,6 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
     LA_CHECK_INCLUDE_FILE("openssl/evp.h" HAVE_OPENSSL_EVP_H)
-    LA_CHECK_INCLUDE_FILE("openssl/opensslv.h" HAVE_OPENSSL_OPENSSLV_H)
     CHECK_FUNCTION_EXISTS(PKCS5_PBKDF2_HMAC_SHA1 HAVE_PKCS5_PBKDF2_HMAC_SHA1)
   ENDIF(OPENSSL_FOUND)
 ELSE()
@@ -1004,6 +997,86 @@ main(int argc, char **argv)
     ENDFOREACH(ALGORITHM ${ALGORITHMS})
 ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
 
+#
+# CRYPTO functions on Windows is defined at archive_windows.c, thus we do not
+# need the test what the functions can be mapped to archive_{crypto name}_init,
+# archive_{crypto name}_update and archive_{crypto name}_final.
+# The functions on Windows use CALG_{crypto name} macro to create a crypt object
+# and then we need to know what CALG_{crypto name} macros is available to show
+# ARCHIVE_CRYPTO_{crypto name}_WIN macros because Windows 2000 and earlier version
+# of Windows XP do not support SHA256, SHA384 and SHA512.
+#
+MACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
+  IF(WIN32 AND NOT CYGWIN)
+    FOREACH(CRYPTO ${CRYPTO_LIST})
+      IF(NOT ARCHIVE_CRYPTO_${CRYPTO})
+      IF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+	STRING(TOUPPER "${CRYPTO}" crypto)
+	SET(ALGID "")
+	IF ("${CRYPTO}" MATCHES "^MD5$")
+	    SET(ALGID "CALG_MD5")
+	ENDIF ("${CRYPTO}" MATCHES "^MD5$")
+	IF ("${CRYPTO}" MATCHES "^SHA1$")
+	    SET(ALGID "CALG_SHA1")
+	ENDIF ("${CRYPTO}" MATCHES "^SHA1$")
+	IF ("${CRYPTO}" MATCHES "^SHA256$")
+	    SET(ALGID "CALG_SHA_256")
+	ENDIF ("${CRYPTO}" MATCHES "^SHA256$")
+	IF ("${CRYPTO}" MATCHES "^SHA384$")
+	    SET(ALGID "CALG_SHA_384")
+	ENDIF ("${CRYPTO}" MATCHES "^SHA384$")
+	IF ("${CRYPTO}" MATCHES "^SHA512$")
+	    SET(ALGID "CALG_SHA_512")
+	ENDIF ("${CRYPTO}" MATCHES "^SHA512$")
+
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
+	FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
+	     CONFDEFS_H)
+
+	SET(SOURCE "${CONFDEFS_H}
+
+#define ${crypto}_COMPILE_TEST
+#include <windows.h>
+#include <wincrypt.h>
+
+int
+main(int argc, char **argv)
+{
+	return ${ALGID};
+}
+")
+	SET(SOURCE_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_win.c")
+
+	FILE(WRITE "${SOURCE_FILE}" "${SOURCE}")
+	MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN")
+
+	TRY_COMPILE(ARCHIVE_CRYPTO_${CRYPTO}_WIN
+	  ${CMAKE_BINARY_DIR}
+	  ${SOURCE_FILE}
+	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
+	  OUTPUT_VARIABLE OUTPUT)
+
+	IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+	    MESSAGE(STATUS
+	        "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- found")
+		SET(ARCHIVE_CRYPTO_${CRYPTO} 1)
+	ELSE (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+	    MESSAGE(STATUS
+	         "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- not found")
+    	    FILE(APPEND
+	        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+                "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN failed with the following output:\n"
+        	"${OUTPUT}\n"
+        	"Source file was:\n${SOURCE}\n")
+	ENDIF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+
+      ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+      ENDIF(NOT ARCHIVE_CRYPTO_${CRYPTO})
+    ENDFOREACH(CRYPTO)
+  ENDIF(WIN32 AND NOT CYGWIN)
+ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
+
 #
 # Find iconv
 # POSIX defines the second arg as const char **
@@ -1018,8 +1091,8 @@ MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
         CMAKE_C_COMPILER_ID MATCHES "^Clang$")
       #
       # During checking iconv proto type, we should use -Werror to avoid the
-      # success of iconv detection with a warning, which would be a false
-      # positive.  So this is needed for all build modes, even in release mode.
+      # success of iconv detection with a warning which success is a miss
+      # detection. So this needs for all build mode(even it's a release mode).
       #
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
     ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
@@ -1090,7 +1163,6 @@ IF(ENABLE_ICONV)
       CHECK_ICONV("libiconv" "const")
       CHECK_ICONV("libiconv" "")
       IF (HAVE_ICONV)
-        SET(HAVE_LIBICONV 1)
         LIST(APPEND ADDITIONAL_LIBS ${LIBICONV_PATH})
       ENDIF(HAVE_ICONV)
     ENDIF(NOT HAVE_ICONV AND LIBICONV_PATH)
@@ -1134,7 +1206,6 @@ ELSE(ENABLE_ICONV)
   # (once enabled).
   UNSET(HAVE_LOCALE_CHARSET CACHE)
   UNSET(HAVE_ICONV CACHE)
-  UNSET(HAVE_LIBICONV CACHE)
   UNSET(HAVE_ICONV_libc_ CACHE)
   UNSET(HAVE_ICONV_libc_const CACHE)
   UNSET(HAVE_ICONV_libiconv_ CACHE)
@@ -1164,7 +1235,6 @@ IF(LIBXML2_FOUND)
   SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
   CHECK_INCLUDE_FILES("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H)
   CHECK_INCLUDE_FILES("libxml/xmlwriter.h" HAVE_LIBXML_XMLWRITER_H)
-  CHECK_INCLUDE_FILES("libxml/xmlversion.h" HAVE_LIBXML_XMLVERSION_H)
   # Test if a macro is needed for the library.
   TRY_MACRO_FOR_LIBRARY(
     "${ICONV_INCLUDE_DIR};${LIBXML2_INCLUDE_DIR}"
@@ -1192,25 +1262,6 @@ ELSE(LIBXML2_FOUND)
     SET(HAVE_LIBEXPAT 1)
     LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H)
     CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
-  ELSE(EXPAT_FOUND)
-    IF(WIN32 AND ENABLE_WIN32_XMLLITE)
-      # Check linkage as well; versions of mingw-w64 before v11.0.0
-      # do not contain an import library for xmllite.
-      cmake_push_check_state()
-      SET(CMAKE_REQUIRED_LIBRARIES "xmllite" "uuid")
-      check_c_source_compiles("
-      #include <initguid.h>
-      #include <xmllite.h>
-      int main() {
-        return CreateXmlReader(&IID_IXmlReader, NULL, NULL);
-      }
-      " HAVE_XMLLITE_H)
-      cmake_pop_check_state()
-      IF(HAVE_XMLLITE_H)
-        SET(XMLLITE_FOUND TRUE)
-        LIST(APPEND ADDITIONAL_LIBS "xmllite" "uuid")
-      ENDIF()
-    ENDIF()
   ENDIF(EXPAT_FOUND)
 ENDIF(LIBXML2_FOUND)
 MARK_AS_ADVANCED(CLEAR LIBXML2_INCLUDE_DIR)
@@ -1412,8 +1463,6 @@ CHECK_FUNCTION_EXISTS_GLIBC(arc4random_buf HAVE_ARC4RANDOM_BUF)
 CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
-CHECK_FUNCTION_EXISTS_GLIBC(closefrom HAVE_CLOSEFROM)
-CHECK_FUNCTION_EXISTS_GLIBC(close_range HAVE_CLOSE_RANGE)
 CHECK_FUNCTION_EXISTS_GLIBC(ctime_r HAVE_CTIME_R)
 CHECK_FUNCTION_EXISTS_GLIBC(fchdir HAVE_FCHDIR)
 CHECK_FUNCTION_EXISTS_GLIBC(fchflags HAVE_FCHFLAGS)
@@ -1431,19 +1480,15 @@ CHECK_FUNCTION_EXISTS_GLIBC(ftruncate HAVE_FTRUNCATE)
 CHECK_FUNCTION_EXISTS_GLIBC(futimens HAVE_FUTIMENS)
 CHECK_FUNCTION_EXISTS_GLIBC(futimes HAVE_FUTIMES)
 CHECK_FUNCTION_EXISTS_GLIBC(futimesat HAVE_FUTIMESAT)
-CHECK_FUNCTION_EXISTS_GLIBC(getegid HAVE_GETEGID)
 CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
 CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getline HAVE_GETLINE)
-CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
 CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
-CHECK_FUNCTION_EXISTS_GLIBC(getresgid HAVE_GETRESGID)
-CHECK_FUNCTION_EXISTS_GLIBC(getresuid HAVE_GETRESUID)
+CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
 CHECK_FUNCTION_EXISTS_GLIBC(getvfsbyname HAVE_GETVFSBYNAME)
 CHECK_FUNCTION_EXISTS_GLIBC(gmtime_r HAVE_GMTIME_R)
-CHECK_FUNCTION_EXISTS_GLIBC(issetugid HAVE_ISSETUGID)
 CHECK_FUNCTION_EXISTS_GLIBC(lchflags HAVE_LCHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(lchmod HAVE_LCHMOD)
 CHECK_FUNCTION_EXISTS_GLIBC(lchown HAVE_LCHOWN)
@@ -1462,7 +1507,6 @@ CHECK_FUNCTION_EXISTS_GLIBC(nl_langinfo HAVE_NL_LANGINFO)
 CHECK_FUNCTION_EXISTS_GLIBC(openat HAVE_OPENAT)
 CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
 CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
-CHECK_FUNCTION_EXISTS_GLIBC(posix_spawn HAVE_POSIX_SPAWN)
 CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
 CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
 CHECK_FUNCTION_EXISTS_GLIBC(readpassphrase HAVE_READPASSPHRASE)
@@ -1491,9 +1535,9 @@ 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(wcscmp HAVE_WCSCMP)
+CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
+CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
 CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
 CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
@@ -1526,6 +1570,12 @@ CHECK_C_SOURCE_COMPILES(
   "#include <sys/types.h>\n#include <sys/mount.h>\nint main(void) { struct statfs s; return sizeof(s);}"
   HAVE_STRUCT_STATFS)
 
+# Make sure we have the POSIX version of readdir_r, not the
+# older 2-argument version.
+CHECK_C_SOURCE_COMPILES(
+  "#include <dirent.h>\nint main() {DIR *d = opendir(\".\"); struct dirent e,*r; return readdir_r(d,&e,&r);}"
+  HAVE_READDIR_R)
+
 # dirfd can be either a function or a macro.
 CHECK_C_SOURCE_COMPILES(
   "#include <dirent.h>\nint main() {DIR *d = opendir(\".\"); return dirfd(d);}"
@@ -1765,16 +1815,11 @@ IF(ENABLE_XATTR)
   CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_LIBATTR)
   IF(HAVE_LIBATTR)
     SET(CMAKE_REQUIRED_LIBRARIES "attr")
-	  pkg_check_modules(LIBATTR libattr)
-	  IF(LIBATTR_VERSION)
-	    SET(LIBATTR_PKGCONFIG_VERSION ${LIBATTR_VERSION})
-	  ENDIF(LIBATTR_VERSION)
-  ELSE(HAVE_LIBATTR)
+  ELSE()
     CHECK_LIBRARY_EXISTS(gnu "setxattr" "" HAVE_LIBATTR_GNU)
     IF(HAVE_LIBATTR_GNU)
       SET(CMAKE_REQUIRED_LIBRARIES "gnu")
     ENDIF()
-    UNSET(LIBATTR_PKGCONFIG_VERSION CACHE)
   ENDIF(HAVE_LIBATTR)
   CHECK_SYMBOL_EXISTS(EXTATTR_NAMESPACE_USER "sys/types.h;sys/extattr.h" HAVE_DECL_EXTATTR_NAMESPACE_USER)
   CHECK_SYMBOL_EXISTS(XATTR_NOFOLLOW "sys/xattr.h" HAVE_DECL_XATTR_NOFOLLOW)
@@ -1892,12 +1937,6 @@ IF(ENABLE_ACL)
     SET(CMAKE_REQUIRED_LIBRARIES "acl")
     FIND_LIBRARY(ACL_LIBRARY NAMES acl)
     LIST(APPEND ADDITIONAL_LIBS ${ACL_LIBRARY})
-	  pkg_check_modules(LIBACL libacl)
-	  IF(LIBACL_VERSION)
-	    SET(LIBACL_PKGCONFIG_VERSION ${LIBACL_VERSION})
-	  ENDIF(LIBACL_VERSION)
-  ELSE(HAVE_LIBACL)
-    UNSET(LIBACL_PKGCONFIG_VERSION CACHE)
   ENDIF(HAVE_LIBACL)
 
   CHECK_TYPE_EXISTS(acl_t "sys/types.h;sys/acl.h" HAVE_ACL_T)
@@ -2037,12 +2076,6 @@ int main(void) { return ACL_SYNCHRONIZE; }" HAVE_DECL_ACL_SYNCHRONIZE)
     SET(CMAKE_REQUIRED_LIBRARIES "richacl")
     FIND_LIBRARY(RICHACL_LIBRARY NAMES richacl)
     LIST(APPEND ADDITIONAL_LIBS ${RICHACL_LIBRARY})
-	  pkg_check_modules(LIBRICHACL librichacl)
-	  IF(LIBRICHACL_VERSION)
-	    SET(LIBRICHACL_PKGCONFIG_VERSION ${LIBRICHACL_VERSION})
-	  ENDIF(LIBRICHACL_VERSION)
-  ELSE(HAVE_LIBRICHACL)
-    UNSET(LIBRICHACL_PKGCONFIG_VERSION CACHE)
   ENDIF(HAVE_LIBRICHACL)
 
   CHECK_STRUCT_HAS_MEMBER("struct richace" e_type "sys/richacl.h"
@@ -2117,6 +2150,8 @@ CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" OPENSSL)
 # Libmd has to be probed after OpenSSL.
 CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA512" LIBMD)
 
+CHECK_CRYPTO_WIN("MD5;SHA1;SHA256;SHA384;SHA512")
+
 # Check visibility annotations
 SET(OLD_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
 SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fvisibility=hidden -Werror")
@@ -2140,7 +2175,7 @@ INCLUDE(CreatePkgConfigFile)
 #
 # Register installation of PDF documents.
 #
-IF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
+IF(WIN32 AND NOT CYGWIN)
   #
   # On Windows platform, It's better that we install PDF documents
   # on one's computer.
@@ -2152,7 +2187,7 @@ IF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
             FILES_MATCHING PATTERN "*.pdf"
     )
   ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doc/pdf)
-ENDIF(WIN32 AND NOT CYGWIN AND ENABLE_INSTALL)
+ENDIF(WIN32 AND NOT CYGWIN)
 #
 #
 #

COPYING

@@ -20,7 +20,7 @@ the actual statements in the files are controlling.
    libarchive/mtree.5
 
 * The following source files are in the public domain:
-   libarchive/archive_parse_date.c
+   libarchive/archive_getdate.c
 
 * The following source files are triple-licensed with the ability to choose
   from CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses:

Makefile.am

@@ -96,73 +96,61 @@ distclean-local:
 
 include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
 
-noinst_HEADERS= \
-	libarchive/archive_acl_private.h \
-	libarchive/archive_cmdline_private.h \
-	libarchive/archive_crc32.h \
-	libarchive/archive_cryptor_private.h \
-	libarchive/archive_digest_private.h \
-	libarchive/archive_endian.h \
-	libarchive/archive_entry.h \
-	libarchive/archive_entry_locale.h \
-	libarchive/archive_entry_private.h \
-	libarchive/archive_hmac_private.h \
-	libarchive/archive_openssl_evp_private.h \
-	libarchive/archive_openssl_hmac_private.h \
-	libarchive/archive_options_private.h \
-	libarchive/archive_pack_dev.h \
-	libarchive/archive_pathmatch.h \
-	libarchive/archive_platform.h \
-	libarchive/archive_platform_acl.h \
-	libarchive/archive_platform_stat.h \
-	libarchive/archive_platform_xattr.h \
-	libarchive/archive_ppmd7_private.h \
-	libarchive/archive_ppmd8_private.h \
-	libarchive/archive_ppmd_private.h \
-	libarchive/archive_private.h \
-	libarchive/archive_random_private.h \
-	libarchive/archive_rb.h \
-	libarchive/archive_read_disk_private.h \
-	libarchive/archive_read_private.h \
-	libarchive/archive_string.h \
-	libarchive/archive_string_composition.h \
-	libarchive/archive_time_private.h \
-	libarchive/archive_write_disk_private.h \
-	libarchive/archive_write_private.h \
-	libarchive/archive_write_set_format_private.h \
-	libarchive/archive_xxhash.h \
-	libarchive/config_freebsd.h \
-	libarchive/filter_fork.h
-
 libarchive_la_SOURCES= \
 	libarchive/archive_acl.c \
+	libarchive/archive_acl_private.h \
 	libarchive/archive_check_magic.c \
 	libarchive/archive_cmdline.c \
+	libarchive/archive_cmdline_private.h \
+	libarchive/archive_crc32.h \
 	libarchive/archive_cryptor.c \
+	libarchive/archive_cryptor_private.h \
 	libarchive/archive_digest.c \
+	libarchive/archive_digest_private.h \
+	libarchive/archive_endian.h \
 	libarchive/archive_entry.c \
+	libarchive/archive_entry.h \
 	libarchive/archive_entry_copy_stat.c \
 	libarchive/archive_entry_link_resolver.c \
+	libarchive/archive_entry_locale.h \
+	libarchive/archive_entry_private.h \
 	libarchive/archive_entry_sparse.c \
 	libarchive/archive_entry_stat.c \
 	libarchive/archive_entry_strmode.c \
 	libarchive/archive_entry_xattr.c \
+	libarchive/archive_getdate.c \
+	libarchive/archive_getdate.h \
 	libarchive/archive_hmac.c \
+	libarchive/archive_hmac_private.h \
 	libarchive/archive_match.c \
+	libarchive/archive_openssl_evp_private.h \
+	libarchive/archive_openssl_hmac_private.h \
 	libarchive/archive_options.c \
+	libarchive/archive_options_private.h \
+	libarchive/archive_pack_dev.h \
 	libarchive/archive_pack_dev.c \
-	libarchive/archive_parse_date.c \
 	libarchive/archive_pathmatch.c \
+	libarchive/archive_pathmatch.h \
+	libarchive/archive_platform.h \
+	libarchive/archive_platform_acl.h \
+	libarchive/archive_platform_xattr.h \
+	libarchive/archive_ppmd_private.h \
 	libarchive/archive_ppmd7.c \
+	libarchive/archive_ppmd7_private.h \
 	libarchive/archive_ppmd8.c \
+	libarchive/archive_ppmd8_private.h \
+	libarchive/archive_private.h \
 	libarchive/archive_random.c \
+	libarchive/archive_random_private.h \
 	libarchive/archive_rb.c \
+	libarchive/archive_rb.h \
 	libarchive/archive_read.c \
 	libarchive/archive_read_add_passphrase.c \
 	libarchive/archive_read_append_filter.c \
 	libarchive/archive_read_data_into_fd.c \
 	libarchive/archive_read_disk_entry_from_file.c \
 	libarchive/archive_read_disk_posix.c \
+	libarchive/archive_read_disk_private.h \
 	libarchive/archive_read_disk_set_standard_lookup.c \
 	libarchive/archive_read_extract.c \
 	libarchive/archive_read_extract2.c \
@@ -170,11 +158,12 @@ libarchive_la_SOURCES= \
 	libarchive/archive_read_open_file.c \
 	libarchive/archive_read_open_filename.c \
 	libarchive/archive_read_open_memory.c \
+	libarchive/archive_read_private.h \
 	libarchive/archive_read_set_format.c \
 	libarchive/archive_read_set_options.c \
 	libarchive/archive_read_support_filter_all.c \
-	libarchive/archive_read_support_filter_by_code.c \
 	libarchive/archive_read_support_filter_bzip2.c \
+	libarchive/archive_read_support_filter_by_code.c \
 	libarchive/archive_read_support_filter_compress.c \
 	libarchive/archive_read_support_filter_grzip.c \
 	libarchive/archive_read_support_filter_gzip.c \
@@ -205,12 +194,21 @@ libarchive_la_SOURCES= \
 	libarchive/archive_read_support_format_xar.c \
 	libarchive/archive_read_support_format_zip.c \
 	libarchive/archive_string.c \
+	libarchive/archive_string.h \
+	libarchive/archive_string_composition.h \
 	libarchive/archive_string_sprintf.c \
-	libarchive/archive_time.c \
 	libarchive/archive_util.c \
 	libarchive/archive_version_details.c \
 	libarchive/archive_virtual.c \
 	libarchive/archive_write.c \
+	libarchive/archive_write_disk_posix.c \
+	libarchive/archive_write_disk_private.h \
+	libarchive/archive_write_disk_set_standard_lookup.c \
+	libarchive/archive_write_open_fd.c \
+	libarchive/archive_write_open_file.c \
+	libarchive/archive_write_open_filename.c \
+	libarchive/archive_write_open_memory.c \
+	libarchive/archive_write_private.h \
 	libarchive/archive_write_add_filter.c \
 	libarchive/archive_write_add_filter_b64encode.c \
 	libarchive/archive_write_add_filter_by_name.c \
@@ -226,12 +224,6 @@ libarchive_la_SOURCES= \
 	libarchive/archive_write_add_filter_uuencode.c \
 	libarchive/archive_write_add_filter_xz.c \
 	libarchive/archive_write_add_filter_zstd.c \
-	libarchive/archive_write_disk_posix.c \
-	libarchive/archive_write_disk_set_standard_lookup.c \
-	libarchive/archive_write_open_fd.c \
-	libarchive/archive_write_open_file.c \
-	libarchive/archive_write_open_filename.c \
-	libarchive/archive_write_open_memory.c \
 	libarchive/archive_write_set_format.c \
 	libarchive/archive_write_set_format_7zip.c \
 	libarchive/archive_write_set_format_ar.c \
@@ -241,54 +233,59 @@ libarchive_la_SOURCES= \
 	libarchive/archive_write_set_format_cpio_newc.c \
 	libarchive/archive_write_set_format_cpio_odc.c \
 	libarchive/archive_write_set_format_filter_by_ext.c \
-	libarchive/archive_write_set_format_gnutar.c \
 	libarchive/archive_write_set_format_iso9660.c \
 	libarchive/archive_write_set_format_mtree.c \
 	libarchive/archive_write_set_format_pax.c \
+	libarchive/archive_write_set_format_private.h \
 	libarchive/archive_write_set_format_raw.c \
 	libarchive/archive_write_set_format_shar.c \
 	libarchive/archive_write_set_format_ustar.c \
 	libarchive/archive_write_set_format_v7tar.c \
+	libarchive/archive_write_set_format_gnutar.c \
 	libarchive/archive_write_set_format_warc.c \
 	libarchive/archive_write_set_format_xar.c \
 	libarchive/archive_write_set_format_zip.c \
 	libarchive/archive_write_set_options.c \
 	libarchive/archive_write_set_passphrase.c \
+	libarchive/archive_xxhash.h \
+	libarchive/config_freebsd.h \
 	libarchive/filter_fork_posix.c \
+	libarchive/filter_fork.h \
 	libarchive/xxhash.c
 
 if INC_WINDOWS_FILES
-noinst_HEADERS+= \
-	libarchive/archive_windows.h
 libarchive_la_SOURCES+= \
 	libarchive/archive_entry_copy_bhfi.c \
 	libarchive/archive_read_disk_windows.c \
+	libarchive/archive_windows.h \
 	libarchive/archive_windows.c \
 	libarchive/archive_write_disk_windows.c \
 	libarchive/filter_fork_windows.c
 endif
 
 if INC_BLAKE2
-noinst_HEADERS+= \
-	libarchive/archive_blake2.h \
-	libarchive/archive_blake2_impl.h
 libarchive_la_SOURCES+= \
+	libarchive/archive_blake2.h \
+	libarchive/archive_blake2_impl.h \
 	libarchive/archive_blake2s_ref.c \
 	libarchive/archive_blake2sp_ref.c
 endif
 
 if INC_LINUX_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_linux.c
-endif
+else
 if INC_SUNOS_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_sunos.c
-endif
+else
 if INC_DARWIN_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_darwin.c
-endif
+else
 if INC_FREEBSD_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_freebsd.c
 endif
+endif
+endif
+endif
 
 # -no-undefined marks that libarchive doesn't rely on symbols
 # defined in the application.  This is mandatory for cygwin.
@@ -352,24 +349,22 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = build/pkgconfig/libarchive.pc
 
 # Sources needed by all test programs
-noinst_HEADERS+= \
-	test_utils/test_common.h \
-	test_utils/test_utils.h
 test_utils_SOURCES= \
+	test_utils/test_utils.c \
+	test_utils/test_utils.h \
 	test_utils/test_main.c \
-	test_utils/test_utils.c
+	test_utils/test_common.h
 
 #
 #
 # libarchive_test program
 #
 #
-noinst_HEADERS+= \
-	libarchive/test/test.h
 libarchive_test_SOURCES= \
 	$(libarchive_la_SOURCES) \
 	$(test_utils_SOURCES) \
 	libarchive/test/read_open_memory.c \
+	libarchive/test/test.h \
 	libarchive/test/test_7zip_filename_encoding.c \
 	libarchive/test/test_acl_nfs4.c \
 	libarchive/test/test_acl_pax.c \
@@ -382,10 +377,10 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_archive_clear_error.c \
 	libarchive/test/test_archive_cmdline.c \
 	libarchive/test/test_archive_digest.c \
+	libarchive/test/test_archive_getdate.c \
 	libarchive/test/test_archive_match_owner.c \
 	libarchive/test/test_archive_match_path.c \
 	libarchive/test/test_archive_match_time.c \
-	libarchive/test/test_archive_parse_date.c \
 	libarchive/test/test_archive_pathmatch.c \
 	libarchive/test/test_archive_read.c \
 	libarchive/test/test_archive_read_add_passphrase.c \
@@ -469,7 +464,6 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_read_format_7zip_encryption_data.c \
 	libarchive/test/test_read_format_7zip_encryption_partially.c \
 	libarchive/test/test_read_format_7zip_encryption_header.c \
-	libarchive/test/test_read_format_7zip_issue2765.c \
 	libarchive/test/test_read_format_7zip_malformed.c \
 	libarchive/test/test_read_format_7zip_packinfo_digests.c \
 	libarchive/test/test_read_format_ar.c \
@@ -495,9 +489,7 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_read_format_gtar_filename.c \
 	libarchive/test/test_read_format_gtar_gz.c \
 	libarchive/test/test_read_format_gtar_lzma.c \
-	libarchive/test/test_read_format_gtar_redundant_L.c \
 	libarchive/test/test_read_format_gtar_sparse.c \
-	libarchive/test/test_read_format_gtar_sparse_length.c \
 	libarchive/test/test_read_format_gtar_sparse_skip_entry.c \
 	libarchive/test/test_read_format_huge_rpm.c \
 	libarchive/test/test_read_format_iso_Z.c \
@@ -526,21 +518,16 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_read_format_rar_encryption_header.c \
 	libarchive/test/test_read_format_rar_filter.c \
 	libarchive/test/test_read_format_rar_invalid1.c \
-	libarchive/test/test_read_format_rar_overflow.c \
 	libarchive/test/test_read_format_rar5.c \
 	libarchive/test/test_read_format_raw.c \
 	libarchive/test/test_read_format_tar.c \
-	libarchive/test/test_read_format_tar_V_negative_size.c \
 	libarchive/test/test_read_format_tar_concatenated.c \
 	libarchive/test/test_read_format_tar_empty_pax.c \
 	libarchive/test/test_read_format_tar_empty_filename.c \
 	libarchive/test/test_read_format_tar_empty_with_gnulabel.c \
 	libarchive/test/test_read_format_tar_filename.c \
 	libarchive/test/test_read_format_tar_invalid_pax_size.c \
-	libarchive/test/test_read_format_tar_mac_metadata.c \
-	libarchive/test/test_read_format_tar_pax_g_large.c \
 	libarchive/test/test_read_format_tar_pax_large_attr.c \
-	libarchive/test/test_read_format_tar_pax_negative_time.c \
 	libarchive/test/test_read_format_tbz.c \
 	libarchive/test/test_read_format_tgz.c \
 	libarchive/test/test_read_format_tlz.c \
@@ -573,7 +560,6 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_read_format_zip_zip64.c \
 	libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c \
 	libarchive/test/test_read_large.c \
-	libarchive/test/test_read_pax_empty_val_no_nl.c \
 	libarchive/test/test_read_pax_xattr_rht_security_selinux.c \
 	libarchive/test/test_read_pax_xattr_schily.c \
 	libarchive/test/test_read_pax_truncated.c \
@@ -642,7 +628,6 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_write_format_mtree_classic_indent.c\
 	libarchive/test/test_write_format_mtree_fflags.c \
 	libarchive/test/test_write_format_mtree_no_separator.c \
-	libarchive/test/test_write_format_mtree_preset_digests.c \
 	libarchive/test/test_write_format_mtree_quoted_filename.c\
 	libarchive/test/test_write_format_pax.c \
 	libarchive/test/test_write_format_raw.c \
@@ -660,9 +645,6 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_write_format_zip.c \
 	libarchive/test/test_write_format_zip64_stream.c \
 	libarchive/test/test_write_format_zip_compression_store.c \
-	libarchive/test/test_write_format_zip_compression_zstd.c \
-	libarchive/test/test_write_format_zip_compression_bzip2.c \
-	libarchive/test/test_write_format_zip_compression_lzmaxz.c \
 	libarchive/test/test_write_format_zip_empty.c \
 	libarchive/test/test_write_format_zip_empty_zip64.c \
 	libarchive/test/test_write_format_zip_entry_size_unset.c \
@@ -676,6 +658,7 @@ libarchive_test_SOURCES= \
 	libarchive/test/test_write_read_format_zip.c \
 	libarchive/test/test_xattr_platform.c \
 	libarchive/test/test_zip_filename_encoding.c
+
 libarchive_test_CPPFLAGS= \
 	-I$(top_srcdir)/libarchive \
 	-I$(top_srcdir)/libarchive/test \
@@ -688,9 +671,9 @@ libarchive_test_LDADD= $(LTLIBICONV)
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
 # above.
-libarchive/test/list.h: $(libarchive_test_SOURCES)
+libarchive/test/list.h: Makefile
 	$(MKDIR_P) libarchive/test
-	grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
+	cat $(top_srcdir)/libarchive/test/test_*.c | grep '^DEFINE_TEST' > libarchive/test/list.h
 
 libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
 
@@ -710,7 +693,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_compat_lz4_2.tar.lz4.uu \
 	libarchive/test/test_compat_lz4_3.tar.lz4.uu \
 	libarchive/test/test_compat_lz4_B4.tar.lz4.uu \
-	libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu \
 	libarchive/test/test_compat_lz4_B4BD.tar.lz4.uu \
 	libarchive/test/test_compat_lz4_B4BDBX.tar.lz4.uu \
 	libarchive/test/test_compat_lz4_B5.tar.lz4.uu \
@@ -817,23 +799,17 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_7zip_encryption_header.7z.uu \
 	libarchive/test/test_read_format_7zip_encryption_partially.7z.uu \
 	libarchive/test/test_read_format_7zip_extract_second.7z.uu \
-	libarchive/test/test_read_format_7zip_issue2765.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma1.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma1_2.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma2.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma2_arm.7z.uu \
-	libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu \
-	libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma2_sparc.7z.uu \
 	libarchive/test/test_read_format_7zip_malformed.7z.uu \
 	libarchive/test/test_read_format_7zip_malformed2.7z.uu \
 	libarchive/test/test_read_format_7zip_packinfo_digests.7z.uu \
 	libarchive/test/test_read_format_7zip_ppmd.7z.uu \
-	libarchive/test/test_read_format_7zip_sfx_elf.elf.uu \
-	libarchive/test/test_read_format_7zip_sfx_modified_pe.exe.uu \
-	libarchive/test/test_read_format_7zip_sfx_pe.exe.uu \
 	libarchive/test/test_read_format_7zip_solid_zstd.7z.uu \
 	libarchive/test/test_read_format_7zip_symbolic_name.7z.uu \
 	libarchive/test/test_read_format_7zip_win_attrib.7z.uu \
@@ -859,14 +835,12 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu \
 	libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu \
 	libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu \
-	libarchive/test/test_read_format_gtar_redundant_L.tar.Z.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu \
 	libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu \
-	libarchive/test/test_read_format_gtar_sparse_length.tar.Z.uu \
 	libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu \
 	libarchive/test/test_read_format_huge_rpm.rpm.uu \
 	libarchive/test/test_read_format_iso.iso.Z.uu \
@@ -905,7 +879,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar_encryption_data.rar.uu \
 	libarchive/test/test_read_format_rar_encryption_header.rar.uu \
 	libarchive/test/test_read_format_rar_encryption_partially.rar.uu \
-	libarchive/test/test_read_format_rar_endarc_huge.rar.uu \
 	libarchive/test/test_read_format_rar_filter.rar.uu \
 	libarchive/test/test_read_format_rar_invalid1.rar.uu \
 	libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu \
@@ -913,24 +886,18 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu \
 	libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu \
 	libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu \
-	libarchive/test/test_read_format_rar_newsub_huge.rar.uu \
 	libarchive/test/test_read_format_rar_noeof.rar.uu \
-	libarchive/test/test_read_format_rar_overflow.rar.uu \
 	libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu \
 	libarchive/test/test_read_format_rar_ppmd_use_after_free.rar.uu \
 	libarchive/test/test_read_format_rar_ppmd_use_after_free2.rar.uu \
 	libarchive/test/test_read_format_rar_sfx.exe.uu \
 	libarchive/test/test_read_format_rar_subblock.rar.uu \
-	libarchive/test/test_read_format_rar_symlink_huge.rar.uu \
 	libarchive/test/test_read_format_rar_unicode.rar.uu \
 	libarchive/test/test_read_format_rar_windows.rar.uu \
 	libarchive/test/test_read_format_rar4_encrypted.rar.uu \
 	libarchive/test/test_read_format_rar4_encrypted_filenames.rar.uu \
 	libarchive/test/test_read_format_rar4_solid_encrypted.rar.uu \
 	libarchive/test/test_read_format_rar4_solid_encrypted_filenames.rar.uu \
-	libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu \
-	libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu \
-	libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu \
 	libarchive/test/test_read_format_rar5_encrypted.rar.uu \
 	libarchive/test/test_read_format_rar5_encrypted_filenames.rar.uu \
 	libarchive/test/test_read_format_rar5_solid_encrypted.rar.uu \
@@ -962,7 +929,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar5_multiple_files.rar.uu \
 	libarchive/test/test_read_format_rar5_multiple_files_solid.rar.uu \
 	libarchive/test/test_read_format_rar5_nonempty_dir_stream.rar.uu \
-	libarchive/test/test_read_format_rar5_dirdata.rar.uu \
 	libarchive/test/test_read_format_rar5_owner.rar.uu \
 	libarchive/test/test_read_format_rar5_readtables_overflow.rar.uu \
 	libarchive/test/test_read_format_rar5_sfx.exe.uu \
@@ -971,7 +937,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar5_stored_manyfiles.rar.uu \
 	libarchive/test/test_read_format_rar5_symlink.rar.uu \
 	libarchive/test/test_read_format_rar5_truncated_huff.rar.uu \
-	libarchive/test/test_read_format_rar5_unicode.rar.uu \
 	libarchive/test/test_read_format_rar5_win32.rar.uu \
 	libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \
 	libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \
@@ -984,22 +949,17 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_raw.data.gz.uu \
 	libarchive/test/test_read_format_raw.data.Z.uu \
 	libarchive/test/test_read_format_raw.data.uu \
-	libarchive/test/test_read_format_tar_V_negative_size.tar.uu \
 	libarchive/test/test_read_format_tar_concatenated.tar.uu \
 	libarchive/test/test_read_format_tar_empty_filename.tar.uu \
 	libarchive/test/test_read_format_tar_empty_with_gnulabel.tar.uu \
 	libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu \
 	libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu \
 	libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu \
-	libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu \
-	libarchive/test/test_read_format_tar_pax_g_large.tar.uu \
 	libarchive/test/test_read_format_tar_pax_large_attr.tar.Z.uu \
-	libarchive/test/test_read_format_tar_pax_negative_time.tar.uu \
 	libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu \
 	libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu \
 	libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu \
 	libarchive/test/test_read_format_warc.warc.uu \
-	libarchive/test/test_read_format_warc_incomplete.warc.uu \
 	libarchive/test/test_read_format_xar_doublelink.xar.uu \
 	libarchive/test/test_read_format_xar_duplicate_filename_node.xar.uu \
 	libarchive/test/test_read_format_zip.zip.uu \
@@ -1059,7 +1019,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_large_splitted_rar_ac.uu \
 	libarchive/test/test_read_large_splitted_rar_ad.uu \
 	libarchive/test/test_read_large_splitted_rar_ae.uu \
-	libarchive/test/test_read_pax_empty_val_no_nl.tar.uu \
 	libarchive/test/test_read_pax_xattr_rht_security_selinux.tar.uu \
 	libarchive/test/test_read_pax_xattr_schily.tar.uu \
 	libarchive/test/test_read_splitted_rar_aa.uu \
@@ -1071,7 +1030,6 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_splitted_rar_seek_support_ab.uu \
 	libarchive/test/test_splitted_rar_seek_support_ac.uu \
 	libarchive/test/test_write_disk_appledouble.cpio.gz.uu \
-	libarchive/test/test_write_disk_appledouble_zip.zip.uu \
 	libarchive/test/test_write_disk_hfs_compression.tgz.uu \
 	libarchive/test/test_write_disk_mac_metadata.tar.gz.uu \
 	libarchive/test/test_write_disk_no_hfs_compression.tgz.uu \
@@ -1081,15 +1039,14 @@ libarchive_test_EXTRA_DIST=\
 #
 # Common code for libarchive frontends (cpio, tar)
 #
-noinst_HEADERS+= \
-	libarchive_fe/lafe_err.h \
-	libarchive_fe/lafe_platform.h \
-	libarchive_fe/line_reader.h \
-	libarchive_fe/passphrase.h
 libarchive_fe_la_SOURCES= \
-	libarchive_fe/lafe_err.c \
+	libarchive_fe/err.c \
+	libarchive_fe/err.h \
+	libarchive_fe/lafe_platform.h \
 	libarchive_fe/line_reader.c \
-	libarchive_fe/passphrase.c
+	libarchive_fe/line_reader.h \
+	libarchive_fe/passphrase.c \
+	libarchive_fe/passphrase.h
 
 libarchive_fe_la_CPPFLAGS= -I$(top_srcdir)/libarchive
 #
@@ -1098,23 +1055,21 @@ libarchive_fe_la_CPPFLAGS= -I$(top_srcdir)/libarchive
 #
 #
 
-noinst_HEADERS+= \
-	tar/bsdtar.h \
-	tar/bsdtar_platform.h
 bsdtar_SOURCES= \
-	tar/bsdtar.c \
-	tar/cmdline.c \
-	tar/creation_set.c \
-	tar/read.c \
-	tar/subst.c \
-	tar/util.c \
-	tar/write.c
+		tar/bsdtar.c \
+		tar/bsdtar.h \
+		tar/bsdtar_platform.h \
+		tar/cmdline.c \
+		tar/creation_set.c \
+		tar/read.c \
+		tar/subst.c \
+		tar/util.c \
+		tar/write.c
 
 if INC_WINDOWS_FILES
-noinst_HEADERS+= \
-	tar/bsdtar_windows.h
 bsdtar_SOURCES+= \
-	tar/bsdtar_windows.c
+		tar/bsdtar_windows.h \
+		tar/bsdtar_windows.c
 endif
 
 bsdtar_DEPENDENCIES= libarchive.la libarchive_fe.la
@@ -1151,15 +1106,12 @@ endif
 # bsdtar_test
 #
 
-noinst_HEADERS+= \
-	tar/test/test.h
-
 bsdtar_test_SOURCES= \
 	$(test_utils_SOURCES) \
+	tar/test/test.h \
 	tar/test/test_0.c \
 	tar/test/test_basic.c \
 	tar/test/test_copy.c \
-	tar/test/test_crlf_mtree.c \
 	tar/test/test_empty_mtree.c \
 	tar/test/test_extract_tar_Z.c \
 	tar/test/test_extract_tar_bz2.c \
@@ -1204,7 +1156,6 @@ bsdtar_test_SOURCES= \
 	tar/test/test_option_lz4.c \
 	tar/test/test_option_lzma.c \
 	tar/test/test_option_lzop.c \
-	tar/test/test_option_mtime.c \
 	tar/test/test_option_n.c \
 	tar/test/test_option_newer_than.c \
 	tar/test/test_option_nodump.c \
@@ -1236,9 +1187,9 @@ bsdtar_test_CPPFLAGS=\
 	-I$(top_builddir)/tar/test \
 	$(PLATFORMCPPFLAGS)
 
-tar/test/list.h: $(bsdtar_test_SOURCES)
+tar/test/list.h: Makefile
 	$(MKDIR_P) tar/test
-	grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
+	cat $(top_srcdir)/tar/test/test_*.c | grep '^DEFINE_TEST' > tar/test/list.h
 
 if BUILD_BSDTAR
 bsdtar_test_programs= bsdtar_test
@@ -1279,18 +1230,16 @@ bsdtar_test_EXTRA_DIST= \
 #
 #
 
-noinst_HEADERS+= \
-	cpio/cpio.h \
-	cpio/cpio_platform.h
 bsdcpio_SOURCES= \
-	cpio/cmdline.c \
-	cpio/cpio.c
+		cpio/cmdline.c \
+		cpio/cpio.c \
+		cpio/cpio.h \
+		cpio/cpio_platform.h
 
 if INC_WINDOWS_FILES
-noinst_HEADERS+= \
-	cpio/cpio_windows.h
 bsdcpio_SOURCES+= \
-	cpio/cpio_windows.c
+		cpio/cpio_windows.h \
+		cpio/cpio_windows.c
 endif
 
 bsdcpio_DEPENDENCIES = libarchive.la libarchive_fe.la
@@ -1329,11 +1278,10 @@ endif
 # bsdcpio_test
 #
 
-noinst_HEADERS+= \
-	cpio/test/test.h
 bsdcpio_test_SOURCES= \
 	$(test_utils_SOURCES) \
 	cpio/cmdline.c \
+	cpio/test/test.h \
 	cpio/test/test_0.c \
 	cpio/test/test_basic.c \
 	cpio/test/test_cmdline.c \
@@ -1392,9 +1340,9 @@ bsdcpio_test_CPPFLAGS= \
 	$(PLATFORMCPPFLAGS)
 bsdcpio_test_LDADD=libarchive_fe.la
 
-cpio/test/list.h: $(bsdcpio_test_SOURCES)
+cpio/test/list.h: Makefile
 	$(MKDIR_P) cpio/test
-	grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
+	cat $(top_srcdir)/cpio/test/test_*.c | grep '^DEFINE_TEST' > cpio/test/list.h
 
 if BUILD_BSDCPIO
 bsdcpio_test_programs= bsdcpio_test
@@ -1439,15 +1387,13 @@ bsdcpio_test_EXTRA_DIST= \
 #
 #
 
-noinst_HEADERS+= \
-	cat/bsdcat.h \
-	cat/bsdcat_platform.h
 bsdcat_SOURCES= \
-	cat/bsdcat.c \
-	cat/cmdline.c
+		cat/bsdcat.c \
+		cat/bsdcat.h \
+		cat/bsdcat_platform.h \
+		cat/cmdline.c
 
 if INC_WINDOWS_FILES
-noinst_HEADERS+=
 bsdcat_SOURCES+=
 endif
 
@@ -1484,10 +1430,9 @@ endif
 # bsdcat_test
 #
 
-noinst_HEADERS+= \
-	cat/test/test.h
 bsdcat_test_SOURCES= \
 	$(test_utils_SOURCES) \
+	cat/test/test.h \
 	cat/test/test_0.c \
 	cat/test/test_empty_gz.c \
 	cat/test/test_empty_lz4.c \
@@ -1515,9 +1460,9 @@ bsdcat_test_CPPFLAGS= \
 	$(PLATFORMCPPFLAGS)
 bsdcat_test_LDADD=libarchive_fe.la
 
-cat/test/list.h: $(bsdcat_test_SOURCES)
+cat/test/list.h: Makefile
 	$(MKDIR_P) cat/test
-	grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
+	cat $(top_srcdir)/cat/test/test_*.c | grep '^DEFINE_TEST' > cat/test/list.h
 
 if BUILD_BSDCAT
 bsdcat_test_programs= bsdcat_test
@@ -1548,18 +1493,16 @@ bsdcat_test_EXTRA_DIST= \
 #
 #
 
-noinst_HEADERS+= \
-	unzip/bsdunzip.h \
-	unzip/bsdunzip_platform.h \
-	unzip/la_getline.h \
-	unzip/la_queue.h
 bsdunzip_SOURCES= \
-	unzip/bsdunzip.c \
-	unzip/cmdline.c \
-	unzip/la_getline.c
+		unzip/bsdunzip.c \
+		unzip/bsdunzip.h \
+		unzip/bsdunzip_platform.h \
+		unzip/cmdline.c \
+		unzip/la_getline.c \
+		unzip/la_getline.h \
+		unzip/la_queue.h
 
 if INC_WINDOWS_FILES
-noinst_HEADERS+=
 bsdunzip_SOURCES+=
 endif
 
@@ -1596,10 +1539,9 @@ endif
 # bsdunzip_test
 #
 
-noinst_HEADERS+= \
-	unzip/test/test.h
 bsdunzip_test_SOURCES= \
 	$(test_utils_SOURCES) \
+	unzip/test/test.h \
 	unzip/test/test_0.c \
 	unzip/test/test_basic.c \
 	unzip/test/test_doubledash.c \
@@ -1630,9 +1572,9 @@ bsdunzip_test_CPPFLAGS= \
 	$(PLATFORMCPPFLAGS)
 bsdunzip_test_LDADD=libarchive_fe.la
 
-unzip/test/list.h: $(bsdunzip_test_SOURCES)
+unzip/test/list.h: Makefile
 	$(MKDIR_P) unzip/test
-	grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
+	cat $(top_srcdir)/unzip/test/test_*.c | grep '^DEFINE_TEST' > unzip/test/list.h
 
 if BUILD_BSDUNZIP
 bsdunzip_test_programs= bsdunzip_test

NEWS

@@ -1,7 +1,3 @@
-May 20, 2025: libarchive 3.8.0 released
-
-Mar 30, 2025: libarchive 3.7.9 released
-
 Mar 20, 2025: libarchive 3.7.8 released
 
 Oct 13, 2024: libarchive 3.7.7 released

README.md

@@ -85,14 +85,13 @@ Currently, the library automatically detects and reads the following formats:
   * PWB binary cpio
   * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
   * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives)
-  * ZIPX archives (with support for bzip2, zstd, ppmd8, lzma and xz compressed entries)
+  * ZIPX archives (with support for bzip2, ppmd8, lzma and xz compressed entries)
   * GNU and BSD 'ar' archives
   * 'mtree' format
   * 7-Zip archives (including archives that use zstandard compression)
   * Microsoft CAB format
   * LHA and LZH archives
   * RAR and RAR 5.0 archives (with some limitations due to RAR's proprietary status)
-  * WARC archives
   * XAR archives
 
 The library also detects and handles any of the following before evaluating the archive:
@@ -121,18 +120,15 @@ The library can create archives in any of the following formats:
   * PWB binary cpio
   * shar archives
   * ZIP archives (with uncompressed or "deflate" compressed entries)
-  * ZIPX archives (with bzip2, zstd, lzma or xz compressed entries)
   * GNU and BSD 'ar' archives
   * 'mtree' format
   * ISO9660 format
-  * 7-Zip archives (including archives that use zstandard compression)
-  * WARC archives
+  * 7-Zip archives
   * XAR archives
 
 When creating archives, the result can be filtered with any of the following:
 
   * uuencode
-  * base64
   * gzip compression
   * bzip2 compression
   * compress/LZW compression
@@ -191,7 +187,7 @@ questions we are asked about libarchive:
   libraries.  This also reduces the size of statically-linked
   binaries in environments where that matters.
 
-* The library is generally _thread-safe_ depending on the platform:
+* The library is generally _thread safe_ depending on the platform:
   it does not define any global variables of its own.  However, some
   platforms do not provide fully thread-safe versions of key C library
   functions.  On those platforms, libarchive will use the non-thread-safe
@@ -214,7 +210,7 @@ questions we are asked about libarchive:
   multiple threads.  Of course, those modules are completely
   optional and you can use the rest of libarchive without them.
 
-* The library is _not_ thread-aware, however.  It does no locking
+* The library is _not_ thread aware, however.  It does no locking
   or thread management of any kind.  If you create a libarchive
   object and need to access it from multiple threads, you will
   need to provide your own locking.
@@ -245,3 +241,4 @@ questions we are asked about libarchive:
   appropriate.  It has many advantages over other tar formats
   (including the legacy GNU tar format) and is widely supported by
   current tar implementations.
+

SECURITY.md

@@ -16,4 +16,4 @@ Please provide the following information in your report:
 - How to reproduce the issue
 
 This project is maintained by volunteers on a reasonable-effort basis. As such, we ask
-that you give us 90 days to work on a fix before public exposure.
+that you give me 90 days to work on a fix before public exposure.

build/autogen.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-set -eu
 
 PATH=/usr/local/gnu-autotools/bin/:$PATH
+export PATH
 
 # Start from one level above the build directory
 if [ -f version ]; then
@@ -49,7 +49,7 @@ perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' conf
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac
 
 # Remove developer CFLAGS if a release build is being made
-if [ -n "${MAKE_LIBARCHIVE_RELEASE:-}" ]; then
+if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then
   perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am
   perl -p -i -e 's/CMAKE_BUILD_TYPE "[A-Za-z]*"/CMAKE_BUILD_TYPE "Release"/' CMakeLists.txt
 fi

build/bump-version.sh

@@ -1,5 +1,4 @@
 #!/bin/sh +v
-set -eu
 
 # Start from the build directory, where the version file is located
 if [ -f build/version ]; then

build/ci/build.sh

@@ -12,18 +12,14 @@
 # MAKE_ARGS=		# make arguments
 # DEBUG=		# set -g -fsanitize=address flags
 
-set -eu
-
 ACTIONS=
-if [ -n "${BUILD_SYSTEM:-}" ]; then
+if [ -n "${BUILD_SYSTEM}" ]; then
 	BS="${BUILD_SYSTEM}"
 fi
 
 BS="${BS:-autotools}"
 MAKE="${MAKE:-make}"
 CMAKE="${CMAKE:-cmake}"
-CMAKE_ARGS="${CMAKE_ARGS:-}"
-CONFIGURE_ARGS="${CONFIGURE_ARGS:-}"
 CURDIR=`pwd`
 SRCDIR="${SRCDIR:-`pwd`}"
 RET=0
@@ -78,7 +74,7 @@ while getopts a:b:c:d:s: opt; do
 		;;
 	esac
 done
-case "${CRYPTO:-}" in
+case "${CRYPTO}" in
 	mbedtls)
 		CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_OPENSSL=OFF -DENABLE_MBEDTLS=ON"
 		CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-openssl --with-mbedtls"
@@ -88,7 +84,7 @@ case "${CRYPTO:-}" in
 		CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-openssl --with-nettle"
 	;;
 esac
-if [ -z "${MAKE_ARGS:-}" ]; then
+if [ -z "${MAKE_ARGS}" ]; then
 	if [ "${BS}" = "autotools" ]; then
 		MAKE_ARGS="V=1"
 	elif [ "${BS}" = "cmake" ]; then
@@ -96,13 +92,13 @@ if [ -z "${MAKE_ARGS:-}" ]; then
 	fi
 fi
 if [ -d /opt/homebrew/include ]; then
-	export CFLAGS="${CFLAGS:-} -I/opt/homebrew/include"
+	export CFLAGS="${CFLAGS} -I/opt/homebrew/include"
 fi
 if [ -d /opt/homebrew/lib ]; then
-	export LDFLAGS="${LDFLAGS:-} -L/opt/homebrew/lib"
+	export LDFLAGS="${LDFLAGS} -L/opt/homebrew/lib"
 fi
-if [ -n "${DEBUG:-}" ]; then
-	if [ -n "${CFLAGS:-}" ]; then
+if [ -n "${DEBUG}" ]; then
+	if [ -n "${CFLAGS}" ]; then
 		export CFLAGS="${CFLAGS} -g -fsanitize=address"
 	else
 		export CFLAGS="-g -fsanitize=address"
@@ -114,7 +110,7 @@ fi
 if [ -z "${BS}" ]; then
 	inputerror "Missing build system (-b) parameter"
 fi
-if [ -z "${BUILDDIR:-}" ]; then
+if [ -z "${BUILDDIR}" ]; then
 	BUILDDIR="${CURDIR}/build_ci/${BS}"
 fi
 mkdir -p "${BUILDDIR}"
@@ -151,7 +147,7 @@ for action in ${ACTIONS}; do
 					;;
 			esac
 			RET="$?"
-			find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \; 2>/dev/null || /bin/true
+			find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \;
 		;;
 		install)
 			${MAKE} ${MAKE_ARGS} install DESTDIR="${BUILDDIR}/destdir"
@@ -163,7 +159,7 @@ for action in ${ACTIONS}; do
 			${MAKE} ${MAKE_ARGS} distcheck || (
 				RET="$?"
 				find . -name 'test-suite.log' -print -exec cat {} \;
-				find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \; 2>/dev/null || /bin/true
+				find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \;
 				exit "${RET}"
 			)
 			RET="$?"

build/ci/cirrus_ci/Dockerfile.cygwin

@@ -1,4 +1,4 @@
 FROM cirrusci/windowsservercore:2019
 
 RUN choco install -y --no-progress cygwin
-RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel
+RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel

build/ci/cirrus_ci/Dockerfile.fc31

@@ -1,3 +1,3 @@
 FROM fedora:31
 
-RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel
+RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel

build/ci/cirrus_ci/Dockerfile.fc31.distcheck

@@ -1,3 +1,3 @@
 FROM fedora:31
 
-RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip
+RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip

build/ci/cirrus_ci/Dockerfile.windows

@@ -9,4 +9,4 @@ RUN tar -x -f zlib-1.2.11.tar.gz
 RUN cd zlib-1.2.11 && cmake -G "Visual Studio 15 2017" . && cmake --build . --target ALL_BUILD --config Release && cmake --build . --target INSTALL --config Release
 RUN del /f /q /s zlib-1.2.11 zlib-1.2.11.tar.gz
 RUN choco install -y --no-progress cygwin
-RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel
+RUN C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel

build/ci/cirrus_ci/ci.cmd

@@ -13,7 +13,7 @@ IF "%1%"=="prepare" (
   IF "%BE%"=="cygwin-gcc" (
     @ECHO ON
     choco install -y --no-progress cygwin || EXIT /b 1
-    C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel || EXIT /b 1
+    C:\tools\cygwin\cygwinsetup.exe -q -P make,autoconf,automake,cmake,gcc-core,binutils,libtool,pkg-config,bison,sharutils,zlib-devel,libbz2-devel,liblzma-devel,liblz4-devel,libiconv-devel,libxml2-devel,libzstd-devel,libssl-devel || EXIT /b 1
     @EXIT /b 0
   ) ELSE IF "%BE%"=="mingw-gcc" (
     @ECHO ON

build/ci/cirrus_ci/ci.sh

@@ -1,12 +1,4 @@
 #!/bin/sh
-set -eu
-
-if [ $# != 1 ]
-then
-	echo "Usage: $0 prepare | test"
-	exit 1
-fi
-
 UNAME=`uname`
 if [ "$1" = "prepare" ]
 then
@@ -23,7 +15,7 @@ then
 		tunefs -N enable /dev/$MD
 		mount /dev/$MD /tmp_acl_nfsv4
 		chmod 1777 /tmp_acl_nfsv4
-		pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd gmake
+		pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd
 	elif [ "${UNAME}" = "Darwin" ]
 	then
 		set -x -e
@@ -37,10 +29,10 @@ then
 		if [ -f "/etc/debian_version" ]
 		then
 			apt-get -y update
-			apt-get -y install build-essential locales automake libtool bison pkgconf libacl1-dev libbz2-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake
+			apt-get -y install build-essential locales automake libtool bison sharutils pkgconf libacl1-dev libbz2-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake
 		elif [ -f "/etc/fedora-release" ]
 		then
-			dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison pkgconf libacl-devel librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel
+			dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel
 		fi
 	fi
 elif [ "$1" = "test" ]
@@ -61,6 +53,6 @@ then
 		TMPDIR=/tmp_acl_nfsv4 ${BIN_SUBDIR}/libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4
 	fi
 else
-	echo "Usage: $0 prepare | test"
+	echo "Usage $0 prepare | test_nfsv4_acls"
 	exit 1
 fi

build/ci/github_actions/install-macos-dependencies.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-set -eux
-
-# Uncommenting these adds a full minute to the CI time
-#brew update > /dev/null
-#brew upgrade > /dev/null
-
-# Workaround for cmake in local/pinned tap issue
-brew uninstall cmake
-
-# This does an upgrade if the package is already installed
-brew install \
-	autoconf \
-	automake \
-	libtool \
-	pkg-config \
-	cmake \
-	xz \
-	lz4 \
-	zstd \
-	libxml2 \
-	openssl

build/ci/github_actions/macos.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ "$1" = "prepare" ]
+then
+	set -x -e
+	#Uncommenting these adds a full minute to the CI time
+	#brew update > /dev/null
+	#brew upgrade > /dev/null
+
+	# This does an upgrade if the package is already installed
+	brew install \
+		autoconf \
+		automake \
+		libtool \
+		pkg-config \
+		cmake \
+		xz \
+		lz4 \
+		zstd \
+		libxml2 \
+		openssl
+fi

build/ci/travis_ci.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+UNAME=`uname`
+CURDIR=`pwd`
+SRCDIR="${SRCDIR:-`pwd`}"
+if [ -z "${BUILDDIR}" ]; then
+        BUILDDIR="${CURDIR}/build_ci/${BS}"
+fi
+mkdir -p "${BUILDDIR}"
+cd "${BUILDDIR}"
+case "$UNAME" in
+	MSYS*)
+	if [ "${BS}" = "msbuild" ]; then
+		set -x
+		cmake -G "Visual Studio 15 2017" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}"
+		cmake --build . --target ALL_BUILD
+		# Until fixed, we don't run tests on Windows (lots of fails + timeout)
+		#export SKIP_TEST_FUZZ=1
+		#cmake --build . --target RUN_TESTS
+		set +x
+	elif [ "${BS}" = "mingw" ]; then
+		set -x
+		cmake -G "MSYS Makefiles" -D CMAKE_C_COMPILER="${CC}" -D CMAKE_MAKE_PROGRAM="mingw32-make" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}"
+		mingw32-make
+		#export SKIP_TEST_FUZZ=1
+		#mingw32-make test
+		set +x
+	else
+		echo "Unknown or unspecified build type: ${BS}"
+		exit 1
+	fi
+	;;
+esac

build/clean.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-set -eu
 
 #
 # Attempt to remove as many generated files as we can.

build/cmake/CreatePkgConfigFile.cmake

@@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc.in
 # And install it, of course ;).
 IF(ENABLE_INSTALL)
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc
-          DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+          DESTINATION "lib/pkgconfig")
 ENDIF()

build/cmake/LibarchiveCodeCoverage.cmake

@@ -19,13 +19,13 @@
 #    xdg-open coverage/index.html
 #################################################################
 
-# Find programs we need
+# Find programs we need 
 FIND_PROGRAM(LCOV_EXECUTABLE lcov DOC "Full path to lcov executable")
 FIND_PROGRAM(GENHTML_EXECUTABLE genhtml DOC "Full path to genhtml executable")
 MARK_AS_ADVANCED(LCOV_EXECUTABLE GENHTML_EXECUTABLE)
 
 # Check, compiler, build types and programs are available
-IF(NOT CMAKE_C_COMPILER_ID STREQUAL "GNU")
+IF(NOT CMAKE_COMPILER_IS_GNUCC)
 MESSAGE(FATAL_ERROR "Coverage can only be built on GCC")
 ELSEIF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 MESSAGE(FATAL_ERROR "Coverage can only be built in Debug mode")
@@ -33,7 +33,7 @@ ELSEIF(NOT LCOV_EXECUTABLE)
 MESSAGE(FATAL_ERROR "lcov executable not found")
 ELSEIF(NOT GENHTML_EXECUTABLE)
 MESSAGE(FATAL_ERROR "genhtml executable not found")
-ENDIF()
+ENDIF(NOT CMAKE_COMPILER_IS_GNUCC)
 
 # Enable testing if not already done
 SET(ENABLE_TEST ON)

build/cmake/config.h.in

@@ -405,12 +405,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `chroot' function. */
 #cmakedefine HAVE_CHROOT 1
 
-/* Define to 1 if you have the `closefrom' function. */
-#cmakedefine HAVE_CLOSEFROM 1
-
-/* Define to 1 if you have the `close_range' function. */
-#cmakedefine HAVE_CLOSE_RANGE 1
-
 /* Define to 1 if you have the <copyfile.h> header file. */
 #cmakedefine HAVE_COPYFILE_H 1
 
@@ -735,9 +729,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `gcc' library (-lgcc). */
 #cmakedefine HAVE_LIBGCC 1
 
-/* Define to 1 if you have the `iconv' library (-liconv). */
-#cmakedefine HAVE_LIBICONV 1
-
 /* Define to 1 if you have the `lz4' library (-llz4). */
 #cmakedefine HAVE_LIBLZ4 1
 
@@ -774,9 +765,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <libxml/xmlwriter.h> header file. */
 #cmakedefine HAVE_LIBXML_XMLWRITER_H 1
 
-/* Define to 1 if you have the <libxml/xmlversion.h> header file. */
-#cmakedefine HAVE_LIBXML_XMLVERSION_H 1
-
 /* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine HAVE_LIBZ 1
 
@@ -786,9 +774,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the ZSTD_compressStream function. */
 #cmakedefine HAVE_ZSTD_compressStream 1
 
-/* Define to 1 if you have the ZSTD_minCLevel function. */
-#cmakedefine HAVE_ZSTD_minCLevel 1
-
 /* Define to 1 if you have the <limits.h> header file. */
 #cmakedefine HAVE_LIMITS_H 1
 
@@ -880,9 +865,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <mbedtls/pkcs5.h> header file. */
 #cmakedefine HAVE_MBEDTLS_PKCS5_H 1
 
-/* Define to 1 if you have the <mbedtls/pkcs5.h> header file. */
-#cmakedefine HAVE_MBEDTLS_VERSION_H 1
-
 /* Define to 1 if you have the `mbrtowc' function. */
 #cmakedefine HAVE_MBRTOWC 1
 
@@ -928,9 +910,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <nettle/sha.h> header file. */
 #cmakedefine HAVE_NETTLE_SHA_H 1
 
-/* Define to 1 if you have the <nettle/version.h> header file. */
-#cmakedefine HAVE_NETTLE_VERSION_H 1
-
 /* Define to 1 if you have the `nl_langinfo' function. */
 #cmakedefine HAVE_NL_LANGINFO 1
 
@@ -940,9 +919,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <openssl/evp.h> header file. */
 #cmakedefine HAVE_OPENSSL_EVP_H 1
 
-/* Define to 1 if you have the <openssl/opensslv.h> header file. */
-#cmakedefine HAVE_OPENSSL_OPENSSLV_H 1
-
 /* Define to 1 if you have the <paths.h> header file. */
 #cmakedefine HAVE_PATHS_H 1
 
@@ -976,6 +952,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
+/* Define to 1 if you have the `readdir_r' function. */
+#cmakedefine HAVE_READDIR_R 1
+
 /* Define to 1 if you have the `readlink' function. */
 #cmakedefine HAVE_READLINK 1
 
@@ -1162,6 +1141,7 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine HAVE_SYS_STAT_H 1
 
+
 /* Define to 1 if you have the <sys/sysmacros.h> header file. */
 #cmakedefine HAVE_SYS_SYSMACROS_H 1
 
@@ -1285,9 +1265,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have a working FS_IOC_GETFLAGS */
 #cmakedefine HAVE_WORKING_FS_IOC_GETFLAGS 1
 
-/* Define to 1 if you have the Windows `xmllite' library (-lxmllite). */
-#cmakedefine HAVE_XMLLITE_H 1
-
 /* Define to 1 if you have the <zlib.h> header file. */
 #cmakedefine HAVE_ZLIB_H 1
 
@@ -1345,15 +1322,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #cmakedefine TIME_WITH_SYS_TIME 1
 
-/* Version number of package */
-#cmakedefine LIBATTR_PKGCONFIG_VERSION "@LIBATTR_PKGCONFIG_VERSION@"
-
-/* Version number of package */
-#cmakedefine LIBACL_PKGCONFIG_VERSION "@LIBACL_PKGCONFIG_VERSION@"
-
-/* Version number of package */
-#cmakedefine LIBRICHACL_PKGCONFIG_VERSION "@LIBRICHACL_PKGCONFIG_VERSION@"
-
 /*
  * Some platform requires a macro to use extension functions.
  */

build/makerelease.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-set -eu
 
 #
 # This script exists primarily to document some of the
@@ -9,6 +8,7 @@ set -eu
 #
 
 PATH=/usr/local/gnu-autotools/bin/:$PATH
+export PATH
 
 # Start from one level above the build directory
 if [ -f version ]; then
@@ -24,7 +24,7 @@ fi
 # Makefile.  Effectively disable it.
 export MAKEOBJDIRPREFIX=/junk
 
-set -x
+set -ex
 
 #
 # Scrub the local tree before running the build tests below.

build/release/release.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
-set -eu
-
 ID=$(docker build -q -f build/release/Dockerfile .)
 if [ -z "$ID" ]; then
 	echo "Failed to build docker image"
 	exit 1
 else
-	docker run "$ID" sh -c "tar -c -f - libarchive-*" | tar -x -f -
+	docker run $ID sh -c "tar -c -f - libarchive-*" | tar -x -f -
 fi

build/utils/gen_archive_string_composition_h.sh

@@ -1,12 +1,4 @@
 #!/bin/sh
-set -eu
-
-if [ $# != 1 ]
-then
-	echo "Usage: $0 path/to/UnicodeData.txt"
-	exit 1
-fi
-
 #
 # This needs http://unicode.org/Public/6.0.0/ucd/UnicodeData.txt
 #

build/version

@@ -1 +1 @@
-3009000
+3007008

cat/CMakeLists.txt

@@ -13,8 +13,8 @@ IF(ENABLE_CAT)
     bsdcat.h
     bsdcat_platform.h
     cmdline.c
-    ../libarchive_fe/lafe_err.c
-    ../libarchive_fe/lafe_err.h
+    ../libarchive_fe/err.c
+    ../libarchive_fe/err.h
     ../libarchive_fe/lafe_platform.h
   )
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libarchive_fe)
@@ -33,10 +33,8 @@ IF(ENABLE_CAT)
   ENDIF(ENABLE_CAT_SHARED)
 
   # Installation rules
-  IF(ENABLE_INSTALL)
-    INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
-    INSTALL_MAN(${bsdcat_MANS})
-  ENDIF(ENABLE_INSTALL)
+  INSTALL(TARGETS bsdcat RUNTIME DESTINATION bin)
+  INSTALL_MAN(${bsdcat_MANS})
 ENDIF(ENABLE_CAT)
 
 add_subdirectory(test)

cat/bsdcat.c

@@ -7,9 +7,6 @@
 
 #include "bsdcat_platform.h"
 
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -25,7 +22,7 @@
 #include <archive_entry.h>
 
 #include "bsdcat.h"
-#include "lafe_err.h"
+#include "err.h"
 
 #define	BYTES_PER_BLOCK	(20*512)
 
@@ -108,16 +105,6 @@ main(int argc, char **argv)
 	bsdcat = &bsdcat_storage;
 	memset(bsdcat, 0, sizeof(*bsdcat));
 
-#if defined(HAVE_SIGACTION) && defined(SIGCHLD)
-	{ /* Do not ignore SIGCHLD. */
-		struct sigaction sa;
-		sa.sa_handler = SIG_DFL;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = 0;
-		sigaction(SIGCHLD, &sa, NULL);
-	}
-#endif
-
 	lafe_setprogname(*argv, "bsdcat");
 
 	bsdcat->argv = argv;

cat/cmdline.c

@@ -22,7 +22,7 @@
 #endif
 
 #include "bsdcat.h"
-#include "lafe_err.h"
+#include "err.h"
 
 /*
  * Short options for bsdcat.  Please keep this sorted.

configure.ac

@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[3.9.0dev])
-m4_define([LIBARCHIVE_VERSION_N],[3009000])
+m4_define([LIBARCHIVE_VERSION_S],[3.7.8])
+m4_define([LIBARCHIVE_VERSION_N],[3007008])
 
 dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
@@ -38,7 +38,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 ARCHIVE_MINOR=$(( (LIBARCHIVE_VERSION_N() / 1000) % 1000 ))
 # Libarchive 2.7 == libtool interface 9 = 2 + 7
 # Libarchive 2.8 == libtool interface 10 = 2 + 8
-# Libarchive 2.9 == libtool interface 11 = 2 + 9
+# Libarchive 2.9 == libtool interface 11 = 2 + 8
 # Libarchive 3.0 == libtool interface 12
 # Libarchive 3.1 == libtool interface 13
 ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
@@ -258,8 +258,7 @@ AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ])
 case $host in
   *mingw* | *cygwin* | *msys*  )
   AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
-    [[#include <windows.h>
-     #ifdef _WIN32_WINNT
+    [[#ifdef _WIN32_WINNT
      # error _WIN32_WINNT already defined
      #endif
     ]],[[;]])
@@ -268,8 +267,7 @@ case $host in
     AC_DEFINE([NTDDI_VERSION], 0x05020000, [Define to '0x05020000' for Windows Server 2003 APIs.])
   ])
   AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
-    [[#include <windows.h>
-     #ifdef WINVER
+    [[#ifdef WINVER
      # error WINVER already defined
      #endif
     ]],[[;]])
@@ -377,7 +375,7 @@ AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h wctype.h])
 AC_CHECK_TYPE([suseconds_t])
 AC_CHECK_HEADERS([windows.h])
 # check windows.h first; the other headers require it.
-AC_CHECK_HEADERS([winioctl.h],[],[],
+AC_CHECK_HEADERS([wincrypt.h winioctl.h],[],[],
 [[#ifdef HAVE_WINDOWS_H
 # include <windows.h>
 #endif
@@ -401,7 +399,6 @@ if test "x$with_zlib" != "xno"; then
       int main(int argc, char **argv) { inflate(NULL, 0); return 0; }
     ]])],
     [AC_DEFINE([HAVE_ZLIB_H], [1], [Define to 1 if you have zlib >= 1.2.1])
-      AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have zlib >= 1.2.1])
       AC_MSG_RESULT([found a suitable version of zlib (>= 1.2.1)])
     ],
     [AC_MSG_RESULT([could not find a suitable version of zlib (>= 1.2.1)])
@@ -438,18 +435,12 @@ if test "x$with_bz2lib" != "xno"; then
   esac
 fi
 
-PKG_PROG_PKG_CONFIG
-
 AC_ARG_WITH([libb2],
   AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
 
 if test "x$with_libb2" != "xno"; then
   AC_CHECK_HEADERS([blake2.h])
   AC_CHECK_LIB(b2,blake2sp_init)
-  BLAKE2_PC_VER=`$PKG_CONFIG --modversion libb2`
-  if test "x$BLAKE2_PC_VER" != "x"; then
-    AC_DEFINE_UNQUOTED([LIBB2_PKGCONFIG_VERSION], ["$BLAKE2_PC_VER"], [Libb2 version coming from pkg-config.])
-  fi
 fi
 
 AM_CONDITIONAL([INC_BLAKE2], [test "x$ac_cv_lib_b2_blake2sp_init" != "xyes"])
@@ -462,17 +453,13 @@ if test "x$with_iconv" != "xno"; then
   AC_CHECK_HEADERS([iconv.h],[],[],[#include <stdlib.h>])
   if test "x$am_cv_func_iconv" = "xyes"; then
     AC_CHECK_HEADERS([localcharset.h])
+    am_save_LIBS="$LIBS"
     LIBS="${LIBS} ${LIBICONV}"
     if test -n "$LIBICONV"; then
-      AC_DEFINE([HAVE_LIBICONV], [1], [Define to 1 if you have the `iconv' library (-liconv).])
-
-      # Most platforms do not provide iconv.pc, but MSYS2 MinGW does.
-      # We add it to our Requires.private only if it exists.
-      PKG_CHECK_MODULES(ICONV_PC, [iconv], [
-        LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
-      ], [true])
+      LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
     fi
     AC_CHECK_FUNCS([locale_charset])
+    LIBS="${am_save_LIBS}"
     if test "x$ac_cv_func_locale_charset" != "xyes"; then
       # If locale_charset() is not in libiconv, we have to find libcharset.
       AC_CHECK_LIB(charset,locale_charset)
@@ -496,8 +483,6 @@ if test "x$with_zstd" != "xno"; then
   AC_CHECK_LIB(zstd,ZSTD_decompressStream)
   AC_CHECK_LIB(zstd,ZSTD_compressStream,
     AC_DEFINE([HAVE_ZSTD_compressStream], [1], [Define to 1 if you have the `zstd' library (-lzstd) with compression support.]))
-  AC_CHECK_LIB(zstd,ZSTD_minCLevel,
-    AC_DEFINE([HAVE_ZSTD_minCLevel], [1], [Define to 1 if you have a `zstd' library version with ZSTD_minCLevel().]))
 fi
 
 AC_ARG_WITH([lzma],
@@ -568,7 +553,7 @@ if test "x$with_xml2" != "xno"; then
   ], [
     AC_CHECK_LIB(xml2,xmlInitParser)
   ])
-  AC_CHECK_HEADERS([libxml/xmlreader.h libxml/xmlwriter.h libxml/xmlversion.h])
+  AC_CHECK_HEADERS([libxml/xmlreader.h libxml/xmlwriter.h])
 fi
 if test "x$ac_cv_header_libxml_xmlreader_h" != "xyes"; then
   if test "x$with_expat" != "xno"; then
@@ -821,20 +806,16 @@ AC_FUNC_VPRINTF
 # To avoid necessity for including windows.h or special forward declaration
 # workarounds, we use 'void *' for 'struct SECURITY_ATTRIBUTES *'
 AC_CHECK_STDCALL_FUNC([CreateHardLinkA],[const char *, const char *, void *])
-AC_CHECK_FUNCS([arc4random_buf chflags chown chroot])
-AC_CHECK_FUNCS([closefrom close_range ctime_r])
+AC_CHECK_FUNCS([arc4random_buf chflags chown chroot ctime_r])
 AC_CHECK_FUNCS([fchdir fchflags fchmod fchown fcntl fdopendir fnmatch fork])
 AC_CHECK_FUNCS([fstat fstatat fstatfs fstatvfs ftruncate])
 AC_CHECK_FUNCS([futimens futimes futimesat])
-AC_CHECK_FUNCS([getegid geteuid getline getpid getresgid getresuid])
-AC_CHECK_FUNCS([getgrgid_r getgrnam_r getpwnam_r getpwuid_r])
-AC_CHECK_FUNCS([getvfsbyname gmtime_r])
-AC_CHECK_FUNCS([issetugid])
+AC_CHECK_FUNCS([geteuid getline getpid getgrgid_r getgrnam_r])
+AC_CHECK_FUNCS([getpwnam_r getpwuid_r getvfsbyname gmtime_r])
 AC_CHECK_FUNCS([lchflags lchmod lchown link linkat localtime_r lstat lutimes])
 AC_CHECK_FUNCS([mbrtowc memmove memset])
 AC_CHECK_FUNCS([mkdir mkfifo mknod mkstemp])
-AC_CHECK_FUNCS([nl_langinfo openat pipe poll posix_spawn posix_spawnp])
-AC_CHECK_FUNCS([readlink readlinkat])
+AC_CHECK_FUNCS([nl_langinfo openat pipe poll posix_spawnp readlink readlinkat])
 AC_CHECK_FUNCS([readpassphrase])
 AC_CHECK_FUNCS([select setenv setlocale sigaction statfs statvfs])
 AC_CHECK_FUNCS([strchr strdup strerror strncpy_s strnlen strrchr symlink])
@@ -885,6 +866,14 @@ AC_CHECK_TYPES(struct statfs,,,
 	#include <sys/mount.h>
 	])
 
+# There are several variants of readdir_r around; we only
+# accept the POSIX-compliant version.
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <dirent.h>]],
+                  [[DIR *dir; struct dirent e, *r;
+		    return(readdir_r(dir, &e, &r));]])],
+ [AC_DEFINE(HAVE_READDIR_R,1,[Define to 1 if you have a POSIX compatible readdir_r])]
+)
 # dirfd can be either a function or a macro.
 AC_LINK_IFELSE(
  [AC_LANG_PROGRAM([[#include <dirent.h>
@@ -925,10 +914,6 @@ if test "x$enable_xattr" != "xno"; then
 ])
     AC_CHECK_DECLS([XATTR_NOFOLLOW], [], [], [#include <sys/xattr.h>
 ])
-    ATTR_PC_VER=`$PKG_CONFIG --modversion libattr`
-    if test "x$ATTR_PC_VER" != "x"; then
-      AC_DEFINE_UNQUOTED([LIBATTR_PKGCONFIG_VERSION], ["$ATTR_PC_VER"], [Libattr version coming from pkg-config.])
-    fi
     if test "x$ac_cv_header_sys_xattr_h" = "xyes" \
 	 -a "x$ac_cv_have_decl_XATTR_NOFOLLOW" = "xyes"; then
 	# Darwin extended attributes support
@@ -1024,10 +1009,7 @@ AC_ARG_ENABLE([acl],
 if test "x$enable_acl" != "xno"; then
     # Libacl
     AC_CHECK_LIB([acl], [acl_get_file])
-    ACL_PC_VER=`$PKG_CONFIG --modversion libacl`
-    if test "x$ACL_PC_VER" != "x"; then
-      AC_DEFINE_UNQUOTED([LIBACL_PKGCONFIG_VERSION], ["$ACL_PC_VER"], [Libacl version coming from pkg-config.])
-    fi
+
     AC_CHECK_TYPES([acl_t, acl_entry_t, acl_permset_t, acl_tag_t], [], [], [
       #if HAVE_SYS_TYPES_H
       #include <sys/types.h>
@@ -1038,10 +1020,7 @@ if test "x$enable_acl" != "xno"; then
     ])
 
     AC_CHECK_LIB([richacl], [richacl_get_file])
-    RICHACL_PC_VER=`$PKG_CONFIG --modversion librichacl`
-    if test "x$RICHACL_PC_VER" != "x"; then
-      AC_DEFINE_UNQUOTED([LIBRICHACL_PKGCONFIG_VERSION], ["$RICHACL_PC_VER"], [Librichacl version coming from pkg-config.])
-    fi
+
     AC_CHECK_TYPES([[struct richace], [struct richacl]], [], [], [
       #if HAVE_SYS_RICHACL_H
       #include <sys/richacl.h>
@@ -1324,7 +1303,6 @@ fi
 
 if test "x$with_mbedtls" = "xyes"; then
     AC_CHECK_HEADERS([mbedtls/aes.h mbedtls/md.h mbedtls/pkcs5.h])
-    AC_CHECK_HEADERS([mbedtls/version.h])
     saved_LIBS=$LIBS
     AC_CHECK_LIB(mbedcrypto,mbedtls_sha1_init)
     CRYPTO_CHECK(MD5, MBEDTLS, md5)
@@ -1341,7 +1319,6 @@ fi
 if test "x$with_nettle" = "xyes"; then
     AC_CHECK_HEADERS([nettle/md5.h nettle/ripemd160.h nettle/sha.h])
     AC_CHECK_HEADERS([nettle/pbkdf2.h nettle/aes.h nettle/hmac.h])
-    AC_CHECK_HEADERS([nettle/version.h])
     saved_LIBS=$LIBS
     AC_CHECK_LIB(nettle,nettle_sha1_init)
     CRYPTO_CHECK(MD5, NETTLE, md5)
@@ -1356,7 +1333,7 @@ if test "x$with_nettle" = "xyes"; then
 fi
 
 if test "x$with_openssl" != "xno"; then
-    AC_CHECK_HEADERS([openssl/evp.h openssl/opensslv.h])
+    AC_CHECK_HEADERS([openssl/evp.h])
     saved_LIBS=$LIBS
     LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libcrypto"
     AC_CHECK_LIB(crypto,OPENSSL_config)

contrib/android/Android.mk

@@ -26,8 +26,6 @@ LOCAL_PATH := $(subst /contrib/android,,$(call my-dir))
 libarchive_target_config := contrib/android/config/android.h
 
 libarchive_src_files := libarchive/archive_acl.c \
-						libarchive/archive_blake2s_ref.c \
-						libarchive/archive_blake2sp_ref.c \
 						libarchive/archive_check_magic.c \
 						libarchive/archive_cmdline.c \
 						libarchive/archive_cryptor.c \
@@ -39,14 +37,13 @@ libarchive_src_files := libarchive/archive_acl.c \
 						libarchive/archive_entry_stat.c \
 						libarchive/archive_entry_strmode.c \
 						libarchive/archive_entry_xattr.c \
+						libarchive/archive_getdate.c \
 						libarchive/archive_hmac.c \
 						libarchive/archive_match.c \
 						libarchive/archive_options.c \
 						libarchive/archive_pack_dev.c \
-						libarchive/archive_parse_date.c \
 						libarchive/archive_pathmatch.c \
 						libarchive/archive_ppmd7.c \
-						libarchive/archive_ppmd8.c \
 						libarchive/archive_random.c \
 						libarchive/archive_rb.c \
 						libarchive/archive_read.c \
@@ -89,7 +86,6 @@ libarchive_src_files := libarchive/archive_acl.c \
 						libarchive/archive_read_support_format_lha.c \
 						libarchive/archive_read_support_format_mtree.c \
 						libarchive/archive_read_support_format_rar.c \
-						libarchive/archive_read_support_format_rar5.c \
 						libarchive/archive_read_support_format_raw.c \
 						libarchive/archive_read_support_format_tar.c \
 						libarchive/archive_read_support_format_warc.c \
@@ -97,7 +93,6 @@ libarchive_src_files := libarchive/archive_acl.c \
 						libarchive/archive_read_support_format_zip.c \
 						libarchive/archive_string.c \
 						libarchive/archive_string_sprintf.c \
-						libarchive/archive_time.c \
 						libarchive/archive_util.c \
 						libarchive/archive_version_details.c \
 						libarchive/archive_virtual.c \
@@ -128,9 +123,7 @@ libarchive_src_files := libarchive/archive_acl.c \
 						libarchive/archive_write_set_format_ar.c \
 						libarchive/archive_write_set_format_by_name.c \
 						libarchive/archive_write_set_format_cpio.c \
-						libarchive/archive_write_set_format_cpio_binary.c \
 						libarchive/archive_write_set_format_cpio_newc.c \
-						libarchive/archive_write_set_format_cpio_odc.c \
 						libarchive/archive_write_set_format_iso9660.c \
 						libarchive/archive_write_set_format_mtree.c \
 						libarchive/archive_write_set_format_pax.c \
@@ -158,7 +151,7 @@ else
 libarchive_host_src_files :=
 endif
 
-libarchive_fe_src_files :=  libarchive_fe/lafe_err.c \
+libarchive_fe_src_files :=  libarchive_fe/err.c \
 							libarchive_fe/line_reader.c \
 							libarchive_fe/passphrase.c
 
@@ -312,17 +305,4 @@ LOCAL_SRC_FILES := $(bsdcat_src_files)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/libarchive $(LOCAL_PATH)/libarchive_fe $(LOCAL_PATH)/contrib/android/include
 include $(BUILD_EXECUTABLE)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := bsdtar-recovery
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_STEM := bsdtar
-LOCAL_CFLAGS :=  -DBSDTAR_VERSION_STRING=ARCHIVE_VERSION_ONLY_STRING -DPLATFORM_CONFIG_H=\"$(libarchive_target_config)\"
-LOCAL_STATIC_LIBRARIES := libarchive libarchive_fe libz
-LOCAL_SRC_FILES := $(bsdtar_src_files)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/libarchive $(LOCAL_PATH)/libarchive_fe $(LOCAL_PATH)/contrib/android/include
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
-LOCAL_FORCE_STATIC_EXECUTABLE := true
-include $(BUILD_EXECUTABLE)
-
 endif

contrib/android/config/android.h

@@ -26,8 +26,6 @@
 #ifndef ARCHIVE_PLATFORM_H_ANDROID_INCLUDED
 #define	ARCHIVE_PLATFORM_H_ANDROID_INCLUDED
 
-#define __LIBARCHIVE_CONFIG_H_INCLUDED 1
-
 #include <android/api-level.h>
 #ifdef __ANDROID_API__
 #if __ANDROID_API__ > 20
@@ -42,8 +40,6 @@
 
 #define HAVE_CHOWN 1
 #define HAVE_CHROOT 1
-#define HAVE_CLOSEFROM 0
-#define HAVE_CLOSE_RANGE 0
 #define HAVE_CTIME_R 1
 #define HAVE_CTYPE_H 1
 #define HAVE_DECL_EXTATTR_NAMESPACE_USER 0
@@ -57,8 +53,6 @@
 #define HAVE_DECL_UINTMAX_MAX 1
 #define HAVE_DECL_UINT32_MAX 1
 #define HAVE_DECL_UINT64_MAX 1
-#define HAVE_DECL_INT32_MAX 1
-#define HAVE_DECL_INT32_MIN 1
 #define HAVE_DIRENT_H 1
 #define HAVE_DIRFD 1
 #define HAVE_DLFCN_H 1
@@ -141,7 +135,7 @@
 #define HAVE_STRING_H 1
 #define HAVE_STRRCHR 1
 #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_MTIME_NSEC 0
+#define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1
 #define HAVE_STRUCT_TM_TM_GMTOFF 1
 #define HAVE_SYMLINK 1
 #define HAVE_SYS_CDEFS_H 1

contrib/android/config/linux_host.h

@@ -28,8 +28,6 @@
 
 #define HAVE_CHOWN 1
 #define HAVE_CHROOT 1
-#define HAVE_CLOSEFROM 1
-#define HAVE_CLOSE_RANGE 1
 #define HAVE_CTIME_R 1
 #define HAVE_CTYPE_H 1
 #define HAVE_DECL_EXTATTR_NAMESPACE_USER 0
@@ -182,7 +180,7 @@
 #define HAVE_WMEMCMP 1
 #define HAVE_WMEMCPY 1
 #define HAVE_ZLIB_H 1
-#define ICONV_CONST
+#define ICONV_CONST 
 #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 #define SIZEOF_WCHAR_T 4
 #define STDC_HEADERS 1

contrib/android/config/windows_host.h

@@ -175,12 +175,6 @@
 /* Define to 1 if you have the `chroot' function. */
 /* #undef HAVE_CHROOT */
 
-/* Define to 1 if you have the `closefrom' function. */
-/* #undef HAVE_CLOSEFROM */
-
-/* Define to 1 if you have the `close_range' function. */
-/* #undef HAVE_CLOSE_RANGE */
-
 /* Define to 1 if you have the <copyfile.h> header file. */
 /* #undef HAVE_COPYFILE_H */
 
@@ -626,6 +620,9 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
+/* Define to 1 if you have a POSIX compatible readdir_r */
+#define HAVE_READDIR_R 1
+
 /* Define to 1 if you have the `readlink' function. */
 /* #undef HAVE_READLINK */
 
@@ -899,6 +896,9 @@
 /* Define to 1 if you have the <wctype.h> header file. */
 #define HAVE_WCTYPE_H 1
 
+/* Define to 1 if you have the <wincrypt.h> header file. */
+#define HAVE_WINCRYPT_H 1
+
 /* Define to 1 if you have the <windows.h> header file. */
 #define HAVE_WINDOWS_H 1
 

contrib/android/include/android_lf.h

@@ -1,4 +1,4 @@
-/*
+/* 
  * Macros for file64 functions
  *
  * Android does not support the macro _FILE_OFFSET_BITS=64
@@ -19,6 +19,7 @@
 #include <sys/vfs.h>
 
 //dirent.h
+#define readdir_r readdir64_r
 #define readdir readdir64
 #define dirent dirent64
 //fcntl.h

contrib/libarchive.spec

@@ -22,6 +22,7 @@ BuildRequires:  libzstd-devel
 BuildRequires:  lz4-devel
 BuildRequires:  lzo-devel
 BuildRequires:  openssl-devel
+BuildRequires:  sharutils
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 

contrib/oss-fuzz/fuzz_helpers.h

@@ -1,156 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef LIBARCHIVE_FUZZ_HELPERS_H_
-#define LIBARCHIVE_FUZZ_HELPERS_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <ftw.h>
-#include <unistd.h>
-
-#include "archive.h"
-
-// Default maximum input size for fuzzers
-static constexpr size_t kDefaultMaxInputSize = 256 * 1024;  // 256KB
-
-// Buffer structure for archive reading callbacks
-struct Buffer {
-  const uint8_t* data;
-  size_t size;
-  size_t pos;
-};
-
-// Archive read callback function
-static la_ssize_t reader_callback(struct archive* a, void* client_data,
-                                  const void** buffer) {
-  (void)a;
-  Buffer* buf = static_cast<Buffer*>(client_data);
-
-  if (buf->pos >= buf->size) {
-    return 0;  // EOF
-  }
-
-  *buffer = buf->data + buf->pos;
-  size_t remaining = buf->size - buf->pos;
-  buf->pos = buf->size;  // Consume all remaining data
-  return static_cast<la_ssize_t>(remaining);
-}
-
-// Helper class for consuming fuzz data in structured ways
-class DataConsumer {
- public:
-  DataConsumer(const uint8_t* data, size_t size)
-      : data_(data), size_(size), pos_(0) {}
-
-  bool empty() const { return pos_ >= size_; }
-  size_t remaining() const { return size_ - pos_; }
-
-  uint8_t consume_byte() {
-    if (pos_ >= size_) return 0;
-    return data_[pos_++];
-  }
-
-  uint16_t consume_u16() {
-    uint16_t val = 0;
-    if (pos_ + 2 <= size_) {
-      val = static_cast<uint16_t>(data_[pos_]) |
-            (static_cast<uint16_t>(data_[pos_ + 1]) << 8);
-      pos_ += 2;
-    }
-    return val;
-  }
-
-  uint32_t consume_u32() {
-    uint32_t val = 0;
-    if (pos_ + 4 <= size_) {
-      val = static_cast<uint32_t>(data_[pos_]) |
-            (static_cast<uint32_t>(data_[pos_ + 1]) << 8) |
-            (static_cast<uint32_t>(data_[pos_ + 2]) << 16) |
-            (static_cast<uint32_t>(data_[pos_ + 3]) << 24);
-      pos_ += 4;
-    }
-    return val;
-  }
-
-  int64_t consume_i64() {
-    int64_t val = 0;
-    if (pos_ + 8 <= size_) {
-      for (int i = 0; i < 8; i++) {
-        val |= static_cast<int64_t>(data_[pos_ + i]) << (8 * i);
-      }
-      pos_ += 8;
-    }
-    return val;
-  }
-
-  // Consume a null-terminated string up to max_len characters
-  // Returns pointer to internal buffer (valid until next consume_string call)
-  const char* consume_string(size_t max_len) {
-    if (max_len > sizeof(string_buf_) - 1) {
-      max_len = sizeof(string_buf_) - 1;
-    }
-    size_t avail = size_ - pos_;
-    size_t len = (avail < max_len) ? avail : max_len;
-    size_t actual_len = 0;
-
-    while (actual_len < len && pos_ < size_) {
-      char c = static_cast<char>(data_[pos_++]);
-      if (c == '\0') break;
-      string_buf_[actual_len++] = c;
-    }
-    string_buf_[actual_len] = '\0';
-    return string_buf_;
-  }
-
-  // Consume raw bytes into a buffer
-  size_t consume_bytes(void* out, size_t len) {
-    size_t avail = size_ - pos_;
-    size_t to_copy = (avail < len) ? avail : len;
-    if (to_copy > 0) {
-      memcpy(out, data_ + pos_, to_copy);
-      pos_ += to_copy;
-    }
-    return to_copy;
-  }
-
-  // Get remaining data as a buffer
-  const uint8_t* remaining_data() const {
-    return data_ + pos_;
-  }
-
- private:
-  const uint8_t* data_;
-  size_t size_;
-  size_t pos_;
-  char string_buf_[512];
-};
-
-// Callback for nftw to remove files/directories
-static int remove_callback(const char* fpath, const struct stat* sb,
-                           int typeflag, struct FTW* ftwbuf) {
-  (void)sb;
-  (void)typeflag;
-  (void)ftwbuf;
-  return remove(fpath);
-}
-
-// Recursively remove a directory tree (safer than system("rm -rf ..."))
-static int remove_directory_tree(const char* path) {
-  // nftw with FTW_DEPTH processes directory contents before the directory itself
-  return nftw(path, remove_callback, 64, FTW_DEPTH | FTW_PHYS);
-}
-
-#endif  // LIBARCHIVE_FUZZ_HELPERS_H_

contrib/oss-fuzz/libarchive_7zip_fuzzer.cc

@@ -1,63 +0,0 @@
-/*
- * 7-Zip format specific fuzzer for libarchive
- * Targets 7-Zip parsing and decompression code paths
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;  // 512KB
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable 7-Zip format specifically
-  archive_read_support_format_7zip(a);
-  // Enable all filters for 7z internal compression
-  archive_read_support_filter_all(a);
-
-  // Set passphrase for encrypted archives
-  archive_read_add_passphrase(a, "password");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    // Exercise entry metadata access
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_is_encrypted(entry);
-    archive_entry_is_data_encrypted(entry);
-    archive_entry_is_metadata_encrypted(entry);
-
-    // Read data
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_7zip_fuzzer.dict

@@ -1,47 +0,0 @@
-# 7-Zip format dictionary
-# Magic bytes
-"7z\xbc\xaf\x27\x1c"
-"\x37\x7a\xbc\xaf\x27\x1c"
-
-# Common property IDs
-"\x00"
-"\x01"
-"\x02"
-"\x03"
-"\x04"
-"\x05"
-"\x06"
-"\x07"
-"\x08"
-"\x09"
-"\x0a"
-"\x0b"
-"\x0c"
-"\x0d"
-"\x0e"
-"\x0f"
-"\x10"
-"\x11"
-"\x17"
-"\x19"
-"\x21"
-"\x23"
-"\x24"
-"\x25"
-
-# Compression method IDs
-"\x00\x00"
-"\x00\x03"
-"\x00\x04"
-"\x00\x06"
-"\x01\x01"
-"\x03\x01\x01"
-"\x04\x01\x08"
-"\x04\x02\x02"
-"\x21\x01"
-"\x30\x01\x01"
-
-# Encryption
-"\x06\xf1\x07\x01"
-"Password"
-"password"

contrib/oss-fuzz/libarchive_7zip_fuzzer.options

@@ -1,10 +0,0 @@
-[libfuzzer]
-max_len = 524288
-timeout = 60
-rss_limit_mb = 2048
-
-[honggfuzz]
-timeout = 60
-
-[afl]
-timeout = 60

contrib/oss-fuzz/libarchive_ar_fuzzer.cc

@@ -1,54 +0,0 @@
-/*
- * AR (Unix archive) format fuzzer for libarchive
- * Tests BSD and GNU ar formats
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_ar(a);
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_ar_fuzzer.dict

@@ -1,20 +0,0 @@
-# AR format dictionary
-
-# AR magic
-"!<arch>\x0a"
-
-# File header terminator
-"\x60\x0a"
-
-# Special entries
-"/"
-"//"
-"/SYM64/"
-
-# Common permissions
-"100644  "
-"100755  "
-
-# UID/GID fields
-"0     "
-"1000  "

contrib/oss-fuzz/libarchive_cab_fuzzer.cc

@@ -1,51 +0,0 @@
-/*
- * CAB (Microsoft Cabinet) format fuzzer for libarchive
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_cab(a);
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_cab_fuzzer.dict

@@ -1,23 +0,0 @@
-# CAB (Microsoft Cabinet) format dictionary
-
-# CAB signature
-"MSCF"
-"\x4d\x53\x43\x46"
-
-# Version
-"\x03\x01"
-
-# Compression types
-"\x00\x00"
-"\x01\x00"
-"\x02\x00"
-"\x03\x00"
-
-# Folder count patterns
-"\x01\x00"
-"\x02\x00"
-
-# Header flags
-"\x00\x00"
-"\x01\x00"
-"\x04\x00"

contrib/oss-fuzz/libarchive_cpio_fuzzer.cc

@@ -1,58 +0,0 @@
-/*
- * CPIO format fuzzer for libarchive
- * Tests all CPIO variants: binary, odc, newc, crc
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_cpio(a);
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-    archive_entry_ino(entry);
-    archive_entry_nlink(entry);
-    archive_entry_rdev(entry);
-    archive_entry_hardlink(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_cpio_fuzzer.dict

@@ -1,25 +0,0 @@
-# CPIO format dictionary
-
-# Binary magic (little endian)
-"\xc7\x71"
-
-# Binary magic (big endian)
-"\x71\xc7"
-
-# ASCII odc magic
-"070707"
-
-# ASCII newc magic
-"070701"
-
-# ASCII crc magic
-"070702"
-
-# Common trailer
-"TRAILER!!!"
-
-# Common field patterns
-"00000000"
-"00000001"
-"000001ed"
-"000003e8"

contrib/oss-fuzz/libarchive_encryption_fuzzer.cc

@@ -1,101 +0,0 @@
-/*
- * Encrypted archive fuzzer for libarchive
- * Tests password/passphrase handling across formats
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-// Passphrase callback for testing
-static const char *test_passphrases[] = {
-  "password",
-  "test",
-  "123456",
-  "",
-  "secret",
-  NULL
-};
-
-static int passphrase_idx = 0;
-
-static const char* passphrase_callback(struct archive *a, void *client_data) {
-  (void)a;
-  (void)client_data;
-  const char *pass = test_passphrases[passphrase_idx];
-  if (pass != NULL) {
-    passphrase_idx++;
-  }
-  return pass;
-}
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  // Reset passphrase index
-  passphrase_idx = 0;
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable all formats that support encryption
-  archive_read_support_format_zip(a);
-  archive_read_support_format_7zip(a);
-  archive_read_support_format_rar(a);
-  archive_read_support_format_rar5(a);
-  archive_read_support_filter_all(a);
-
-  // Set up passphrase callback
-  archive_read_set_passphrase_callback(a, NULL, passphrase_callback);
-
-  // Also add some static passphrases
-  archive_read_add_passphrase(a, "password");
-  archive_read_add_passphrase(a, "test123");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-  int entry_count = 0;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK && entry_count < 100) {
-    archive_entry_pathname(entry);
-
-    // Check encryption status
-    int is_encrypted = archive_entry_is_encrypted(entry);
-    int is_data_encrypted = archive_entry_is_data_encrypted(entry);
-    int is_meta_encrypted = archive_entry_is_metadata_encrypted(entry);
-    (void)is_encrypted;
-    (void)is_data_encrypted;
-    (void)is_meta_encrypted;
-
-    // Check if archive has encrypted entries
-    archive_read_has_encrypted_entries(a);
-
-    // Try to read data (may fail due to wrong password)
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-
-    entry_count++;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_encryption_fuzzer.options

@@ -1,10 +0,0 @@
-[libfuzzer]
-max_len = 524288
-timeout = 60
-rss_limit_mb = 2048
-
-[honggfuzz]
-timeout = 60
-
-[afl]
-timeout = 60

contrib/oss-fuzz/libarchive_entry_fuzzer.cc

@@ -1,105 +0,0 @@
-/*
- * Archive entry fuzzer for libarchive
- * Targets archive_entry_* functions including ACL, linkify, and metadata
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 64 * 1024;  // 64KB
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-
-  struct archive_entry *entry = archive_entry_new();
-  if (entry == NULL) {
-    return 0;
-  }
-
-  // Set basic entry properties
-  archive_entry_set_pathname(entry, consumer.consume_string(256));
-  archive_entry_set_size(entry, consumer.consume_i64());
-  archive_entry_set_mode(entry, consumer.consume_u32());
-  archive_entry_set_uid(entry, consumer.consume_u32());
-  archive_entry_set_gid(entry, consumer.consume_u32());
-  archive_entry_set_mtime(entry, consumer.consume_i64(), 0);
-  archive_entry_set_atime(entry, consumer.consume_i64(), 0);
-  archive_entry_set_ctime(entry, consumer.consume_i64(), 0);
-  archive_entry_set_birthtime(entry, consumer.consume_i64(), 0);
-
-  // Set various string fields
-  archive_entry_set_uname(entry, consumer.consume_string(64));
-  archive_entry_set_gname(entry, consumer.consume_string(64));
-  archive_entry_set_symlink(entry, consumer.consume_string(256));
-  archive_entry_set_hardlink(entry, consumer.consume_string(256));
-
-  // Exercise ACL functions (low coverage targets)
-  int acl_type = consumer.consume_byte() & 0x0F;
-  int acl_permset = consumer.consume_u32();
-  int acl_tag = consumer.consume_byte() & 0x0F;
-  int acl_qual = consumer.consume_u32();
-  const char *acl_name = consumer.consume_string(64);
-
-  archive_entry_acl_add_entry(entry, acl_type, acl_permset, acl_tag, acl_qual, acl_name);
-
-  // Add more ACL entries based on remaining data
-  while (!consumer.empty() && consumer.remaining() > 10) {
-    acl_type = consumer.consume_byte() & 0x0F;
-    acl_permset = consumer.consume_u32();
-    acl_tag = consumer.consume_byte() & 0x0F;
-    acl_qual = consumer.consume_u32();
-    acl_name = consumer.consume_string(32);
-    archive_entry_acl_add_entry(entry, acl_type, acl_permset, acl_tag, acl_qual, acl_name);
-  }
-
-  // Exercise ACL text conversion functions (archive_acl_to_text_* are uncovered)
-  ssize_t text_len;
-  char *acl_text = archive_entry_acl_to_text(entry, &text_len, ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
-  if (acl_text) {
-    // Parse the text back
-    archive_entry_acl_from_text(entry, acl_text, ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
-    free(acl_text);
-  }
-
-  acl_text = archive_entry_acl_to_text(entry, &text_len, ARCHIVE_ENTRY_ACL_TYPE_DEFAULT);
-  if (acl_text) {
-    free(acl_text);
-  }
-
-  acl_text = archive_entry_acl_to_text(entry, &text_len, ARCHIVE_ENTRY_ACL_TYPE_NFS4);
-  if (acl_text) {
-    free(acl_text);
-  }
-
-  // Exercise wide character versions
-  wchar_t *acl_text_w = archive_entry_acl_to_text_w(entry, &text_len, ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
-  if (acl_text_w) {
-    free(acl_text_w);
-  }
-
-  // Get pathname variants
-  archive_entry_pathname(entry);
-  archive_entry_pathname_w(entry);
-  archive_entry_pathname_utf8(entry);
-
-  // Clone the entry
-  struct archive_entry *entry2 = archive_entry_clone(entry);
-  if (entry2) {
-    archive_entry_free(entry2);
-  }
-
-  // Clear and reuse
-  archive_entry_clear(entry);
-
-  archive_entry_free(entry);
-  return 0;
-}

contrib/oss-fuzz/libarchive_filter_fuzzer.cc

@@ -1,65 +0,0 @@
-/*
- * Compression filter fuzzer for libarchive
- * Tests decompression of gzip, bzip2, xz, lzma, zstd, lz4, etc.
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 256 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable raw format (just decompress, no archive format)
-  archive_read_support_format_raw(a);
-
-  // Enable all compression filters
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(8192, 0);
-  struct archive_entry *entry;
-
-  if (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    // Get filter info
-    int filter_count = archive_filter_count(a);
-    for (int i = 0; i < filter_count; i++) {
-      archive_filter_name(a, i);
-      archive_filter_code(a, i);
-      archive_filter_bytes(a, i);
-    }
-
-    // Read all decompressed data
-    ssize_t total = 0;
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0) {
-      total += r;
-      // Limit total decompressed size to prevent zip bombs
-      if (total > 10 * 1024 * 1024) {
-        break;
-      }
-    }
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_filter_fuzzer.dict

@@ -1,33 +0,0 @@
-# Compression filter dictionary
-
-# GZIP magic
-"\x1f\x8b"
-"\x1f\x8b\x08"
-
-# BZIP2 magic
-"BZh"
-"BZ0"
-
-# XZ magic
-"\xfd7zXZ\x00"
-
-# LZMA magic
-"\x5d\x00\x00"
-
-# ZSTD magic
-"\x28\xb5\x2f\xfd"
-
-# LZ4 magic
-"\x04\x22\x4d\x18"
-
-# Compress (.Z) magic
-"\x1f\x9d"
-
-# LZIP magic
-"LZIP"
-
-# LRZIP magic
-"LRZI"
-
-# LZO magic
-"\x89LZO\x00\x0d\x0a\x1a\x0a"

contrib/oss-fuzz/libarchive_filter_fuzzer.options

@@ -1,10 +0,0 @@
-[libfuzzer]
-max_len = 262144
-timeout = 30
-rss_limit_mb = 2048
-
-[honggfuzz]
-timeout = 30
-
-[afl]
-timeout = 30

contrib/oss-fuzz/libarchive_fuzzer.cc

@@ -3,7 +3,20 @@
 #include <vector>
 
 #include "archive.h"
-#include "fuzz_helpers.h"
+
+struct Buffer {
+  const uint8_t *buf;
+  size_t len;
+};
+
+ssize_t reader_callback(struct archive *a, void *client_data,
+                        const void **block) {
+  Buffer *buffer = reinterpret_cast<Buffer *>(client_data);
+  *block = buffer->buf;
+  ssize_t len = buffer->len;
+  buffer->len = 0;
+  return len;
+}
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
   int ret;
@@ -13,7 +26,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
   archive_read_support_filter_all(a);
   archive_read_support_format_all(a);
 
-  Buffer buffer = {buf, len, 0};
+  Buffer buffer = {buf, len};
   archive_read_open(a, &buffer, NULL, reader_callback, NULL);
 
   std::vector<uint8_t> data_buffer(getpagesize(), 0);

contrib/oss-fuzz/libarchive_fuzzer.dict

@@ -1,76 +0,0 @@
-# General libarchive dictionary covering multiple formats
-
-# TAR magic
-"ustar"
-"ustar\x00"
-"ustar  \x00"
-"\x00\x00"
-
-# ZIP magic
-"PK\x03\x04"
-"PK\x05\x06"
-"PK\x01\x02"
-"PK\x07\x08"
-
-# 7z magic
-"7z\xbc\xaf\x27\x1c"
-
-# RAR magic
-"Rar!\x1a\x07\x00"
-"Rar!\x1a\x07\x01\x00"
-
-# XAR magic
-"xar!"
-
-# CPIO magic
-"\xc7\x71"
-"070701"
-"070702"
-"070707"
-
-# CAB magic
-"MSCF"
-
-# LHA magic
-"-lh"
-"-lz"
-
-# AR magic
-"!<arch>\x0a"
-
-# ISO9660 magic
-"CD001"
-
-# GZIP magic
-"\x1f\x8b"
-
-# BZIP2 magic
-"BZ"
-"BZh"
-
-# XZ magic
-"\xfd7zXZ\x00"
-
-# LZMA magic
-"\x5d\x00\x00"
-
-# ZSTD magic
-"\x28\xb5\x2f\xfd"
-
-# LZ4 magic
-"\x04\x22\x4d\x18"
-
-# Common paths
-"/"
-"./"
-"../"
-"./test"
-"test.txt"
-"test/"
-
-# Common attributes
-"\x00\x00\x00\x00"
-"\xff\xff\xff\xff"
-
-# Passphrase
-"password"

contrib/oss-fuzz/libarchive_fuzzer.options

@@ -1,9 +0,0 @@
-[libfuzzer]
-max_len = 524288
-timeout = 30
-
-[honggfuzz]
-timeout = 30
-
-[afl]
-timeout = 30

contrib/oss-fuzz/libarchive_iso9660_fuzzer.cc

@@ -1,58 +0,0 @@
-/*
- * ISO9660 format fuzzer for libarchive
- * Tests ISO, Joliet, and Rock Ridge extensions
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 1024 * 1024;  // 1MB for ISO images
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_iso9660(a);
-  archive_read_support_filter_all(a);
-
-  // Set options to test various ISO extensions
-  archive_read_set_options(a, "iso9660:joliet,iso9660:rockridge");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_symlink(entry);
-    archive_entry_hardlink(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_iso9660_fuzzer.dict

@@ -1,36 +0,0 @@
-# ISO9660 format dictionary
-
-# Volume descriptor type
-"\x00"
-"\x01"
-"\x02"
-"\xff"
-
-# Standard identifier
-"CD001"
-
-# Volume descriptor version
-"\x01"
-
-# Joliet escape sequences
-"%/@"
-"%/C"
-"%/E"
-
-# Rock Ridge signatures
-"SP"
-"RR"
-"CE"
-"PX"
-"PN"
-"SL"
-"NM"
-"CL"
-"PL"
-"RE"
-"TF"
-"SF"
-
-# System use
-"ER"
-"ES"

contrib/oss-fuzz/libarchive_iso9660_fuzzer.options

@@ -1,10 +0,0 @@
-[libfuzzer]
-max_len = 1048576
-timeout = 60
-rss_limit_mb = 2048
-
-[honggfuzz]
-timeout = 60
-
-[afl]
-timeout = 60

contrib/oss-fuzz/libarchive_lha_fuzzer.cc

@@ -1,54 +0,0 @@
-/*
- * LHA/LZH format fuzzer for libarchive
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_lha(a);
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_lha_fuzzer.dict

@@ -1,26 +0,0 @@
-# LHA/LZH format dictionary
-
-# Compression methods
-"-lh0-"
-"-lh1-"
-"-lh2-"
-"-lh3-"
-"-lh4-"
-"-lh5-"
-"-lh6-"
-"-lh7-"
-"-lhd-"
-"-lzs-"
-"-lz4-"
-"-lz5-"
-
-# OS type
-"\x00"
-"\x4d"
-"\x55"
-
-# Header levels
-"\x00"
-"\x01"
-"\x02"
-"\x03"

contrib/oss-fuzz/libarchive_linkify_fuzzer.cc

@@ -1,110 +0,0 @@
-/*
- * Archive entry link resolver fuzzer for libarchive
- * Targets archive_entry_linkify (complexity: 775, zero coverage)
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 64 * 1024;  // 64KB
-
-// Simple data consumer
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-
-  // Create a link resolver
-  struct archive_entry_linkresolver *resolver = archive_entry_linkresolver_new();
-  if (resolver == NULL) {
-    return 0;
-  }
-
-  // Set the format strategy based on input
-  uint8_t strategy = consumer.consume_byte() % 5;
-  int format;
-  switch (strategy) {
-    case 0: format = ARCHIVE_FORMAT_TAR_GNUTAR; break;
-    case 1: format = ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE; break;
-    case 2: format = ARCHIVE_FORMAT_CPIO_POSIX; break;
-    case 3: format = ARCHIVE_FORMAT_CPIO_SVR4_NOCRC; break;
-    default: format = ARCHIVE_FORMAT_TAR_USTAR; break;
-  }
-  archive_entry_linkresolver_set_strategy(resolver, format);
-
-  // Create multiple entries to test linkify with hardlinks
-  struct archive_entry *entries[32];
-  int num_entries = 0;
-
-  while (!consumer.empty() && num_entries < 32 && consumer.remaining() > 20) {
-    struct archive_entry *entry = archive_entry_new();
-    if (entry == NULL) break;
-
-    // Set pathname
-    archive_entry_set_pathname(entry, consumer.consume_string(64));
-
-    // Set inode and device for hardlink detection
-    archive_entry_set_ino(entry, consumer.consume_i64());
-    archive_entry_set_dev(entry, consumer.consume_u32());
-    archive_entry_set_nlink(entry, (consumer.consume_byte() % 5) + 1);
-
-    // Set mode (regular file or directory)
-    uint8_t ftype = consumer.consume_byte() % 2;
-    mode_t mode = ftype ? (S_IFDIR | 0755) : (S_IFREG | 0644);
-    archive_entry_set_mode(entry, mode);
-
-    archive_entry_set_size(entry, consumer.consume_i64() & 0xFFFF);
-    archive_entry_set_uid(entry, consumer.consume_u32() & 0xFFFF);
-    archive_entry_set_gid(entry, consumer.consume_u32() & 0xFFFF);
-
-    entries[num_entries++] = entry;
-  }
-
-  // Now run all entries through the linkresolver
-  for (int i = 0; i < num_entries; i++) {
-    struct archive_entry *entry = entries[i];
-    struct archive_entry *spare = NULL;
-
-    // This is the main function we want to fuzz (zero coverage)
-    archive_entry_linkify(resolver, &entry, &spare);
-
-    // entry and spare may be modified by linkify
-    // We still need to free the original entries we allocated
-    if (spare != NULL) {
-      archive_entry_free(spare);
-    }
-  }
-
-  // Free remaining entries from the resolver
-  struct archive_entry *entry = NULL;
-  struct archive_entry *spare = NULL;
-  while (1) {
-    archive_entry_linkify(resolver, &entry, &spare);
-    if (entry == NULL)
-      break;
-    archive_entry_free(entry);
-    entry = NULL;
-    if (spare != NULL) {
-      archive_entry_free(spare);
-      spare = NULL;
-    }
-  }
-
-  // Free all our created entries
-  for (int i = 0; i < num_entries; i++) {
-    if (entries[i] != NULL) {
-      archive_entry_free(entries[i]);
-    }
-  }
-
-  archive_entry_linkresolver_free(resolver);
-  return 0;
-}

contrib/oss-fuzz/libarchive_match_fuzzer.cc

@@ -1,96 +0,0 @@
-/*
- * Archive match fuzzer for libarchive
- * Tests pattern matching, time matching, and owner matching
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 32 * 1024;
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-
-  struct archive *match = archive_match_new();
-  if (match == NULL) {
-    return 0;
-  }
-
-  // Add various match patterns
-  while (!consumer.empty() && consumer.remaining() > 5) {
-    uint8_t match_type = consumer.consume_byte() % 6;
-
-    switch (match_type) {
-      case 0: {
-        // Pattern exclusion
-        const char *pattern = consumer.consume_string(64);
-        archive_match_exclude_pattern(match, pattern);
-        break;
-      }
-      case 1: {
-        // Pattern inclusion
-        const char *pattern = consumer.consume_string(64);
-        archive_match_include_pattern(match, pattern);
-        break;
-      }
-      case 2: {
-        // Time comparison (newer than)
-        int64_t sec = consumer.consume_i64();
-        int64_t nsec = consumer.consume_i64() % 1000000000;
-        archive_match_include_time(match, ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_NEWER,
-                                   sec, nsec);
-        break;
-      }
-      case 3: {
-        // Time comparison (older than)
-        int64_t sec = consumer.consume_i64();
-        int64_t nsec = consumer.consume_i64() % 1000000000;
-        archive_match_include_time(match, ARCHIVE_MATCH_MTIME | ARCHIVE_MATCH_OLDER,
-                                   sec, nsec);
-        break;
-      }
-      case 4: {
-        // UID inclusion
-        int64_t uid = consumer.consume_i64() & 0xFFFF;
-        archive_match_include_uid(match, uid);
-        break;
-      }
-      case 5: {
-        // GID inclusion
-        int64_t gid = consumer.consume_i64() & 0xFFFF;
-        archive_match_include_gid(match, gid);
-        break;
-      }
-    }
-  }
-
-  // Create a test entry and check if it matches
-  struct archive_entry *entry = archive_entry_new();
-  if (entry) {
-    archive_entry_set_pathname(entry, "test/file.txt");
-    archive_entry_set_mtime(entry, 1234567890, 0);
-    archive_entry_set_uid(entry, 1000);
-    archive_entry_set_gid(entry, 1000);
-    archive_entry_set_mode(entry, 0644 | 0100000);  // Regular file
-
-    // Test matching
-    archive_match_path_excluded(match, entry);
-    archive_match_time_excluded(match, entry);
-    archive_match_owner_excluded(match, entry);
-    archive_match_excluded(match, entry);
-
-    archive_entry_free(entry);
-  }
-
-  archive_match_free(match);
-  return 0;
-}

contrib/oss-fuzz/libarchive_mtree_fuzzer.cc

@@ -1,61 +0,0 @@
-/*
- * MTREE format fuzzer for libarchive
- * Tests mtree manifest parsing
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 256 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_mtree(a);
-  archive_read_support_filter_all(a);
-
-  // Enable checkfs option to test more code paths
-  archive_read_set_options(a, "mtree:checkfs");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-    archive_entry_uname(entry);
-    archive_entry_gname(entry);
-    archive_entry_symlink(entry);
-    archive_entry_fflags_text(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_mtree_fuzzer.dict

@@ -1,47 +0,0 @@
-# MTREE format dictionary
-
-# Keywords
-"/set"
-"/unset"
-".."
-
-# File types
-"type=file"
-"type=dir"
-"type=link"
-"type=block"
-"type=char"
-"type=fifo"
-"type=socket"
-
-# Attributes
-"mode="
-"uid="
-"gid="
-"uname="
-"gname="
-"size="
-"time="
-"link="
-"cksum="
-"md5="
-"md5digest="
-"sha1="
-"sha1digest="
-"sha256="
-"sha256digest="
-"sha384="
-"sha384digest="
-"sha512="
-"sha512digest="
-"rmd160="
-"rmd160digest="
-"flags="
-"nlink="
-"inode="
-"device="
-"resdevice="
-"contents="
-"optional"
-"ignore"
-"nochange"

contrib/oss-fuzz/libarchive_rar5_fuzzer.cc

@@ -1,61 +0,0 @@
-/*
- * RAR5 format specific fuzzer for libarchive
- * Targets RAR5 parsing code paths
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;  // 512KB
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable RAR5 format specifically
-  archive_read_support_format_rar5(a);
-  // Enable common filters
-  archive_read_support_filter_all(a);
-
-  // Set passphrase for encrypted archives
-  archive_read_add_passphrase(a, "password");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    // Exercise entry metadata access
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_is_encrypted(entry);
-
-    // Read data
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_rar5_fuzzer.dict

@@ -1,37 +0,0 @@
-# RAR5 format dictionary
-# Magic bytes (RAR5 signature)
-"Rar!\x1a\x07\x01\x00"
-"\x52\x61\x72\x21\x1a\x07\x01\x00"
-
-# Common header types
-"\x01"
-"\x02"
-"\x03"
-"\x04"
-"\x05"
-
-# Common flags
-"\x00\x00"
-"\x01\x00"
-"\x02\x00"
-"\x04\x00"
-
-# Compression methods
-"\x00"
-"\x01"
-"\x02"
-"\x03"
-"\x04"
-"\x05"
-
-# File attributes
-"\x20\x00\x00\x00"
-"\x10\x00\x00\x00"
-
-# Encryption marker
-"\x80"
-"password"
-"Password"
-
-# End of archive
-"\x1d\x77\x56\x51\x03\x05\x04\x00"

contrib/oss-fuzz/libarchive_rar_fuzzer.cc

@@ -1,56 +0,0 @@
-/*
- * RAR v4 format fuzzer for libarchive
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_rar(a);
-  archive_read_support_filter_all(a);
-
-  // Add passphrase for encrypted RARs
-  archive_read_add_passphrase(a, "password");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_is_encrypted(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_read_disk_fuzzer.cc

@@ -1,76 +0,0 @@
-/*
- * Archive read disk fuzzer for libarchive
- * Tests filesystem traversal and entry creation from paths
- * Security-critical: path traversal, symlink handling
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 16 * 1024;
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-
-  struct archive *a = archive_read_disk_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Configure disk reader behavior
-  uint8_t flags = consumer.consume_byte();
-  if (flags & 0x01) {
-    archive_read_disk_set_symlink_logical(a);
-  } else if (flags & 0x02) {
-    archive_read_disk_set_symlink_physical(a);
-  } else {
-    archive_read_disk_set_symlink_hybrid(a);
-  }
-
-  archive_read_disk_set_standard_lookup(a);
-
-  // Set behavior flags
-  int behavior = 0;
-  if (flags & 0x04) behavior |= ARCHIVE_READDISK_RESTORE_ATIME;
-  if (flags & 0x08) behavior |= ARCHIVE_READDISK_HONOR_NODUMP;
-  if (flags & 0x10) behavior |= ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS;
-  archive_read_disk_set_behavior(a, behavior);
-
-  // Create an entry and test entry_from_file with various paths
-  struct archive_entry *entry = archive_entry_new();
-  if (entry) {
-    // Test with /tmp (safe, always exists)
-    archive_entry_copy_pathname(entry, "/tmp");
-    archive_read_disk_entry_from_file(a, entry, -1, NULL);
-
-    // Get entry info
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-
-    // Test name lookups
-    archive_read_disk_gname(a, 0);
-    archive_read_disk_uname(a, 0);
-    archive_read_disk_gname(a, 1000);
-    archive_read_disk_uname(a, 1000);
-
-    archive_entry_free(entry);
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_roundtrip_fuzzer.cc

@@ -1,110 +0,0 @@
-/*
- * Archive roundtrip fuzzer for libarchive
- * Writes an archive then reads it back - tests write/read consistency
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 64 * 1024;
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len < 10 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-  std::vector<uint8_t> archive_data;
-  archive_data.reserve(len * 2);
-
-  // Phase 1: Write an archive
-  struct archive *writer = archive_write_new();
-  if (writer == NULL) {
-    return 0;
-  }
-
-  // Select format
-  uint8_t format = consumer.consume_byte() % 5;
-  switch (format) {
-    case 0: archive_write_set_format_pax_restricted(writer); break;
-    case 1: archive_write_set_format_ustar(writer); break;
-    case 2: archive_write_set_format_cpio_newc(writer); break;
-    case 3: archive_write_set_format_zip(writer); break;
-    default: archive_write_set_format_gnutar(writer); break;
-  }
-
-  archive_write_add_filter_none(writer);
-
-  // Open to memory
-  size_t used = 0;
-  archive_data.resize(len * 4);
-  if (archive_write_open_memory(writer, archive_data.data(), archive_data.size(), &used) != ARCHIVE_OK) {
-    archive_write_free(writer);
-    return 0;
-  }
-
-  // Write entries
-  int entry_count = 0;
-  while (!consumer.empty() && entry_count < 5 && consumer.remaining() > 10) {
-    struct archive_entry *entry = archive_entry_new();
-    if (entry == NULL) break;
-
-    archive_entry_set_pathname(entry, consumer.consume_string(32));
-    archive_entry_set_mode(entry, S_IFREG | 0644);
-    archive_entry_set_uid(entry, consumer.consume_u32() & 0xFFFF);
-    archive_entry_set_gid(entry, consumer.consume_u32() & 0xFFFF);
-
-    uint8_t data_buf[256];
-    size_t data_len = consumer.consume_bytes(data_buf, 256);
-    archive_entry_set_size(entry, data_len);
-
-    if (archive_write_header(writer, entry) == ARCHIVE_OK && data_len > 0) {
-      archive_write_data(writer, data_buf, data_len);
-    }
-
-    archive_entry_free(entry);
-    entry_count++;
-  }
-
-  archive_write_close(writer);
-  archive_write_free(writer);
-
-  if (used == 0) {
-    return 0;
-  }
-
-  // Phase 2: Read the archive back
-  struct archive *reader = archive_read_new();
-  if (reader == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_all(reader);
-  archive_read_support_filter_all(reader);
-
-  if (archive_read_open_memory(reader, archive_data.data(), used) != ARCHIVE_OK) {
-    archive_read_free(reader);
-    return 0;
-  }
-
-  std::vector<uint8_t> read_buffer(4096, 0);
-  struct archive_entry *entry;
-  while (archive_read_next_header(reader, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(reader, read_buffer.data(), read_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(reader);
-  return 0;
-}

contrib/oss-fuzz/libarchive_roundtrip_fuzzer.options

@@ -1,3 +0,0 @@
-[libfuzzer]
-max_len = 65536
-timeout = 30

contrib/oss-fuzz/libarchive_seek_fuzzer.cc

@@ -1,125 +0,0 @@
-/*
- * Archive seek/read fuzzer for libarchive
- * Tests seeking within archives and reading at random positions
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 256 * 1024;
-
-struct SeekableBuffer {
-  const uint8_t *buf;
-  size_t len;
-  size_t pos;
-};
-
-static ssize_t seek_read_callback(struct archive *a, void *client_data,
-                                  const void **block) {
-  (void)a;
-  SeekableBuffer *buffer = reinterpret_cast<SeekableBuffer *>(client_data);
-  if (buffer->pos >= buffer->len) {
-    *block = NULL;
-    return 0;
-  }
-  *block = buffer->buf + buffer->pos;
-  size_t avail = buffer->len - buffer->pos;
-  size_t to_read = (avail > 4096) ? 4096 : avail;
-  buffer->pos += to_read;
-  return to_read;
-}
-
-static la_int64_t seek_callback(struct archive *a, void *client_data,
-                                la_int64_t offset, int whence) {
-  (void)a;
-  SeekableBuffer *buffer = reinterpret_cast<SeekableBuffer *>(client_data);
-  la_int64_t new_pos;
-
-  switch (whence) {
-    case SEEK_SET:
-      new_pos = offset;
-      break;
-    case SEEK_CUR:
-      new_pos = static_cast<la_int64_t>(buffer->pos) + offset;
-      break;
-    case SEEK_END:
-      new_pos = static_cast<la_int64_t>(buffer->len) + offset;
-      break;
-    default:
-      return ARCHIVE_FATAL;
-  }
-
-  if (new_pos < 0) new_pos = 0;
-  if (new_pos > static_cast<la_int64_t>(buffer->len))
-    new_pos = static_cast<la_int64_t>(buffer->len);
-
-  buffer->pos = static_cast<size_t>(new_pos);
-  return new_pos;
-}
-
-static la_int64_t skip_callback(struct archive *a, void *client_data,
-                                la_int64_t request) {
-  (void)a;
-  SeekableBuffer *buffer = reinterpret_cast<SeekableBuffer *>(client_data);
-  size_t avail = buffer->len - buffer->pos;
-  la_int64_t to_skip = (request > static_cast<la_int64_t>(avail))
-                           ? static_cast<la_int64_t>(avail)
-                           : request;
-  buffer->pos += static_cast<size_t>(to_skip);
-  return to_skip;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable formats that benefit from seeking
-  archive_read_support_format_zip_seekable(a);
-  archive_read_support_format_7zip(a);
-  archive_read_support_format_rar(a);
-  archive_read_support_format_rar5(a);
-  archive_read_support_format_iso9660(a);
-  archive_read_support_filter_all(a);
-
-  SeekableBuffer buffer = {buf, len, 0};
-
-  archive_read_set_read_callback(a, seek_read_callback);
-  archive_read_set_seek_callback(a, seek_callback);
-  archive_read_set_skip_callback(a, skip_callback);
-  archive_read_set_callback_data(a, &buffer);
-
-  if (archive_read_open1(a) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-  int entry_count = 0;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK && entry_count < 50) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-
-    // Read data which may trigger seeks
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-
-    entry_count++;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_seek_fuzzer.options

@@ -1,3 +0,0 @@
-[libfuzzer]
-max_len = 262144
-timeout = 30

contrib/oss-fuzz/libarchive_string_fuzzer.cc

@@ -1,144 +0,0 @@
-/*
- * Archive string/encoding conversion fuzzer for libarchive
- * Tests character encoding conversions which are often vulnerability sources
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 32 * 1024;
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive_entry *entry = archive_entry_new();
-  if (entry == NULL) {
-    return 0;
-  }
-
-  // Reserve some bytes for control
-  if (len < 4) {
-    archive_entry_free(entry);
-    return 0;
-  }
-
-  uint8_t test_type = buf[0];
-  const char *str = reinterpret_cast<const char*>(buf + 1);
-  size_t str_len = len - 1;
-
-  // Ensure null termination for string operations
-  char *safe_str = static_cast<char*>(malloc(str_len + 1));
-  if (safe_str == NULL) {
-    archive_entry_free(entry);
-    return 0;
-  }
-  memcpy(safe_str, str, str_len);
-  safe_str[str_len] = '\0';
-
-  // Test various string functions based on type
-  switch (test_type % 10) {
-    case 0:
-      // Pathname conversions
-      archive_entry_set_pathname(entry, safe_str);
-      archive_entry_pathname(entry);
-      archive_entry_pathname_w(entry);
-      archive_entry_pathname_utf8(entry);
-      break;
-
-    case 1:
-      // Symlink conversions
-      archive_entry_set_symlink(entry, safe_str);
-      archive_entry_symlink(entry);
-      archive_entry_symlink_w(entry);
-      archive_entry_symlink_utf8(entry);
-      break;
-
-    case 2:
-      // Hardlink conversions
-      archive_entry_set_hardlink(entry, safe_str);
-      archive_entry_hardlink(entry);
-      archive_entry_hardlink_w(entry);
-      archive_entry_hardlink_utf8(entry);
-      break;
-
-    case 3:
-      // Username conversions
-      archive_entry_set_uname(entry, safe_str);
-      archive_entry_uname(entry);
-      archive_entry_uname_w(entry);
-      archive_entry_uname_utf8(entry);
-      break;
-
-    case 4:
-      // Group name conversions
-      archive_entry_set_gname(entry, safe_str);
-      archive_entry_gname(entry);
-      archive_entry_gname_w(entry);
-      archive_entry_gname_utf8(entry);
-      break;
-
-    case 5:
-      // Copy functions
-      archive_entry_copy_pathname(entry, safe_str);
-      archive_entry_copy_symlink(entry, safe_str);
-      archive_entry_copy_hardlink(entry, safe_str);
-      break;
-
-    case 6:
-      // UTF-8 specific
-      archive_entry_update_pathname_utf8(entry, safe_str);
-      archive_entry_update_symlink_utf8(entry, safe_str);
-      archive_entry_update_hardlink_utf8(entry, safe_str);
-      break;
-
-    case 7:
-      // Fflags text
-      archive_entry_copy_fflags_text(entry, safe_str);
-      archive_entry_fflags_text(entry);
-      break;
-
-    case 8:
-      // ACL text parsing
-      archive_entry_acl_from_text(entry, safe_str, ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
-      archive_entry_acl_from_text(entry, safe_str, ARCHIVE_ENTRY_ACL_TYPE_DEFAULT);
-      archive_entry_acl_from_text(entry, safe_str, ARCHIVE_ENTRY_ACL_TYPE_NFS4);
-      break;
-
-    case 9: {
-      // Wide character operations
-      size_t wlen = str_len;
-      wchar_t *wstr = static_cast<wchar_t*>(malloc((wlen + 1) * sizeof(wchar_t)));
-      if (wstr) {
-        mbstowcs(wstr, safe_str, wlen);
-        wstr[wlen] = L'\0';
-
-        archive_entry_copy_pathname_w(entry, wstr);
-        archive_entry_pathname_w(entry);
-
-        archive_entry_copy_symlink_w(entry, wstr);
-        archive_entry_symlink_w(entry);
-
-        free(wstr);
-      }
-      break;
-    }
-  }
-
-  // Clone and compare
-  struct archive_entry *entry2 = archive_entry_clone(entry);
-  if (entry2) {
-    archive_entry_free(entry2);
-  }
-
-  free(safe_str);
-  archive_entry_free(entry);
-  return 0;
-}

contrib/oss-fuzz/libarchive_tar_fuzzer.cc

@@ -1,86 +0,0 @@
-/*
- * TAR format fuzzer for libarchive
- * Tests all TAR variants: ustar, pax, gnutar, v7, oldgnu
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_tar(a);
-  archive_read_support_format_gnutar(a);
-  archive_read_support_filter_all(a);
-
-  // Enable various TAR options
-  archive_read_set_options(a, "tar:read_concatenated_archives,tar:mac-ext");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    // Exercise all metadata accessors
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_atime(entry);
-    archive_entry_ctime(entry);
-    archive_entry_mode(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-    archive_entry_uname(entry);
-    archive_entry_gname(entry);
-    archive_entry_symlink(entry);
-    archive_entry_hardlink(entry);
-    archive_entry_rdev(entry);
-    archive_entry_devmajor(entry);
-    archive_entry_devminor(entry);
-
-    // Test sparse file handling
-    archive_entry_sparse_reset(entry);
-    int64_t offset, length;
-    while (archive_entry_sparse_next(entry, &offset, &length) == ARCHIVE_OK) {
-      (void)offset;
-      (void)length;
-    }
-
-    // Test xattr handling
-    archive_entry_xattr_reset(entry);
-    const char *name;
-    const void *value;
-    size_t size;
-    while (archive_entry_xattr_next(entry, &name, &value, &size) == ARCHIVE_OK) {
-      (void)name;
-      (void)value;
-      (void)size;
-    }
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_tar_fuzzer.dict

@@ -1,51 +0,0 @@
-# TAR format dictionary
-
-# USTAR magic
-"ustar"
-"ustar\x00"
-"ustar  \x00"
-
-# GNU tar magic
-"GNUtar "
-"GNUtar\x00"
-
-# Common header field values
-"00000000000"
-"0000644"
-"0000755"
-"0000777"
-
-# Type flags
-"0"
-"1"
-"2"
-"3"
-"4"
-"5"
-"6"
-"7"
-"g"
-"x"
-"L"
-"K"
-
-# PAX keywords
-"path="
-"linkpath="
-"uname="
-"gname="
-"uid="
-"gid="
-"size="
-"mtime="
-"atime="
-"ctime="
-"SCHILY.xattr."
-"LIBARCHIVE.xattr."
-
-# Sparse headers
-"GNU.sparse.major="
-"GNU.sparse.minor="
-"GNU.sparse.name="
-"GNU.sparse.realsize="
-"GNU.sparse.map="

contrib/oss-fuzz/libarchive_warc_fuzzer.cc

@@ -1,50 +0,0 @@
-/*
- * WARC (Web Archive) format fuzzer for libarchive
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_warc(a);
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_warc_fuzzer.dict

@@ -1,34 +0,0 @@
-# WARC format dictionary
-
-# Version
-"WARC/1.0"
-"WARC/1.1"
-"WARC/0.17"
-"WARC/0.18"
-
-# Record types
-"warcinfo"
-"response"
-"resource"
-"request"
-"metadata"
-"revisit"
-"conversion"
-"continuation"
-
-# Headers
-"WARC-Type:"
-"WARC-Record-ID:"
-"WARC-Date:"
-"WARC-Target-URI:"
-"Content-Length:"
-"Content-Type:"
-"WARC-Block-Digest:"
-"WARC-Payload-Digest:"
-"WARC-Concurrent-To:"
-"WARC-Refers-To:"
-
-# Content types
-"application/warc-fields"
-"application/http;msgtype=request"
-"application/http;msgtype=response"

contrib/oss-fuzz/libarchive_write_disk_fuzzer.cc

@@ -1,125 +0,0 @@
-/*
- * Archive write disk fuzzer for libarchive
- * Tests extraction to filesystem
- * Security-critical: path traversal, permission handling, symlink attacks
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 64 * 1024;
-
-static char g_temp_dir[256] = {0};
-
-extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) {
-  (void)argc;
-  (void)argv;
-  // Create a temporary directory for extraction
-  snprintf(g_temp_dir, sizeof(g_temp_dir), "/tmp/fuzz_extract_XXXXXX");
-  if (mkdtemp(g_temp_dir) == NULL) {
-    g_temp_dir[0] = '\0';
-  }
-  return 0;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  if (g_temp_dir[0] == '\0') {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-
-  struct archive *disk = archive_write_disk_new();
-  if (disk == NULL) {
-    return 0;
-  }
-
-  // Configure write disk options
-  uint8_t opt_flags = consumer.consume_byte();
-  int flags = 0;
-  if (opt_flags & 0x01) flags |= ARCHIVE_EXTRACT_TIME;
-  if (opt_flags & 0x02) flags |= ARCHIVE_EXTRACT_PERM;
-  if (opt_flags & 0x04) flags |= ARCHIVE_EXTRACT_ACL;
-  if (opt_flags & 0x08) flags |= ARCHIVE_EXTRACT_FFLAGS;
-  if (opt_flags & 0x10) flags |= ARCHIVE_EXTRACT_OWNER;
-  if (opt_flags & 0x20) flags |= ARCHIVE_EXTRACT_XATTR;
-  if (opt_flags & 0x40) flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
-  if (opt_flags & 0x80) flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
-
-  archive_write_disk_set_options(disk, flags);
-  archive_write_disk_set_standard_lookup(disk);
-
-  // Create entries to extract
-  int entry_count = 0;
-  while (!consumer.empty() && entry_count < 5 && consumer.remaining() > 20) {
-    struct archive_entry *entry = archive_entry_new();
-    if (entry == NULL) break;
-
-    // Build a safe path within our temp directory
-    char safe_path[512];
-    const char *name = consumer.consume_string(32);
-    snprintf(safe_path, sizeof(safe_path), "%s/%s", g_temp_dir, name);
-
-    // Sanitize path to prevent traversal
-    char *p = safe_path;
-    while (*p) {
-      if (p[0] == '.' && p[1] == '.') {
-        p[0] = '_';
-        p[1] = '_';
-      }
-      p++;
-    }
-
-    archive_entry_set_pathname(entry, safe_path);
-
-    uint8_t ftype = consumer.consume_byte() % 3;
-    mode_t mode;
-    switch (ftype) {
-      case 0: mode = S_IFREG | 0644; break;
-      case 1: mode = S_IFDIR | 0755; break;
-      default: mode = S_IFREG | 0644; break;
-    }
-    archive_entry_set_mode(entry, mode);
-
-    archive_entry_set_uid(entry, 1000);
-    archive_entry_set_gid(entry, 1000);
-    archive_entry_set_mtime(entry, consumer.consume_i64(), 0);
-
-    // Write the entry header
-    if (archive_write_header(disk, entry) == ARCHIVE_OK) {
-      if (S_ISREG(mode)) {
-        uint8_t data_buf[256];
-        size_t data_len = consumer.consume_bytes(data_buf, 256);
-        archive_entry_set_size(entry, data_len);
-        if (data_len > 0) {
-          archive_write_data(disk, data_buf, data_len);
-        }
-      }
-      archive_write_finish_entry(disk);
-    }
-
-    archive_entry_free(entry);
-    entry_count++;
-  }
-
-  archive_write_close(disk);
-  archive_write_free(disk);
-
-  // Clean up extracted files using nftw (safer than system())
-  remove_directory_tree(g_temp_dir);
-  // Recreate the temp directory for next iteration
-  mkdir(g_temp_dir, 0700);
-
-  return 0;
-}

contrib/oss-fuzz/libarchive_write_disk_fuzzer.options

@@ -1,3 +0,0 @@
-[libfuzzer]
-max_len = 65536
-timeout = 30

contrib/oss-fuzz/libarchive_write_fuzzer.cc

@@ -1,132 +0,0 @@
-/*
- * Archive write fuzzer for libarchive
- * Tests archive creation and writing code paths
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 64 * 1024;  // 64KB
-
-// Simple data consumer
-
-// Memory write callback
-static std::vector<uint8_t> *g_output = nullptr;
-
-static ssize_t write_callback(struct archive *a, void *client_data, const void *buffer, size_t length) {
-  (void)a;
-  (void)client_data;
-  if (g_output && length > 0) {
-    const uint8_t *buf = static_cast<const uint8_t*>(buffer);
-    g_output->insert(g_output->end(), buf, buf + length);
-  }
-  return length;
-}
-
-static int close_callback(struct archive *a, void *client_data) {
-  (void)a;
-  (void)client_data;
-  return ARCHIVE_OK;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  DataConsumer consumer(buf, len);
-  std::vector<uint8_t> output;
-  g_output = &output;
-
-  struct archive *a = archive_write_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Select format based on input
-  uint8_t format_choice = consumer.consume_byte() % 8;
-  switch (format_choice) {
-    case 0: archive_write_set_format_pax_restricted(a); break;
-    case 1: archive_write_set_format_gnutar(a); break;
-    case 2: archive_write_set_format_ustar(a); break;
-    case 3: archive_write_set_format_cpio_newc(a); break;
-    case 4: archive_write_set_format_zip(a); break;
-    case 5: archive_write_set_format_7zip(a); break;
-    case 6: archive_write_set_format_xar(a); break;
-    default: archive_write_set_format_pax(a); break;
-  }
-
-  // Select compression based on input
-  uint8_t filter_choice = consumer.consume_byte() % 6;
-  switch (filter_choice) {
-    case 0: archive_write_add_filter_gzip(a); break;
-    case 1: archive_write_add_filter_bzip2(a); break;
-    case 2: archive_write_add_filter_xz(a); break;
-    case 3: archive_write_add_filter_zstd(a); break;
-    case 4: archive_write_add_filter_none(a); break;
-    default: archive_write_add_filter_none(a); break;
-  }
-
-  // Open for writing to memory
-  if (archive_write_open(a, NULL, NULL, write_callback, close_callback) != ARCHIVE_OK) {
-    archive_write_free(a);
-    g_output = nullptr;
-    return 0;
-  }
-
-  // Create entries based on remaining input
-  int entry_count = 0;
-  while (!consumer.empty() && entry_count < 10 && consumer.remaining() > 20) {
-    struct archive_entry *entry = archive_entry_new();
-    if (entry == NULL) break;
-
-    // Set entry properties
-    archive_entry_set_pathname(entry, consumer.consume_string(64));
-
-    uint8_t ftype = consumer.consume_byte() % 4;
-    mode_t mode;
-    switch (ftype) {
-      case 0: mode = S_IFREG | 0644; break;
-      case 1: mode = S_IFDIR | 0755; break;
-      case 2: mode = S_IFLNK | 0777; break;
-      default: mode = S_IFREG | 0644; break;
-    }
-    archive_entry_set_mode(entry, mode);
-
-    archive_entry_set_uid(entry, consumer.consume_u32() & 0xFFFF);
-    archive_entry_set_gid(entry, consumer.consume_u32() & 0xFFFF);
-    archive_entry_set_mtime(entry, consumer.consume_i64(), 0);
-
-    // For regular files, write some data
-    if (S_ISREG(mode)) {
-      uint8_t data_buf[1024];
-      size_t data_len = consumer.consume_bytes(data_buf, 1024);
-      archive_entry_set_size(entry, data_len);
-
-      if (archive_write_header(a, entry) == ARCHIVE_OK && data_len > 0) {
-        archive_write_data(a, data_buf, data_len);
-      }
-    } else if (S_ISLNK(mode)) {
-      archive_entry_set_symlink(entry, consumer.consume_string(64));
-      archive_entry_set_size(entry, 0);
-      archive_write_header(a, entry);
-    } else {
-      archive_entry_set_size(entry, 0);
-      archive_write_header(a, entry);
-    }
-
-    archive_entry_free(entry);
-    entry_count++;
-  }
-
-  archive_write_close(a);
-  archive_write_free(a);
-  g_output = nullptr;
-  return 0;
-}

contrib/oss-fuzz/libarchive_xar_fuzzer.cc

@@ -1,60 +0,0 @@
-/*
- * XAR format specific fuzzer for libarchive
- * Targets xar_read_header and XAR parsing code paths
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;  // 512KB
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  // Enable XAR format specifically
-  archive_read_support_format_xar(a);
-  // Enable common filters
-  archive_read_support_filter_all(a);
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    // Exercise entry metadata access
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_filetype(entry);
-    archive_entry_uid(entry);
-    archive_entry_gid(entry);
-
-    // Read data
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_xar_fuzzer.dict

@@ -1,44 +0,0 @@
-# XAR format dictionary
-# Magic bytes
-"xar!"
-"\x78\x61\x72\x21"
-
-# XML elements commonly in XAR
-"<xar>"
-"</xar>"
-"<toc>"
-"</toc>"
-"<file>"
-"</file>"
-"<name>"
-"</name>"
-"<data>"
-"</data>"
-"<encoding>"
-"</encoding>"
-"<archived-checksum>"
-"<extracted-checksum>"
-"<offset>"
-"<length>"
-"<size>"
-"<mode>"
-"<uid>"
-"<gid>"
-"<user>"
-"<group>"
-"<type>"
-"<mtime>"
-"<atime>"
-"<ctime>"
-
-# Compression types
-"application/octet-stream"
-"application/x-gzip"
-"application/x-bzip2"
-"application/x-lzma"
-
-# Checksum types
-"sha1"
-"md5"
-"sha256"
-"sha512"

contrib/oss-fuzz/libarchive_xar_fuzzer.options

@@ -1,10 +0,0 @@
-[libfuzzer]
-max_len = 524288
-timeout = 60
-rss_limit_mb = 2048
-
-[honggfuzz]
-timeout = 60
-
-[afl]
-timeout = 60

contrib/oss-fuzz/libarchive_zip_fuzzer.cc

@@ -1,68 +0,0 @@
-/*
- * ZIP format fuzzer for libarchive
- * Tests ZIP with various compression methods and encryption
- */
-#include <stddef.h>
-#include <stdint.h>
-#include <vector>
-
-#include "archive.h"
-#include "archive_entry.h"
-#include "fuzz_helpers.h"
-
-static constexpr size_t kMaxInputSize = 512 * 1024;
-
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) {
-  if (len == 0 || len > kMaxInputSize) {
-    return 0;
-  }
-
-  struct archive *a = archive_read_new();
-  if (a == NULL) {
-    return 0;
-  }
-
-  archive_read_support_format_zip(a);
-  archive_read_support_filter_all(a);
-
-  // Add passphrase for encrypted ZIPs
-  archive_read_add_passphrase(a, "password");
-  archive_read_add_passphrase(a, "test");
-  archive_read_add_passphrase(a, "");
-
-  // Enable ZIP options
-  archive_read_set_options(a, "zip:ignorecrc32");
-
-  Buffer buffer = {buf, len, 0};
-  if (archive_read_open(a, &buffer, NULL, reader_callback, NULL) != ARCHIVE_OK) {
-    archive_read_free(a);
-    return 0;
-  }
-
-  std::vector<uint8_t> data_buffer(4096, 0);
-  struct archive_entry *entry;
-
-  while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
-    archive_entry_pathname(entry);
-    archive_entry_pathname_w(entry);
-    archive_entry_size(entry);
-    archive_entry_mtime(entry);
-    archive_entry_mode(entry);
-    archive_entry_is_encrypted(entry);
-    archive_entry_is_data_encrypted(entry);
-    archive_entry_is_metadata_encrypted(entry);
-
-    // Check compression name
-    archive_format_name(a);
-    archive_filter_name(a, 0);
-
-    ssize_t r;
-    while ((r = archive_read_data(a, data_buffer.data(), data_buffer.size())) > 0)
-      ;
-  }
-
-  archive_read_free(a);
-  return 0;
-}

contrib/oss-fuzz/libarchive_zip_fuzzer.dict

@@ -1,43 +0,0 @@
-# ZIP format dictionary
-
-# Signatures
-"PK\x03\x04"
-"PK\x01\x02"
-"PK\x05\x06"
-"PK\x06\x06"
-"PK\x06\x07"
-"PK\x07\x08"
-
-# Version needed
-"\x14\x00"
-"\x0a\x00"
-"\x2d\x00"
-"\x3f\x00"
-
-# Compression methods
-"\x00\x00"
-"\x08\x00"
-"\x09\x00"
-"\x0c\x00"
-"\x0e\x00"
-"\x5f\x00"
-
-# General purpose flags
-"\x00\x00"
-"\x01\x00"
-"\x08\x00"
-"\x09\x00"
-
-# Extra field IDs
-"\x01\x00"
-"\x07\x00"
-"\x09\x00"
-"\x0a\x00"
-"\x15\x00"
-"\x17\x00"
-"\x55\x54"
-"\x75\x78"
-
-# Encryption
-"\x01\x99"
-"\x02\x99"

contrib/oss-fuzz/oss-fuzz-build.sh

@@ -1,131 +1,16 @@
-#!/bin/bash -eu
-
-# Build the project
+# build the project
 ./build/autogen.sh
 ./configure
 make -j$(nproc) all
 
-FUZZ_DIR=$SRC/libarchive/contrib/oss-fuzz
-TEST_DIR=$SRC/libarchive/libarchive/test
+# build seed
+cp $SRC/libarchive/contrib/oss-fuzz/corpus.zip\
+       	$OUT/libarchive_fuzzer_seed_corpus.zip
 
-# Common libraries for linking
-LIBS=".libs/libarchive.a -Wl,-Bstatic -lbz2 -llzo2 -lxml2 -llzma -lz -lcrypto -llz4 -licuuc -licudata -Wl,-Bdynamic"
-
-# Function to build a fuzzer
-build_fuzzer() {
-    local name=$1
-    local source=$2
-    echo "Building fuzzer: $name"
-    $CXX $CXXFLAGS -Ilibarchive \
-        "$source" \
-        -o "$OUT/$name" $LIB_FUZZING_ENGINE $LIBS
-}
-
-# Build all format-specific fuzzers
-FUZZERS=(
-    "libarchive_fuzzer"
-    "libarchive_tar_fuzzer"
-    "libarchive_zip_fuzzer"
-    "libarchive_7zip_fuzzer"
-    "libarchive_rar_fuzzer"
-    "libarchive_rar5_fuzzer"
-    "libarchive_xar_fuzzer"
-    "libarchive_cab_fuzzer"
-    "libarchive_lha_fuzzer"
-    "libarchive_iso9660_fuzzer"
-    "libarchive_cpio_fuzzer"
-    "libarchive_warc_fuzzer"
-    "libarchive_mtree_fuzzer"
-    "libarchive_ar_fuzzer"
-    "libarchive_filter_fuzzer"
-    "libarchive_entry_fuzzer"
-    "libarchive_write_fuzzer"
-    "libarchive_linkify_fuzzer"
-    "libarchive_match_fuzzer"
-    "libarchive_encryption_fuzzer"
-    "libarchive_read_disk_fuzzer"
-    "libarchive_write_disk_fuzzer"
-    "libarchive_seek_fuzzer"
-    "libarchive_string_fuzzer"
-    "libarchive_roundtrip_fuzzer"
-)
-
-for fuzzer in "${FUZZERS[@]}"; do
-    if [ -f "$FUZZ_DIR/${fuzzer}.cc" ]; then
-        build_fuzzer "$fuzzer" "$FUZZ_DIR/${fuzzer}.cc"
-    fi
-done
-
-# Copy dictionaries and options
-cp "$FUZZ_DIR"/*.dict "$OUT/" 2>/dev/null || true
-cp "$FUZZ_DIR"/*.options "$OUT/" 2>/dev/null || true
-
-# Build seed corpora
-echo "Building seed corpora..."
-
-# Main fuzzer corpus (existing)
-cp "$FUZZ_DIR/corpus.zip" "$OUT/libarchive_fuzzer_seed_corpus.zip"
-
-# Function to create corpus from test files
-create_corpus() {
-    local name=$1
-    local pattern=$2
-    local dir="/tmp/${name}_corpus"
-
-    mkdir -p "$dir"
-    for f in $TEST_DIR/$pattern; do
-        if [ -f "$f" ]; then
-            base=$(basename "$f" .uu)
-            uudecode -o "$dir/$base" "$f" 2>/dev/null || true
-        fi
-    done
-
-    if [ "$(ls -A $dir 2>/dev/null)" ]; then
-        zip -j "$OUT/${name}_seed_corpus.zip" "$dir"/* 2>/dev/null || true
-        echo "Created corpus for $name with $(ls $dir | wc -l) files"
-    fi
-    rm -rf "$dir"
-}
-
-# Create format-specific corpora
-create_corpus "libarchive_tar_fuzzer" "test_compat_*tar*.uu"
-create_corpus "libarchive_zip_fuzzer" "test_*zip*.uu"
-create_corpus "libarchive_7zip_fuzzer" "test_read_format_7zip*.uu"
-create_corpus "libarchive_rar_fuzzer" "test_read_format_rar_*.uu"
-create_corpus "libarchive_rar5_fuzzer" "test_read_format_rar5*.uu"
-create_corpus "libarchive_xar_fuzzer" "test_read_format_xar*.uu"
-create_corpus "libarchive_cab_fuzzer" "test_read_format_cab*.uu"
-create_corpus "libarchive_lha_fuzzer" "test_read_format_lha*.uu"
-create_corpus "libarchive_iso9660_fuzzer" "test_read_format_iso*.uu"
-create_corpus "libarchive_cpio_fuzzer" "test_compat_cpio*.uu"
-create_corpus "libarchive_warc_fuzzer" "test_read_format_warc*.uu"
-create_corpus "libarchive_mtree_fuzzer" "test_read_format_mtree*.uu"
-create_corpus "libarchive_ar_fuzzer" "test_read_format_ar*.uu"
-
-# Filter corpus - use compressed test files
-mkdir -p /tmp/filter_corpus
-for f in $TEST_DIR/*.gz.uu $TEST_DIR/*.bz2.uu $TEST_DIR/*.xz.uu $TEST_DIR/*.lz4.uu $TEST_DIR/*.zst.uu $TEST_DIR/*.Z.uu; do
-    if [ -f "$f" ]; then
-        base=$(basename "$f" .uu)
-        uudecode -o "/tmp/filter_corpus/$base" "$f" 2>/dev/null || true
-    fi
-done
-if [ "$(ls -A /tmp/filter_corpus 2>/dev/null)" ]; then
-    zip -j "$OUT/libarchive_filter_fuzzer_seed_corpus.zip" /tmp/filter_corpus/* 2>/dev/null || true
-fi
-rm -rf /tmp/filter_corpus
-
-# Encryption corpus - encrypted archives
-mkdir -p /tmp/encryption_corpus
-for f in $TEST_DIR/*encrypt*.uu $TEST_DIR/*password*.uu; do
-    if [ -f "$f" ]; then
-        base=$(basename "$f" .uu)
-        uudecode -o "/tmp/encryption_corpus/$base" "$f" 2>/dev/null || true
-    fi
-done
-if [ "$(ls -A /tmp/encryption_corpus 2>/dev/null)" ]; then
-    zip -j "$OUT/libarchive_encryption_fuzzer_seed_corpus.zip" /tmp/encryption_corpus/* 2>/dev/null || true
-fi
-rm -rf /tmp/encryption_corpus
-
-echo "Build complete! Built ${#FUZZERS[@]} fuzzers."
+# build fuzzer(s)
+$CXX $CXXFLAGS -Ilibarchive \
+    $SRC/libarchive/contrib/oss-fuzz/libarchive_fuzzer.cc \
+     -o $OUT/libarchive_fuzzer $LIB_FUZZING_ENGINE \
+    .libs/libarchive.a -Wl,-Bstatic -lbz2 -llzo2  \
+    -lxml2 -llzma -lz -lcrypto -llz4 -licuuc \
+    -licudata -Wl,-Bdynamic

contrib/psota-benchmark/tcp.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # tar comparison program
 # 2007-10-25 Jan Psota
 

cpio/CMakeLists.txt

@@ -13,8 +13,8 @@ IF(ENABLE_CPIO)
     cpio.c
     cpio.h
     cpio_platform.h
-    ../libarchive_fe/lafe_err.c
-    ../libarchive_fe/lafe_err.h
+    ../libarchive_fe/err.c
+    ../libarchive_fe/err.h
     ../libarchive_fe/lafe_platform.h
     ../libarchive_fe/line_reader.c
     ../libarchive_fe/line_reader.h
@@ -42,10 +42,8 @@ IF(ENABLE_CPIO)
   ENDIF(ENABLE_CPIO_SHARED)
 
   # Installation rules
-  IF(ENABLE_INSTALL)
-    INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
-    INSTALL_MAN(${bsdcpio_MANS})
-  ENDIF(ENABLE_INSTALL)
+  INSTALL(TARGETS bsdcpio RUNTIME DESTINATION bin)
+  INSTALL_MAN(${bsdcpio_MANS})
 
 ENDIF(ENABLE_CPIO)
 

cpio/cmdline.c

@@ -26,7 +26,7 @@
 #endif
 
 #include "cpio.h"
-#include "lafe_err.h"
+#include "err.h"
 
 /*
  * Short options for cpio.  Please keep this sorted.

cpio/cpio.c

@@ -60,7 +60,7 @@
 #endif
 
 #include "cpio.h"
-#include "lafe_err.h"
+#include "err.h"
 #include "line_reader.h"
 #include "passphrase.h"
 
@@ -124,21 +124,13 @@ main(int argc, char *argv[])
 	cpio->buff_size = sizeof(buff);
 
 
-#if defined(HAVE_SIGACTION)
-	{
+#if defined(HAVE_SIGACTION) && defined(SIGPIPE)
+	{ /* Ignore SIGPIPE signals. */
 		struct sigaction sa;
 		sigemptyset(&sa.sa_mask);
 		sa.sa_flags = 0;
-#ifdef SIGPIPE
-		/* Ignore SIGPIPE signals. */
 		sa.sa_handler = SIG_IGN;
 		sigaction(SIGPIPE, &sa, NULL);
-#endif
-#ifdef SIGCHLD
-		/* Do not ignore SIGCHLD. */
-		sa.sa_handler = SIG_DFL;
-		sigaction(SIGCHLD, &sa, NULL);
-#endif
 	}
 #endif
 
@@ -725,7 +717,7 @@ file_to_archive(struct cpio *cpio, const char *srcpath)
 
 	if (cpio->uid_override >= 0)
 		archive_entry_set_uid(entry, cpio->uid_override);
-	if (cpio->uname_override != NULL)
+	if (cpio->gname_override != NULL)
 		archive_entry_set_uname(entry, cpio->uname_override);
 	if (cpio->gid_override >= 0)
 		archive_entry_set_gid(entry, cpio->gid_override);

cpio/cpio_windows.c

@@ -24,7 +24,7 @@
 #include <sddl.h>
 
 #include "cpio.h"
-#include "lafe_err.h"
+#include "err.h"
 
 #define EPOC_TIME	(116444736000000000ULL)
 

cpio/cpio_windows.h

@@ -52,4 +52,4 @@ extern int utimes(const char *name, const struct __timeval *times);
 #define HAVE_UTIMES 1
 #endif
 
-#endif /* !CPIO_WINDOWS_H */
+#endif /* CPIO_WINDOWS_H */

cpio/test/CMakeLists.txt

@@ -9,7 +9,7 @@
 IF(ENABLE_CPIO AND ENABLE_TEST)
   SET(bsdcpio_test_SOURCES
     ../cmdline.c
-    ../../libarchive_fe/lafe_err.c
+    ../../libarchive_fe/err.c
     ../../test_utils/test_utils.c
     ../../test_utils/test_main.c
     test.h

cpio/test/test_format_newc.c

@@ -219,7 +219,7 @@ DEFINE_TEST(test_format_newc)
 		assert(is_hex(e, 110));
 		assertEqualMem(e + 0, "070701", 6); /* Magic */
 		assert(is_hex(e + 6, 8)); /* ino */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(CYGWIN)
 		/* Mode: Group members bits and others bits do not work. */
 		assertEqualInt(0xa180, from_hex(e + 14, 8) & 0xffc0);
 #else

cpio/test/test_option_a.c

@@ -52,7 +52,7 @@ test_create(void)
 		 * #ifdef this section out.  Most of the test below is
 		 * still valid. */
 		memset(&times, 0, sizeof(times));
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(CYGWIN)
 		times.actime = 86400;
 		times.modtime = 86400;
 #else