diff options
Diffstat (limited to 'app-arch/libarchive/files')
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch | 27 | ||||
| -rw-r--r-- | app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch | 26 |
2 files changed, 26 insertions, 27 deletions
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch deleted file mode 100644 index 8f540e4aa07b..000000000000 --- a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff - -next release should have a fix for this - ---- a/libarchive/archive_read_support_format_mtree.c -+++ b/libarchive/archive_read_support_format_mtree.c -@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011 - #define O_CLOEXEC 0 - #endif - -+#ifdef __APPLE__ -+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070 -+static size_t strnlen(const char *s, size_t maxlen) { -+ size_t l = 0; -+ while (l < maxlen && *s) { -+ l++; -+ s++; -+ } -+ return l; -+} -+#endif -+#endif -+ -+ - #define MTREE_HAS_DEVICE 0x0001 - #define MTREE_HAS_FFLAGS 0x0002 - #define MTREE_HAS_GID 0x0004 diff --git a/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch b/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch new file mode 100644 index 000000000000..f05b46c1a340 --- /dev/null +++ b/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch @@ -0,0 +1,26 @@ +diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c +index a562d538..f3ec40c4 100644 +--- a/libarchive/archive_read_support_filter_lrzip.c ++++ b/libarchive/archive_read_support_filter_lrzip.c +@@ -109,7 +109,7 @@ lrzip_bidder_init(struct archive_read_filter *self) + { + int r; + +- r = __archive_read_program(self, "lrzip -d -q"); ++ r = __archive_read_program(self, "lrzip -d -Q"); + /* Note: We set the format here even if __archive_read_program() + * above fails. We do, after all, know what the format is + * even if we weren't able to read it. */ +diff --git a/libarchive/archive_write_add_filter_lrzip.c b/libarchive/archive_write_add_filter_lrzip.c +index fe974c93..8fe498dd 100644 +--- a/libarchive/archive_write_add_filter_lrzip.c ++++ b/libarchive/archive_write_add_filter_lrzip.c +@@ -133,7 +133,7 @@ archive_write_lrzip_open(struct archive_write_filter *f) + int r; + + archive_string_init(&as); +- archive_strcpy(&as, "lrzip -q"); ++ archive_strcpy(&as, "lrzip -Q"); + + /* Specify compression type. */ + switch (data->compression) { |