From 786ea2ca3714c08fff97130b53090738dd8ade36 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 15:52:52 +0000
Subject: [PATCH] Update dependency libarchive to v3.8.0 (#2338)

* Update dependency libarchive to v3.8.0

* Update 0002-Fix-zip_time-performance.patch

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <99822064+revonateB0T@users.noreply.github.com>
---
 .github/workflows/ci.yml                      |  4 ++--
 .../cpp/0002-Fix-zip_time-performance.patch   | 22 +++++++++----------
 app/src/main/cpp/CMakeLists.txt               |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86bd5964b..04a17e3cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-default-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          key: cmake-default-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/*.patch', 'app/src/main/rust/Cargo.lock') }}
           restore-keys: cmake-default-
 
       - name: Build
@@ -147,7 +147,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: app/.cxx
-          key: cmake-marshmallow-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
+          key: cmake-marshmallow-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/cpp/*.patch', 'app/src/main/rust/Cargo.lock') }}
           restore-keys: cmake-marshmallow-
 
       - name: Build
diff --git a/app/src/main/cpp/0002-Fix-zip_time-performance.patch b/app/src/main/cpp/0002-Fix-zip_time-performance.patch
index d2a3dccf4..7d7cf3280 100644
--- a/app/src/main/cpp/0002-Fix-zip_time-performance.patch
+++ b/app/src/main/cpp/0002-Fix-zip_time-performance.patch
@@ -1,25 +1,25 @@
-From c2b25a299eafd774766709df2e9a4c79dda42bde Mon Sep 17 00:00:00 2001
+From e971b9f23727833cc39b9e325db30f383e5bfc30 Mon Sep 17 00:00:00 2001
 From: Dude so hot <djohn@fbi.gov>
 Date: Thu, 14 Nov 2024 00:28:13 +0800
 Subject: [PATCH] Fix zip_time performance
 
 Signed-off-by: Dude so hot <djohn@fbi.gov>
 ---
- libarchive/archive_read_support_format_zip.c | 1 +
+ libarchive/archive_time.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
-index 3e62533b..090a3a1c 100644
---- a/libarchive/archive_read_support_format_zip.c
-+++ b/libarchive/archive_read_support_format_zip.c
-@@ -469,6 +469,7 @@ compression_name(const int compression)
- static time_t
- zip_time(const char *p)
+diff --git a/libarchive/archive_time.c b/libarchive/archive_time.c
+index 3352c809..9289bf1e 100644
+--- a/libarchive/archive_time.c
++++ b/libarchive/archive_time.c
+@@ -53,6 +53,7 @@ FILETIME_to_ntfs(const FILETIME* filetime)
+ int64_t
+ dos_to_unix(uint32_t dos_time)
  {
 +	return 0;
- 	int msTime, msDate;
+ 	uint16_t msTime, msDate;
  	struct tm ts;
- 
+ 	time_t t;
 -- 
 2.47.0
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 01518d9fc..7d46b8f7f 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -101,7 +101,7 @@ set(LIBARCHIVE_PATCH
 FetchContent_Declare(
         libarchive
         GIT_REPOSITORY https://github.com/libarchive/libarchive.git
-        GIT_TAG v3.7.9
+        GIT_TAG v3.8.0
         GIT_SHALLOW 1
         PATCH_COMMAND git apply --check -R ${LIBARCHIVE_PATCH} || git apply ${LIBARCHIVE_PATCH}
 )