--- /dev/null
+diff -u -r ../libarchive-3.2.0/libarchive/archive.h ./libarchive/archive.h
+--- ../libarchive-3.2.0/libarchive/archive.h 2016-04-30 00:44:07.000000000 -0400
++++ ./libarchive/archive.h 2016-05-02 19:58:33.742590137 -0400
+@@ -96,11 +96,6 @@
+ # endif
+ #endif
+
+-/* Large file support for Android */
+-#ifdef __ANDROID__
+-#include "android_lf.h"
+-#endif
+-
+ /*
+ * On Windows, define LIBARCHIVE_STATIC if you're building or using a
+ * .lib. The default here assumes you're building a DLL. Only
--- /dev/null
+diff -u -r ../libarchive-3.2.0/libarchive/archive_entry.h ./libarchive/archive_entry.h
+--- ../libarchive-3.2.0/libarchive/archive_entry.h 2016-04-30 00:44:07.000000000 -0400
++++ ./libarchive/archive_entry.h 2016-05-02 19:58:22.878678982 -0400
+@@ -75,11 +75,6 @@
+ # define __LA_MODE_T mode_t
+ #endif
+
+-/* Large file support for Android */
+-#ifdef __ANDROID__
+-#include "android_lf.h"
+-#endif
+-
+ /*
+ * On Windows, define LIBARCHIVE_STATIC if you're building or using a
+ * .lib. The default here assumes you're building a DLL. Only
-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);
TERMUX_PKG_HOMEPAGE=http://www.libarchive.org/
TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
-TERMUX_PKG_VERSION=3.1.2
-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_VERSION=3.2.0
TERMUX_PKG_SRCURL=http://www.libarchive.org/downloads/libarchive-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libbz2, liblzma, libxml2, openssl"
# --without-nettle to use openssl instead: