libarchive: Update from 3.1.2 to 3.2.0

[termux-packages] / packages / libarchive / archive_write_set_format_zip.c.patch

diff --git a/packages/libarchive/archive_write_set_format_zip.c.patch b/packages/libarchive/archive_write_set_format_zip.c.patch
index 490072b..8d19fa6 100644 (file)
--- a/packages/libarchive/archive_write_set_format_zip.c.patch
+++ b/packages/libarchive/archive_write_set_format_zip.c.patch
@@ -1,15 +1,15 @@
-diff -u -r ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
---- ../libarchive-3.1.2/libarchive/archive_write_set_format_zip.c      2013-01-14 02:43:45.000000000 +0100
-+++ ./libarchive/archive_write_set_format_zip.c        2014-07-15 19:11:00.070843621 +0200
-@@ -413,7 +413,10 @@
+diff -u -r ../libarchive-3.2.0/libarchive/archive_write_set_format_zip.c ./libarchive/archive_write_set_format_zip.c
+--- ../libarchive-3.2.0/libarchive/archive_write_set_format_zip.c      2016-01-01 17:18:57.000000000 -0500
++++ ./libarchive/archive_write_set_format_zip.c        2016-05-02 20:09:52.331542213 -0400
+@@ -651,10 +651,8 @@
                        if (strcmp(archive_string_conversion_charset_name(
-                           zip->opt_sconv), "UTF-8") == 0)
-                               zip->flags |= ZIP_FLAGS_UTF8_NAME;
+                                       zip->opt_sconv), "UTF-8") == 0)
+                               zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
 -#if HAVE_NL_LANGINFO
-+#ifdef __ANDROID__
-+                } else if (1) {
-+                      zip->flags |= ZIP_FLAGS_UTF8_NAME;
-+#elif HAVE_NL_LANGINFO
-               } else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
-                       zip->flags |= ZIP_FLAGS_UTF8_NAME;
- #endif
+-              } else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
++              } else {
+                       zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
+-#endif
+               }
+       }
+       filename_length = path_length(zip->entry);