|
 |
7b6f29 |
From adbd286cef9a4c4bed76eb95337d5d6f5e42dd45 Mon Sep 17 00:00:00 2001
|
|
|
7b6f29 |
From: Kalev Lember <klember@redhat.com>
|
|
|
7b6f29 |
Date: Mon, 5 Apr 2021 10:40:26 +0200
|
|
|
7b6f29 |
Subject: [PATCH] OCI: Switch to pax format for tar archives
|
|
|
7b6f29 |
|
|
|
7b6f29 |
For reasons unknown, libarchive appears to generate broken gnutar format
|
|
|
7b6f29 |
tar archives when the archive contains files that are larger than 2 GB.
|
|
|
7b6f29 |
This commit switches to the pax format to work this around.
|
|
|
7b6f29 |
|
|
|
7b6f29 |
This should be a better default as it also removes 256 char filename
|
|
|
7b6f29 |
length limitation and matches what other libraries are doing, e.g.
|
|
|
7b6f29 |
Python 3.8 switched to the pax format by default as well.
|
|
|
7b6f29 |
|
|
|
7b6f29 |
See https://pagure.io/fedora-infrastructure/issue/9840
|
|
|
7b6f29 |
---
|
|
|
7b6f29 |
common/flatpak-oci-registry.c | 2 +-
|
|
|
7b6f29 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7b6f29 |
|
|
|
7b6f29 |
diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c
|
|
|
7b6f29 |
index 6aa68c27..2a7f3ba1 100644
|
|
|
7b6f29 |
--- a/common/flatpak-oci-registry.c
|
|
|
7b6f29 |
+++ b/common/flatpak-oci-registry.c
|
|
|
7b6f29 |
@@ -1476,7 +1476,7 @@ flatpak_oci_registry_write_layer (FlatpakOciRegistry *self,
|
|
|
7b6f29 |
}
|
|
|
7b6f29 |
|
|
|
7b6f29 |
a = archive_write_new ();
|
|
|
7b6f29 |
- if (archive_write_set_format_gnutar (a) != ARCHIVE_OK ||
|
|
|
7b6f29 |
+ if (archive_write_set_format_pax (a) != ARCHIVE_OK ||
|
|
|
7b6f29 |
archive_write_add_filter_none (a) != ARCHIVE_OK)
|
|
|
7b6f29 |
{
|
|
|
7b6f29 |
propagate_libarchive_error (error, a);
|
|
|
7b6f29 |
--
|
|
|
7b6f29 |
2.30.2
|
|
|
7b6f29 |
|