gzip: Update from 1.6 to 1.7
authorFredrik Fornwall <fredrik@fornwall.net>
Tue, 29 Mar 2016 21:53:50 +0000 (17:53 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 29 Mar 2016 21:53:50 +0000 (17:53 -0400)
packages/gzip/build.sh
packages/gzip/stdio_impl_use_sfileext.patch [deleted file]
packages/gzip/zip.c.patch [deleted file]

index b82fd82..68ffd92 100644 (file)
@@ -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 (file)
index afe10f3..0000000
+++ /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 (file)
index 668c6d4..0000000
+++ /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 */