revert gzip until gnulib is fixed

This commit is contained in:
Lucy Phipps 2021-09-06 09:18:15 +01:00
parent f2dcf76c66
commit 824578f529
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
4 changed files with 29 additions and 3 deletions

View File

@ -2,9 +2,10 @@ 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_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.11
TERMUX_PKG_VERSION=1.10
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
TERMUX_PKG_ESSENTIAL=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_GREP=grep"

View File

@ -15,7 +15,7 @@ diff -uNr gzip-1.9/gzexe.in gzip-1.9.mod/gzexe.in
if test $decomp -eq 0; then
(cat <<'EOF' &&
-#!/bin/sh
-skip=49
-skip=44
+#!@TERMUX_PREFIX@/bin/sh
+skip=50
+set -e

View File

@ -0,0 +1,12 @@
diff -u -r ../gzip-1.10/lib/stdio-impl.h ./lib/stdio-impl.h
--- ../gzip-1.10/lib/stdio-impl.h 2018-06-25 04:09:24.000000000 +0000
+++ ./lib/stdio-impl.h 2019-01-03 00:28:58.881820632 +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
<https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
the innards of FILE were public, and fp_ub could be defined like for OpenBSD,

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';