gzip: update to 1.11
This commit is contained in:
parent
3e56f2e581
commit
1ed8eae7c7
@ -2,10 +2,9 @@ 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.10
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_VERSION=1.11
|
||||
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0
|
||||
TERMUX_PKG_SHA256=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
|
||||
TERMUX_PKG_ESSENTIAL=true
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_path_GREP=grep"
|
||||
|
@ -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=44
|
||||
-skip=49
|
||||
+#!@TERMUX_PREFIX@/bin/sh
|
||||
+skip=50
|
||||
+set -e
|
||||
|
@ -1,12 +0,0 @@
|
||||
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,
|
14
packages/gzip/lib-string.in.h.patch
Normal file
14
packages/gzip/lib-string.in.h.patch
Normal file
@ -0,0 +1,14 @@
|
||||
fixes "malloc.h: unknown type name 'FILE'"
|
||||
diff --git a/lib/string.in.h b/lib/string.in.h
|
||||
index fa2e40c..46b7a14 100644
|
||||
--- a/lib/string.in.h
|
||||
+++ b/lib/string.in.h
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <stddef.h>
|
||||
|
||||
/* Get free(). */
|
||||
-#include <stdlib.h>
|
||||
+void free(void *);
|
||||
|
||||
/* MirBSD defines mbslen as a macro. */
|
||||
#if @GNULIB_MBSLEN@ && defined __MirBSD__
|
@ -1,13 +0,0 @@
|
||||
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';
|
Loading…
Reference in New Issue
Block a user