Changes 1.6:

The "--keep" (-k) option was added to not delete input files, in line with other tools such as xz, lzip, and bzip2. A decompression issue with certain invalid data in the 'pack' format was fixed. An incorrect overwrite when compiled with optimization was fixed. zgrep's handling of multi-digit context options was fixed. zmore now acts more like 'more'.

5 files changed, 26 insertions, 28 deletions

diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index bc7dd17cf9c..24d7df1e7d9 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2013/06/10 11:56:58 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.28 2013/06/11 08:28:30 adam Exp $
 
-DISTNAME=	gzip-1.5
+DISTNAME=	gzip-1.6
 SVR4_PKGNAME=	gzip
-PKGREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=gzip/}
-EXTRACT_SUFX=	.tar.gz
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
@@ -17,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CONFLICTS+=		gzip-base-[0-9]* gzip-info-[0-9]*
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 MAKE_FLAGS+=	manlinks=so
 INFO_FILES=	yes
 CHECK_PERMS=	no	# can't depend on checkperms; it's distfile is gzipped
diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo
index bf99caa2596..2f3484b499e 100644
--- a/archivers/gzip/distinfo
+++ b/archivers/gzip/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2013/06/10 11:56:58 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2013/06/11 08:28:30 adam Exp $
 
-SHA1 (gzip-1.5.tar.gz) = 56a80da7b032107372d3f3343bed7c7af452a826
-RMD160 (gzip-1.5.tar.gz) = 641a4a095a44174e924569c051a089c86081c7ac
-Size (gzip-1.5.tar.gz) = 1114684 bytes
+SHA1 (gzip-1.6.tar.xz) = 05bd01fc90178b806e0c13f9526e2ad392084085
+RMD160 (gzip-1.6.tar.xz) = a8bda5948f5a684d2042ba637d7d5da7047da5f1
+Size (gzip-1.6.tar.xz) = 725084 bytes
 SHA1 (patch-aa) = a08b277aa95df808d055f4daf95fd1462c300290
-SHA1 (patch-ab) = 53f75c7852c29dc00098c756dfd68b2831df13ed
-SHA1 (patch-lib_fflush.c) = 365fa9255262a9e5133dca9ac62d40adca19207d
-SHA1 (patch-lib_fseeko.c) = dcee26ff403a62da09a49ae79c99231d49d8e205
+SHA1 (patch-ab) = 738d6e5f9300c2718694cc4134b36637b323ea8a
+SHA1 (patch-lib_fflush.c) = 0cefe0da43d9d06afea104a42119c60b572def31
+SHA1 (patch-lib_fseeko.c) = b4b3bd14e237103e1e5b6f6268797e0705462474
diff --git a/archivers/gzip/patches/patch-ab b/archivers/gzip/patches/patch-ab
index 441fc21cf63..2809c0a6ae5 100644
--- a/archivers/gzip/patches/patch-ab
+++ b/archivers/gzip/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2013/06/09 16:55:08 ryoon Exp $
+$NetBSD: patch-ab,v 1.3 2013/06/11 08:28:30 adam Exp $
 
---- unpack.c.orig	2012-01-01 08:53:58.000000000 +0000
+--- unpack.c.orig	2013-02-02 04:39:13.000000000 +0000
 +++ unpack.c
 @@ -21,7 +21,6 @@
  #include "tailor.h"
@@ -10,16 +10,16 @@ $NetBSD: patch-ab,v 1.2 2013/06/09 16:55:08 ryoon Exp $
  /* The arguments must not have side effects. */
  
  #define MAX_BITLEN 25
-@@ -145,7 +144,7 @@ local void read_tree()
+@@ -157,7 +156,7 @@ local void read_tree()
          /* Remember where the literals of this length start in literal[] : */
          lit_base[len] = base;
          /* And read the literals: */
 -        for (n = leaves[len]; n > 0; n--) {
 +        for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
-             literal[base++] = (uch)get_byte();
+             literal[base++] = read_byte ();
          }
      }
-@@ -181,7 +180,7 @@ local void build_tree()
+@@ -193,7 +192,7 @@ local void build_tree()
      prefixp = &prefix_len[1<<peek_bits];
      for (len = 1; len <= peek_bits; len++) {
          int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
diff --git a/archivers/gzip/patches/patch-lib_fflush.c b/archivers/gzip/patches/patch-lib_fflush.c
index 50717f45cdd..be1a50310da 100644
--- a/archivers/gzip/patches/patch-lib_fflush.c
+++ b/archivers/gzip/patches/patch-lib_fflush.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_fflush.c,v 1.1 2013/06/10 11:56:58 ryoon Exp $
+$NetBSD: patch-lib_fflush.c,v 1.2 2013/06/11 08:28:30 adam Exp $
 
---- lib/fflush.c.orig	2012-06-17 17:05:17.000000000 +0000
+--- lib/fflush.c.orig	2013-06-09 20:37:56.000000000 +0000
 +++ lib/fflush.c
-@@ -94,7 +94,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
+@@ -96,7 +96,7 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P
                     off_t pos _GL_UNUSED_PARAMETER)
  {
- #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
--# if defined __CYGWIN__
-+# if defined(__CYGWIN__) || defined(__NetBSD__)
+ #  if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+-#   if defined __CYGWIN__
++#   if defined(__CYGWIN__) || defined(__NetBSD__)
    /* fp_->_offset is typed as an integer.  */
    fp_->_offset = pos;
- # else
+ #   else
diff --git a/archivers/gzip/patches/patch-lib_fseeko.c b/archivers/gzip/patches/patch-lib_fseeko.c
index 29c08240cf8..5f01b1be637 100644
--- a/archivers/gzip/patches/patch-lib_fseeko.c
+++ b/archivers/gzip/patches/patch-lib_fseeko.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_fseeko.c,v 1.1 2013/06/10 11:56:58 ryoon Exp $
+$NetBSD: patch-lib_fseeko.c,v 1.2 2013/06/11 08:28:30 adam Exp $
 
---- lib/fseeko.c.orig	2012-06-17 17:06:44.000000000 +0000
+--- lib/fseeko.c.orig	2013-04-07 01:59:54.000000000 +0000
 +++ lib/fseeko.c
 @@ -119,7 +119,7 @@ fseeko (FILE *fp, off_t offset, int when
        fp->_flags &= ~_IO_EOF_SEEN;
        fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 -# if defined __CYGWIN__
 +# if defined(__CYGWIN__) || defined(__NetBSD__)
        /* fp_->_offset is typed as an integer.  */