diff --git a/packages/libarchive/archive.h.patch b/packages/libarchive/archive.h.patch index fff33a86f3..e07d118f5f 100644 --- a/packages/libarchive/archive.h.patch +++ b/packages/libarchive/archive.h.patch @@ -1,12 +1,11 @@ -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 +--- a/libarchive/archive.h ++++ b/libarchive/archive.h @@ -96,11 +96,6 @@ # endif #endif -/* Large file support for Android */ --#ifdef __ANDROID__ +-#if defined(__LIBARCHIVE_BUILD) && defined(__ANDROID__) -#include "android_lf.h" -#endif - diff --git a/packages/libarchive/archive_entry.h.patch b/packages/libarchive/archive_entry.h.patch index 38a99044a4..f3f2aa5851 100644 --- a/packages/libarchive/archive_entry.h.patch +++ b/packages/libarchive/archive_entry.h.patch @@ -1,12 +1,11 @@ -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 @@ +--- a/libarchive/archive_entry.h ++++ b/libarchive/archive_entry.h +@@ -98,11 +98,6 @@ # define __LA_MODE_T mode_t #endif -/* Large file support for Android */ --#ifdef __ANDROID__ +-#if defined(__LIBARCHIVE_BUILD) && defined(__ANDROID__) -#include "android_lf.h" -#endif - diff --git a/packages/libarchive/build.sh b/packages/libarchive/build.sh index b54bd5c651..ea1822bf01 100644 --- a/packages/libarchive/build.sh +++ b/packages/libarchive/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.libarchive.org/ TERMUX_PKG_DESCRIPTION="Multi-format archive and compression library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.5.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=3.6.0 TERMUX_PKG_SRCURL=https://github.com/libarchive/libarchive/releases/download/v$TERMUX_PKG_VERSION/libarchive-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=72788e5f58d16febddfa262a5215e05fc9c79f2670f641ac039e6df44330ef51 +TERMUX_PKG_SHA256=a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libbz2, libiconv, liblzma, libxml2, openssl, zlib" TERMUX_PKG_BREAKS="libarchive-dev"