From 786d3f9071716164a5a7190f5e041f3bd03957fd Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 29 Mar 2016 17:53:50 -0400
Subject: [PATCH] gzip: Update from 1.6 to 1.7

---
 packages/gzip/build.sh                      |  2 +-
 packages/gzip/stdio_impl_use_sfileext.patch | 14 -------------
 packages/gzip/zip.c.patch                   | 31 -----------------------------
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 packages/gzip/stdio_impl_use_sfileext.patch
 delete mode 100644 packages/gzip/zip.c.patch

diff --git a/packages/gzip/build.sh b/packages/gzip/build.sh
index b82fd823..68ffd925 100644
--- a/packages/gzip/build.sh
+++ b/packages/gzip/build.sh
@@ -1,4 +1,4 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gzip/
 TERMUX_PKG_DESCRIPTION="Standard GNU file compression utilities"
-TERMUX_PKG_VERSION=1.6
+TERMUX_PKG_VERSION=1.7
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
diff --git a/packages/gzip/stdio_impl_use_sfileext.patch b/packages/gzip/stdio_impl_use_sfileext.patch
deleted file mode 100644
index afe10f3d..00000000
--- a/packages/gzip/stdio_impl_use_sfileext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://lists.gnu.org/archive/html/bug-gnulib/2013-09/msg00005.html
-
-diff -u -r ../gzip-1.6/lib/stdio-impl.h ./lib/stdio-impl.h
---- ../gzip-1.6/lib/stdio-impl.h	2013-06-09 22:37:56.000000000 +0200
-+++ ./lib/stdio-impl.h	2014-02-25 23:50:09.000000000 +0100
-@@ -57,7 +57,7 @@
- #  define fp_ fp
- # endif
- 
--# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ /* NetBSD >= 1.5ZA, OpenBSD */
-+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD */
-   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-      and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
-   struct __sfileext
diff --git a/packages/gzip/zip.c.patch b/packages/gzip/zip.c.patch
deleted file mode 100644
index 668c6d45..00000000
--- a/packages/gzip/zip.c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Re-ordering the headers in the below patch fixes aarch64
-compilation, due to gzip.h defining
-
-#  define head (prev+WSIZE) 
-
-and <asm/sigcontext.h> using
-
-struct fpsimd_context {
-	struct _aarch64_ctx head;
-	/* ... */
-}
-
-diff -u -r ../gzip-1.6/zip.c ./zip.c
---- ../gzip-1.6/zip.c	2013-02-01 23:39:13.000000000 -0500
-+++ ./zip.c	2016-01-03 19:37:00.603075562 -0500
-@@ -20,12 +20,12 @@
- #include <config.h>
- #include <ctype.h>
- 
--#include "tailor.h"
--#include "gzip.h"
--
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#include "tailor.h"
-+#include "gzip.h"
-+
- local ulg crc;       /* crc on uncompressed file data */
- off_t header_bytes;   /* number of bytes in gzip header */
- 
-- 
2.11.0