From 365dec422af91ee912da7456bac0ec6d9f07d568 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sat, 27 Apr 2024 10:39:49 +0200
Subject: [PATCH 1/2] libarchive: fix openssl support

Link with `libcrypto` instead of `libssl`.
---
 subprojects/packagefiles/libarchive/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subprojects/packagefiles/libarchive/meson.build b/subprojects/packagefiles/libarchive/meson.build
index ad181ae03..291bcb040 100644
--- a/subprojects/packagefiles/libarchive/meson.build
+++ b/subprojects/packagefiles/libarchive/meson.build
@@ -259,10 +259,10 @@ if lzo2_dep.found()
   deps += lzo2_dep
 endif
 
-openssl_dep = dependency('openssl', required: get_option('openssl'))
-if openssl_dep.found()
+crypto_dep = dependency('libcrypto', required: get_option('openssl'))
+if crypto_dep.found()
   cdata.set('HAVE_LIBCRYPTO', 1)
-  deps += openssl_dep
+  deps += crypto_dep
   foreach f : ['md5', 'rmd160', 'sha1', 'sha256', 'sha384', 'sha512']
     if not cc.has_header_symbol('openssl/ssl.h', 'OPENSSL_NO_@0@'.format(f.to_upper()))
       cdata.set('ARCHIVE_CRYPTO_@0@_OPENSSL'.format(f.to_upper()), 1)

From 2a4429d1d2b7074c819fe7d7383a2267762baeb6 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Fri, 26 Apr 2024 13:54:53 +0200
Subject: [PATCH 2/2] libarchive: update to 3.7.4

---
 releases.json                                   | 1 +
 subprojects/libarchive.wrap                     | 8 ++++----
 subprojects/packagefiles/libarchive/meson.build | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/releases.json b/releases.json
index 8403b2a9c..5f7b03fb7 100644
--- a/releases.json
+++ b/releases.json
@@ -1427,6 +1427,7 @@
       "libarchive"
     ],
     "versions": [
+      "3.7.4-1",
       "3.7.3-1",
       "3.7.2-3",
       "3.7.2-2",
diff --git a/subprojects/libarchive.wrap b/subprojects/libarchive.wrap
index 5ff463feb..58bf30eec 100644
--- a/subprojects/libarchive.wrap
+++ b/subprojects/libarchive.wrap
@@ -1,8 +1,8 @@
 [wrap-file]
-directory = libarchive-3.7.3
-source_url = https://github.com/libarchive/libarchive/releases/download/v3.7.3/libarchive-3.7.3.tar.xz
-source_filename = libarchive-3.7.3.tar.xz
-source_hash = 63e7a7174638fc7d6b79b4c8b0ad954e0f4f45abe7239c1ecb200232aa9a43d2
+directory = libarchive-3.7.4
+source_url = https://github.com/libarchive/libarchive/releases/download/v3.7.4/libarchive-3.7.4.tar.xz
+source_filename = libarchive-3.7.4.tar.xz
+source_hash = f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735
 patch_directory = libarchive
 
 [provide]
diff --git a/subprojects/packagefiles/libarchive/meson.build b/subprojects/packagefiles/libarchive/meson.build
index 291bcb040..157e4a7b6 100644
--- a/subprojects/packagefiles/libarchive/meson.build
+++ b/subprojects/packagefiles/libarchive/meson.build
@@ -1,7 +1,7 @@
 project(
   'libarchive',
   'c',
-  version: '3.7.3',
+  version: '3.7.4',
   meson_version: '>=0.54.1',
 )
 
@@ -114,6 +114,10 @@ if cc.has_header_symbol('ext2fs/ext2_fs.h', 'EXT2_IOC_GETFLAGS')
   cdata.set('HAVE_WORKING_EXT2_IOC_GETFLAGS', 1)
 endif
 
+if cc.has_header_symbol('unistd.h', 'sysconf')
+  cdata.set('HAVE_SYSCONF', 1)
+endif
+
 foreach w : ['_mkgmtime', 'ctime_s', 'gmtime_s', 'localtime_s']
   if cc.has_header_symbol('time.h', w)
     cdata.set('HAVE_@0@'.format(w.to_upper()), 1)