Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libarchive: update to 3.7.4 #1492

Merged
merged 2 commits into from
May 14, 2024
Merged

libarchive: update to 3.7.4 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365dec4
libarchive: fix openssl support
benoit-pierre Apr 27, 2024
2a4429d
libarchive: update to 3.7.4
benoit-pierre Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,6 +1427,7 @@
"libarchive"
],
"versions": [
"3.7.4-1",
"3.7.3-1",
"3.7.2-3",
"3.7.2-2",
Expand Down
8 changes: 4 additions & 4 deletions subprojects/libarchive.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions subprojects/packagefiles/libarchive/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'libarchive',
'c',
version: '3.7.3',
version: '3.7.4',
meson_version: '>=0.54.1',
)

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -259,10 +263,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)
Expand Down
Loading