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

Jump to bottom

libs: Update libarchive to 3.6.2 #7877

Merged
merged 1 commit into from
Dec 14, 2022
Merged

libs: Update libarchive to 3.6.2 #7877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 2 additions & 13 deletions libraries/cmake/source/libarchive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ function(libarchiveMain)

target_compile_definitions(thirdparty_libarchive PRIVATE
LIBARCHIVE_STATIC
USE_BZIP2_STATIC
LIBXML_STATIC
HAVE_CONFIG_H
)

Expand All @@ -174,17 +172,8 @@ function(libarchiveMain)
)
endif()

target_link_libraries(thirdparty_libarchive
PRIVATE
thirdparty_c_settings

PUBLIC
thirdparty_openssl
thirdparty_zlib
thirdparty_bzip2
thirdparty_lzma
thirdparty_libxml2
thirdparty_zstd
target_link_libraries(thirdparty_libarchive PRIVATE
thirdparty_c_settings
)
endfunction()

Expand Down
15 changes: 11 additions & 4 deletions libraries/cmake/source/libarchive/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ cmake \
-DENABLE_LIBB2=OFF \
-DENABLE_LZ4=OFF \
-DENABLE_LZO=OFF \
-DENABLE_LibGCC=OFF \
-DENABLE_LIBGCC=OFF \
-DENABLE_MBEDTLS=OFF \
-DENABLE_NETTLE=OFF \
-DENABLE_PCREPOSIX=OFF \
Expand Down Expand Up @@ -88,7 +88,7 @@ cmake ^
-DENABLE_LIBB2=OFF ^
-DENABLE_LZ4=OFF ^
-DENABLE_LZO=OFF ^
-DENABLE_LibGCC=OFF ^
-DENABLE_LIBGCC=OFF ^
-DENABLE_MBEDTLS=OFF ^
-DENABLE_NETTLE=OFF ^
-DENABLE_PCREPOSIX=OFF ^
Expand All @@ -97,7 +97,14 @@ cmake ^
-DENABLE_TAR_SHARED=OFF ^
-DENABLE_TEST=OFF ^
-DENABLE_WERROR=OFF ^
-DENABLE_XATTR=OFF
-DENABLE_XATTR=OFF ^
-DWINDOWS_VERSION=WIN7 ^
-DPOSIX_REGEX_LIB=NONE
```

NOTE: If necessary, convert the config.h line endings from CRLF to LF
NOTE: If necessary, convert the config.h line endings from CRLF to LF.
The `POSIX_REGEX_LIB=NONE` is a hack, since it tries to find a library only if it's set to some other hardcoded values. For our use the regex library is currently not necessary, because it's only used by a CLI shipped with the libarchive project. Not doing so gives an error during configure time: `libgcc not found.`

## Common

After configuration, copy the config.h from the `b` folder.
12 changes: 6 additions & 6 deletions libraries/cmake/source/libarchive/config/linux/aarch64/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */

/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.6.1"
#define BSDCPIO_VERSION_STRING "3.6.2"

/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.6.1"
#define BSDTAR_VERSION_STRING "3.6.2"

/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.6.1"
#define BSDCAT_VERSION_STRING "3.6.2"

/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
Expand Down Expand Up @@ -1234,10 +1234,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST

/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3006001"
#define LIBARCHIVE_VERSION_NUMBER "3006002"

/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.6.1"
#define LIBARCHIVE_VERSION_STRING "3.6.2"

/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
Expand Down Expand Up @@ -1291,7 +1291,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */

/* Version number of package */
#define VERSION "3.6.1"
#define VERSION "3.6.2"

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Expand Down
12 changes: 6 additions & 6 deletions libraries/cmake/source/libarchive/config/linux/x86_64/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */

/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.6.1"
#define BSDCPIO_VERSION_STRING "3.6.2"

/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.6.1"
#define BSDTAR_VERSION_STRING "3.6.2"

/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.6.1"
#define BSDCAT_VERSION_STRING "3.6.2"

/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
Expand Down Expand Up @@ -1234,10 +1234,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST

/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3006001"
#define LIBARCHIVE_VERSION_NUMBER "3006002"

/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.6.1"
#define LIBARCHIVE_VERSION_STRING "3.6.2"

/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
Expand Down Expand Up @@ -1291,7 +1291,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */

/* Version number of package */
#define VERSION "3.6.1"
#define VERSION "3.6.2"

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Expand Down
12 changes: 6 additions & 6 deletions libraries/cmake/source/libarchive/config/macos/aarch64/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */

/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.6.1"
#define BSDCPIO_VERSION_STRING "3.6.2"

/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.6.1"
#define BSDTAR_VERSION_STRING "3.6.2"

/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.6.1"
#define BSDCAT_VERSION_STRING "3.6.2"

/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
Expand Down Expand Up @@ -1234,10 +1234,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST

/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3006001"
#define LIBARCHIVE_VERSION_NUMBER "3006002"

/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.6.1"
#define LIBARCHIVE_VERSION_STRING "3.6.2"

/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
Expand Down Expand Up @@ -1291,7 +1291,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */

/* Version number of package */
#define VERSION "3.6.1"
#define VERSION "3.6.2"

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Expand Down
12 changes: 6 additions & 6 deletions libraries/cmake/source/libarchive/config/macos/x86_64/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */

/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.6.1"
#define BSDCPIO_VERSION_STRING "3.6.2"

/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.6.1"
#define BSDTAR_VERSION_STRING "3.6.2"

/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.6.1"
#define BSDCAT_VERSION_STRING "3.6.2"

/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
Expand Down Expand Up @@ -1234,10 +1234,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST

/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3006001"
#define LIBARCHIVE_VERSION_NUMBER "3006002"

/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.6.1"
#define LIBARCHIVE_VERSION_STRING "3.6.2"

/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
Expand Down Expand Up @@ -1291,7 +1291,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */

/* Version number of package */
#define VERSION "3.6.1"
#define VERSION "3.6.2"

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Expand Down
12 changes: 6 additions & 6 deletions libraries/cmake/source/libarchive/config/windows/x86_64/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ typedef uint64_t uintmax_t;
/* #undef ARCHIVE_XATTR_LINUX */

/* Version number of bsdcpio */
#define BSDCPIO_VERSION_STRING "3.6.1"
#define BSDCPIO_VERSION_STRING "3.6.2"

/* Version number of bsdtar */
#define BSDTAR_VERSION_STRING "3.6.1"
#define BSDTAR_VERSION_STRING "3.6.2"

/* Version number of bsdcat */
#define BSDCAT_VERSION_STRING "3.6.1"
#define BSDCAT_VERSION_STRING "3.6.2"

/* Define to 1 if you have the `acl_create_entry' function. */
/* #undef HAVE_ACL_CREATE_ENTRY */
Expand Down Expand Up @@ -1234,10 +1234,10 @@ typedef uint64_t uintmax_t;
#define ICONV_CONST

/* Version number of libarchive as a single integer */
#define LIBARCHIVE_VERSION_NUMBER "3006001"
#define LIBARCHIVE_VERSION_NUMBER "3006002"

/* Version number of libarchive */
#define LIBARCHIVE_VERSION_STRING "3.6.1"
#define LIBARCHIVE_VERSION_STRING "3.6.2"

/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
Expand Down Expand Up @@ -1291,7 +1291,7 @@ typedef uint64_t uintmax_t;
#endif /* SAFE_TO_DEFINE_EXTENSIONS */

/* Version number of package */
#define VERSION "3.6.1"
#define VERSION "3.6.2"

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
Expand Down
2 changes: 1 addition & 1 deletion libraries/cmake/source/libarchive/src
Open in desktop
Submodule src updated 78 files
+2 −4 .cirrus.yml
+3 −3 .github/workflows/ci.yml
+41 −0 .github/workflows/codeql.yml
+30 −9 CMakeLists.txt
+2 −0 Makefile.am
+2 −0 NEWS
+5 −0 README.md
+23 −2 build/ci/github_actions/ci.cmd
+0 −0 build/cmake/FindLIBGCC.cmake
+24 −24 build/cmake/config.h.in
+1 −0 build/pkgconfig/libarchive.pc.in
+1 −1 build/version
+19 −20 configure.ac
+22 −2 cpio/test/test_option_t.c
+5 −0 libarchive/CMakeLists.txt
+4 −2 libarchive/archive.h
+8 −8 libarchive/archive_digest.c
+14 −0 libarchive/archive_entry.c
+3 −1 libarchive/archive_entry.h
+29 −0 libarchive/archive_hmac.c
+7 −0 libarchive/archive_hmac_private.h
+2 −1 libarchive/archive_platform.h
+4 −3 libarchive/archive_read_disk_posix.c
+12 −6 libarchive/archive_read_disk_windows.c
+6 −0 libarchive/archive_read_support_filter_lz4.c
+2 −0 libarchive/archive_read_support_filter_lzop.c
+2 −0 libarchive/archive_read_support_filter_xz.c
+7 −1 libarchive/archive_read_support_format_7zip.c
+4 −2 libarchive/archive_read_support_format_cab.c
+1 −1 libarchive/archive_read_support_format_iso9660.c
+5 −1 libarchive/archive_read_support_format_lha.c
+17 −7 libarchive/archive_read_support_format_mtree.c
+10 −0 libarchive/archive_read_support_format_rar.c
+9 −0 libarchive/archive_read_support_format_rar5.c
+17 −3 libarchive/archive_read_support_format_tar.c
+4 −0 libarchive/archive_read_support_format_xar.c
+3 −3 libarchive/archive_string.c
+8 −0 libarchive/archive_write.c
+3 −1 libarchive/archive_write_disk_posix.c
+6 −0 libarchive/archive_write_disk_windows.c
+1 −0 libarchive/archive_write_open.3
+1 −1 libarchive/archive_write_set_format_pax.c
+1 −1 libarchive/filter_fork_posix.c
+1 −0 libarchive/test/CMakeLists.txt
+2 −2 libarchive/test/test_acl_platform_nfs4.c
+1 −1 libarchive/test/test_archive_api_feature.c
+30 −0 libarchive/test/test_archive_match_time.c
+1 −0 libarchive/test/test_archive_string_conversion.c
+30 −0 libarchive/test/test_read_format_mtree.c
+33 −10 libarchive/test/test_read_format_rar5.c
+53 −0 libarchive/test/test_read_format_tar_invalid_pax_size.c
+38 −0 libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu
+2 −2 libarchive/test/test_read_truncated_filter.c
+3 −1 libarchive/test/test_sparse_basic.c
+2 −2 libarchive/test/test_tar_large.c
+1 −1 libarchive/test/test_write_disk_secure744.c
+4 −4 libarchive/test/test_write_filter_b64encode.c
+6 −6 libarchive/test/test_write_filter_bzip2.c
+2 −2 libarchive/test/test_write_filter_compress.c
+6 −6 libarchive/test/test_write_filter_gzip.c
+2 −2 libarchive/test/test_write_filter_lrzip.c
+8 −8 libarchive/test/test_write_filter_lz4.c
+6 −6 libarchive/test/test_write_filter_lzip.c
+6 −6 libarchive/test/test_write_filter_lzma.c
+6 −6 libarchive/test/test_write_filter_lzop.c
+4 −4 libarchive/test/test_write_filter_uuencode.c
+6 −6 libarchive/test/test_write_filter_xz.c
+6 −6 libarchive/test/test_write_filter_zstd.c
+21 −2 libarchive/test/test_write_format_zip_compression_store.c
+20 −1 libarchive/test/test_write_format_zip_file.c
+20 −1 libarchive/test/test_write_format_zip_file_zip64.c
+2 −2 libarchive/test/test_write_format_zip_large.c
+1 −1 tar/bsdtar.1
+1 −0 tar/subst.c
+10 −10 tar/test/test_copy.c
+5 −3 tar/test/test_option_b.c
+11 −10 tar/util.c
+58 −29 test_utils/test_main.c
4 changes: 2 additions & 2 deletions libraries/third_party_libraries_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
"libarchive": {
"product": "libarchive",
"vendor": "libarchive",
"version": "3.6.1",
"commit": "6c3301111caa75c76e1b2acb1afb2d71341932ef",
"version": "3.6.2",
"commit": "ba80276ccc3c941c4918ec6e2460059f0c525c43",
"ignored-cves": []
},
"libaudit": {
Expand Down