Update unzip to 6.0

4 files changed, 42 insertions, 13 deletions

diff --git a/data/unzip/_metadata/version b/data/unzip/_metadata/version
index bb2d831e7..e0ea36fee 100644
--- a/data/unzip/_metadata/version
+++ b/data/unzip/_metadata/version
@@ -1 +1 @@
-5.52
+6.0
diff --git a/data/unzip/timestamp.diff b/data/unzip/timestamp.diff
index 92d4f7e44..f67747fc2 100644
--- a/data/unzip/timestamp.diff
+++ b/data/unzip/timestamp.diff
@@ -1,6 +1,6 @@
-diff -ru unzip-5.52/consts.h unzip-5.52+iPhone/consts.h
---- unzip-5.52/consts.h	2002-03-23 15:52:48.000000000 +0000
-+++ unzip-5.52+iPhone/consts.h	2008-06-18 15:43:47.000000000 +0000
+diff -ur unzip60/consts.h unzip60+iPhone/consts.h
+--- unzip60/consts.h	2002-03-23 05:52:48.000000000 -1000
++++ unzip60+iPhone/consts.h	2018-08-06 11:35:37.000000000 -1000
 @@ -50,5 +50,5 @@
  
  #ifndef SFX
@@ -8,10 +8,10 @@ diff -ru unzip-5.52/consts.h unzip-5.52+iPhone/consts.h
 -  ZCONST char Far CompiledWith[] = "Compiled with %s%s for %s%s%s%s.\n\n";
 +  ZCONST char Far CompiledWith[] = "Compiled with %s%s for %s%s.\n\n";
  #endif
-diff -ru unzip-5.52/unix/unix.c unzip-5.52+iPhone/unix/unix.c
---- unzip-5.52/unix/unix.c	2005-02-26 19:43:42.000000000 +0000
-+++ unzip-5.52+iPhone/unix/unix.c	2008-06-18 15:43:35.000000000 +0000
-@@ -1323,147 +1323,147 @@
+diff -ur unzip60/unix/unix.c unzip60+iPhone/unix/unix.c
+--- unzip60/unix/unix.c	2009-01-23 13:31:26.000000000 -1000
++++ unzip60+iPhone/unix/unix.c	2018-08-06 11:43:37.000000000 -1000
+@@ -1517,162 +1517,170 @@
        IZ_OS_NAME,
  
  #if defined(sgi) || defined(__sgi)
@@ -43,8 +43,8 @@ diff -ru unzip-5.52/unix/unix.c unzip-5.52+iPhone/unix/unix.c
  #  endif
  #else
  #ifdef __hpux
--      " (HP/UX)",
-+      " (HP/UX)"
+-      " (HP-UX)",
++      " (HP-UX)"
  #else
  #ifdef __osf__
 -      " (DEC OSF/1)",
@@ -197,13 +197,40 @@ diff -ru unzip-5.52/unix/unix.c unzip-5.52+iPhone/unix/unix.c
 -      " (LynxOS)",
 +      " (LynxOS)"
  #else
+ #ifdef __APPLE__
+ #  ifdef __i386__
+-      " Mac OS X Intel i32",
++      " Mac OS X Intel i32"
+ #  else
+ #  ifdef __ppc__
+-      " Mac OS X PowerPC",
++      " Mac OS X PowerPC"
+ #  else
+ #  ifdef __ppc64__
+-      " Mac OS X PowerPC64",
++      " Mac OS X PowerPC64"
+ #  else
+-      " Mac OS X",
++#  ifdef __arm__
++      " iPhoneOS ARM"
++#  else
++#  ifdef __arm64__
++      " iPhoneOS ARM64"
++#  else
++      " Mac OS X"
++#  endif /* __arm64__ */
++#  endif /* __arm__ */
+ #  endif /* __ppc64__ */
+ #  endif /* __ppc__ */
+ #  endif /* __i386__ */
+ #else
 -      "",
 +      ""
+ #endif /* Apple */
  #endif /* Lynx */
  #endif /* QNX Neutrino */
- #endif /* QNX 4 */
-@@ -1494,12 +1494,6 @@
- #endif /* HP/UX */
+@@ -1704,12 +1712,6 @@
+ #endif /* HP-UX */
  #endif /* Sun */
  #endif /* SGI */
 -
@@ -215,3 +242,5 @@ diff -ru unzip-5.52/unix/unix.c unzip-5.52+iPhone/unix/unix.c
      );
  
      (*G.message)((zvoid *)&G, slide, (ulg)strlen((char *)slide), 0);
+Only in unzip60+iPhone/unix: unix.c.orig
+Only in unzip60+iPhone/unix: unix.c.rej
diff --git a/data/unzip/unzip552.tar.gz b/data/unzip/unzip552.tar.gz
deleted file mode 100644
index ef39c84a5..000000000
--- a/data/unzip/unzip552.tar.gz
+++ /dev/null
diff --git a/data/unzip/unzip60.tar.gz b/data/unzip/unzip60.tar.gz
new file mode 100644
index 000000000..ed145ca58
--- /dev/null
+++ b/data/unzip/unzip60.tar.gz