Update gzip to 1.3.12 and merge base and info back into gzip.

This includes many security fixes, improvements for files over 4GB,
portability improves, zless, etc.

6 files changed, 95 insertions, 19 deletions

diff --git a/archivers/gzip/DESCR b/archivers/gzip/DESCR
index 83324139d91..954e456a6c3 100644
--- a/archivers/gzip/DESCR
+++ b/archivers/gzip/DESCR
@@ -1,5 +1,7 @@
-GZIP (GNU zip) is a popular data compression program written by
-Jean-Loup Gailly <gzip@gnu.org> for the GNU project.
+GZIP (GNU zip) is a popular data compression program written by Jean-Loup
+Gailly <gzip@gnu.org> for the GNU project.
 
-This package provides easy installation of both the actual GZIP
-utility and its associated info documentation.
+This program was developed as a replacement for compress because of the UNISYS
+and IBM patents covering the LZW algorithm used by compress.  These patents
+made it impossible for us to use compress, and we needed a replacement.  The
+superior compression ratio of GZIP is just a bonus.
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index a92d53d665d..c8fdaef83da 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,27 +1,22 @@
-# $NetBSD: Makefile,v 1.18 2007/10/25 22:00:39 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/11/08 19:26:52 joerg Exp $
 #
 
-DISTNAME=	gzip-1.2.4b
-PKGREVISION=	1
+DISTNAME=	gzip-1.3.12
+SVR4_PKGNAME=	gzip
 CATEGORIES=	archivers
-MASTER_SITES=	# empty
-DISTFILES=	# empty
+MASTER_SITES=	${MASTER_SITE_GNU:=gzip/}
+EXTRACT_SUFX=	.tar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/gzip/gzip.html
-COMMENT=	The "meta-package" for the GZIP compression utility
-
-DEPENDS+=	gzip-base-1.2.4b{,nb[0-9]*}:../../archivers/gzip-base
-DEPENDS+=	gzip-info-1.2.4a{,nb[0-9]*}:../../archivers/gzip-info
+COMMENT=	Compress or expand files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	YES
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
-PLIST_SRC=	# empty (meta-package)
+CONFLICTS+=		gzip-base-[0-9]* gzip-info-[0-9]*
 
-do-install:	# empty
+GNU_CONFIGURE=	YES
+MAKE_FLAGS+=	manlinks=so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gzip/PLIST b/archivers/gzip/PLIST
new file mode 100644
index 00000000000..c261196338b
--- /dev/null
+++ b/archivers/gzip/PLIST
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST,v 1.5 2007/11/08 19:26:52 joerg Exp $
+bin/gunzip
+bin/gzexe
+bin/gzip
+bin/uncompress
+bin/zcat
+bin/zcmp
+bin/zdiff
+bin/zegrep
+bin/zfgrep
+bin/zforce
+bin/zgrep
+bin/zless
+bin/zmore
+bin/znew
+man/man1/gunzip.1
+man/man1/gzexe.1
+man/man1/gzip.1
+man/man1/zcat.1
+man/man1/zcmp.1
+man/man1/zdiff.1
+man/man1/zforce.1
+man/man1/zgrep.1
+man/man1/zless.1
+man/man1/zmore.1
+man/man1/znew.1
+share/info/dir
+share/info/gzip.info
+@dirrm share/info
diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo
new file mode 100644
index 00000000000..bf917173291
--- /dev/null
+++ b/archivers/gzip/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2007/11/08 19:26:52 joerg Exp $
+
+SHA1 (gzip-1.3.12.tar) = 330eb5f1b3dfab13a491352cb00b6573e5b55a5f
+RMD160 (gzip-1.3.12.tar) = 6845dfba2a275f4de488c3fb97e64405838a5005
+Size (gzip-1.3.12.tar) = 1822720 bytes
+SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4
+SHA1 (patch-ab) = 42309926f601998b97051aadc31ad44413716029
diff --git a/archivers/gzip/patches/patch-aa b/archivers/gzip/patches/patch-aa
new file mode 100644
index 00000000000..a11eace1194
--- /dev/null
+++ b/archivers/gzip/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/11/08 19:26:53 joerg Exp $
+
+--- gzip.h.orig	1993-08-13 08:35:00.000000000 +0100
++++ gzip.h
+@@ -199,6 +199,8 @@ extern int test;           /* check .z f
+ extern int to_stdout;      /* output to stdout (-c) */
+ extern int save_orig_name; /* set if original name must be saved */
+ 
++#define MIN(a,b) ((a) <= (b) ? (a) : (b))
++
+ #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
+ #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
+ 
diff --git a/archivers/gzip/patches/patch-ab b/archivers/gzip/patches/patch-ab
new file mode 100644
index 00000000000..b3329e01611
--- /dev/null
+++ b/archivers/gzip/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/11/08 19:26:53 joerg Exp $
+
+--- unpack.c.orig	1993-08-13 08:35:00.000000000 +0100
++++ unpack.c
+@@ -12,7 +12,6 @@ static char rcsid[] = "$Id: unpack.c,v 1
+ #include "gzip.h"
+ #include "crypt.h"
+ 
+-#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+ /* The arguments must not have side effects. */
+ 
+ #define MAX_BITLEN 25
+@@ -132,7 +131,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();
+ 	}
+     }
+@@ -168,7 +167,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 */
+-	while (prefixes--) *--prefixp = (uch)len;
++	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
+     }
+     /* The length of all other codes is unknown: */
+     while (prefixp > prefix_len) *--prefixp = 0;