libarchive: Update from 3.2.2 to 3.3.1

This commit is contained in:
Fredrik Fornwall 2017-03-27 02:38:37 +02:00
parent bfd9e967f9
commit 6d02fb3bc7
2 changed files with 8 additions and 8 deletions

View File

@ -1,15 +1,15 @@
diff -u -r ../libarchive-3.1.2/libarchive/archive_write_disk_posix.c ./libarchive/archive_write_disk_posix.c
--- ../libarchive-3.1.2/libarchive/archive_write_disk_posix.c 2013-02-08 01:52:07.000000000 +0100
+++ ./libarchive/archive_write_disk_posix.c 2014-07-15 19:09:38.106845578 +0200
@@ -2456,7 +2456,11 @@
diff -u -r ../libarchive-3.3.1/libarchive/archive_write_disk_posix.c ./libarchive/archive_write_disk_posix.c
--- ../libarchive-3.3.1/libarchive/archive_write_disk_posix.c 2017-02-25 18:37:08.000000000 +0100
+++ ./libarchive/archive_write_disk_posix.c 2017-03-27 02:35:07.446390387 +0200
@@ -2756,7 +2756,11 @@
alen = 0;
mb = 0;
complete = 1;
+#ifdef __ANDROID__
+ utf8 = 1;
+ utf8 = 1;
+#else
utf8 = (strcmp(nl_langinfo(CODESET), "UTF-8") == 0)? 1: 0;
+#endif
for (p = a->name; *p != '\0'; p++) {
for (p = path; *p != '\0'; p++) {
++alen;
if (*p == '\\') {

View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=http://www.libarchive.org/
TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library"
TERMUX_PKG_VERSION=3.2.2
TERMUX_PKG_VERSION=3.3.1
TERMUX_PKG_SRCURL=http://www.libarchive.org/downloads/libarchive-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f
TERMUX_PKG_SHA256=29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7
TERMUX_PKG_DEPENDS="libbz2, liblzma, libxml2, openssl"
# --without-nettle to use openssl instead: