gzip: hotfix for gnulib vasnprintf.c

Don't use %n in vasnprintf.c, it breaks things.

   $ gzip --version
   FORTIFY: %n not allowed on Android
   Aborted

See m4's issue in #4381.

This should be fixed in the next gzip release, though, as gnulib has
been updated in the master branch. However, for now, this will fix
things.
This commit is contained in:
easyaspi314 (Devin) 2020-04-05 18:25:57 -04:00 committed by Leonid Pliushch
parent 4799915c1a
commit d3bf4f7621
2 changed files with 14 additions and 1 deletions

View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gzip/
TERMUX_PKG_DESCRIPTION="Standard GNU file compression utilities"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=1.10
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
TERMUX_PKG_ESSENTIAL=true

View File

@ -0,0 +1,13 @@
diff -u -r ../gzip-1.10/lib/vasnprintf.c ./lib/vasnprintf.c
--- ../gzip-1.10/lib/vasnprintf.c 2018-12-21 23:56:16.000000000 -0500
+++ ./lib/vasnprintf.c 2020-04-05 18:21:34.305189418 -0400
@@ -4874,7 +4874,8 @@
# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
&& !defined __UCLIBC__) \
|| (defined __APPLE__ && defined __MACH__) \
- || (defined _WIN32 && ! defined __CYGWIN__))
+ || (defined _WIN32 && ! defined __CYGWIN__) \
+ || (defined __ANDROID__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';