From 23731201ee7c5480e1526aed56f23068603d73c8 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 3 Jan 2019 02:08:10 +0100 Subject: [PATCH] tar: Update from 1.30 to 1.31 --- packages/tar/build.sh | 13 ++++++++----- packages/tar/gnu-stdio-impl.h.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 packages/tar/gnu-stdio-impl.h.patch diff --git a/packages/tar/build.sh b/packages/tar/build.sh index f3ccd5eee..a8a5ad9ca 100644 --- a/packages/tar/build.sh +++ b/packages/tar/build.sh @@ -1,15 +1,18 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/tar/ TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives" -TERMUX_PKG_VERSION=1.30 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.31 +TERMUX_PKG_SHA256=37f3ef1ceebd8b7e1ebf5b8cc6c65bb8ebf002c7d049032bf456860f25ec2dc1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f1bf92dbb1e1ab27911a861ea8dde8208ee774866c46c0bb6ead41f4d1f4d2d3 # Allow xz compression (busybox only provides xz decompression): -TERMUX_PKG_DEPENDS="xz-utils" +TERMUX_PKG_DEPENDS="xz-utils, libandroid-glob" # When cross-compiling configure guesses that d_ino in struct dirent only exists # if triplet matches linux*-gnu*, so we force set it explicitly: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_struct_dirent_d_ino=yes" - # this needed to disable tar's implementation of mkfifoat() so it is possible # to use own implementation (see patch 'mkfifoat.patch'). TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_mkfifoat=yes" + +termux_step_pre_configure() { + CPPFLAGS+=" -D__USE_FORTIFY_LEVEL=0" + LDFLAGS+=" -landroid-glob" +} diff --git a/packages/tar/gnu-stdio-impl.h.patch b/packages/tar/gnu-stdio-impl.h.patch new file mode 100644 index 000000000..20a0357a9 --- /dev/null +++ b/packages/tar/gnu-stdio-impl.h.patch @@ -0,0 +1,12 @@ +diff -u -r ../tar-1.31/gnu/stdio-impl.h ./gnu/stdio-impl.h +--- ../tar-1.31/gnu/stdio-impl.h 2019-01-02 18:16:01.000000000 +0000 ++++ ./gnu/stdio-impl.h 2019-01-03 00:26:16.683764235 +0000 +@@ -60,7 +60,7 @@ + # define _flags pub._flags + # define _r pub._r + # define _w pub._w +-# elif defined __ANDROID__ /* Android */ ++# elif defined __ANDROID_BUT_THIS_IS_BROKEN__ /* Android */ + /* Up to this commit from 2015-10-12 + + the innards of FILE were public, and fp_ub could be defined like for OpenBSD,