From 606a4be83754a0ad2fca99aa92ce2443b3330345 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 8 Nov 2007 19:26:52 +0000 Subject: 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. --- archivers/gzip-base/DESCR | 7 -- archivers/gzip-base/Makefile | 21 ------ archivers/gzip-base/PLIST | 21 ------ archivers/gzip-base/distinfo | 11 --- archivers/gzip-base/patches/patch-aa | 36 ---------- archivers/gzip-base/patches/patch-ab | 78 --------------------- archivers/gzip-base/patches/patch-ac | 13 ---- archivers/gzip-base/patches/patch-ad | 13 ---- archivers/gzip-base/patches/patch-ae | 132 ----------------------------------- archivers/gzip-base/patches/patch-af | 30 -------- archivers/gzip-info/DESCR | 4 -- archivers/gzip-info/Makefile | 25 ------- archivers/gzip-info/PLIST | 2 - archivers/gzip-info/distinfo | 6 -- archivers/gzip-info/patches/patch-aa | 16 ----- archivers/gzip/DESCR | 10 +-- archivers/gzip/Makefile | 25 +++---- archivers/gzip/PLIST | 29 ++++++++ archivers/gzip/distinfo | 7 ++ archivers/gzip/patches/patch-aa | 13 ++++ archivers/gzip/patches/patch-ab | 30 ++++++++ 21 files changed, 95 insertions(+), 434 deletions(-) delete mode 100644 archivers/gzip-base/DESCR delete mode 100644 archivers/gzip-base/Makefile delete mode 100644 archivers/gzip-base/PLIST delete mode 100644 archivers/gzip-base/distinfo delete mode 100644 archivers/gzip-base/patches/patch-aa delete mode 100644 archivers/gzip-base/patches/patch-ab delete mode 100644 archivers/gzip-base/patches/patch-ac delete mode 100644 archivers/gzip-base/patches/patch-ad delete mode 100644 archivers/gzip-base/patches/patch-ae delete mode 100644 archivers/gzip-base/patches/patch-af delete mode 100644 archivers/gzip-info/DESCR delete mode 100644 archivers/gzip-info/Makefile delete mode 100644 archivers/gzip-info/PLIST delete mode 100644 archivers/gzip-info/distinfo delete mode 100644 archivers/gzip-info/patches/patch-aa create mode 100644 archivers/gzip/PLIST create mode 100644 archivers/gzip/distinfo create mode 100644 archivers/gzip/patches/patch-aa create mode 100644 archivers/gzip/patches/patch-ab (limited to 'archivers') diff --git a/archivers/gzip-base/DESCR b/archivers/gzip-base/DESCR deleted file mode 100644 index 954e456a6c3..00000000000 --- a/archivers/gzip-base/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -GZIP (GNU zip) is a popular data compression program written by Jean-Loup -Gailly for the GNU project. - -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-base/Makefile b/archivers/gzip-base/Makefile deleted file mode 100644 index 38ffec39df3..00000000000 --- a/archivers/gzip-base/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: Makefile,v 1.23 2006/09/23 13:52:17 adrianp Exp $ -# - -DISTNAME= gzip-1.2.4a -PKGNAME= ${DISTNAME:S/gzip-/gzip-base-/:S/a$/b/} -PKGREVISION= 2 -SVR4_PKGNAME= gzipb -CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_GNU:=gzip/} -EXTRACT_SUFX= .shar - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html -COMMENT= Compress or expand files - -PKG_INSTALLATION_TYPES= overwrite pkgviews - -GNU_CONFIGURE= YES -MAKE_FLAGS+= manlinks=so - -.include "../../mk/bsd.pkg.mk" diff --git a/archivers/gzip-base/PLIST b/archivers/gzip-base/PLIST deleted file mode 100644 index 276ad6d91e0..00000000000 --- a/archivers/gzip-base/PLIST +++ /dev/null @@ -1,21 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:28 zuntum Exp $ -bin/gunzip -bin/gzexe -bin/gzip -bin/zcat -bin/zcmp -bin/zdiff -bin/zforce -bin/zgrep -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/zmore.1 -man/man1/znew.1 diff --git a/archivers/gzip-base/distinfo b/archivers/gzip-base/distinfo deleted file mode 100644 index f51dfec8b50..00000000000 --- a/archivers/gzip-base/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.8 2006/09/23 13:52:17 adrianp Exp $ - -SHA1 (gzip-1.2.4a.shar) = 1e1e513f48be32ecfe24c06b609329963d5a5288 -RMD160 (gzip-1.2.4a.shar) = 529397e68b2ed7f39b3a4d3201fd73d10a9c1ebc -Size (gzip-1.2.4a.shar) = 832431 bytes -SHA1 (patch-aa) = 8aff9b00f5798a6d4a77ed13a4d9191330fface2 -SHA1 (patch-ab) = e8c7e210c1e7e443230ba20266c0232f29002a4b -SHA1 (patch-ac) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4 -SHA1 (patch-ad) = 46ae4e79ee8e9a743682a4fb3fecb139b3cef411 -SHA1 (patch-ae) = fefe0f2a3391c48fc9331ac3354a3fdd39c2ed9f -SHA1 (patch-af) = 42309926f601998b97051aadc31ad44413716029 diff --git a/archivers/gzip-base/patches/patch-aa b/archivers/gzip-base/patches/patch-aa deleted file mode 100644 index c28d1d843ee..00000000000 --- a/archivers/gzip-base/patches/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/12/28 04:36:31 reed Exp $ - ---- Makefile.in.orig 1993-08-17 13:12:00.000000000 -0700 -+++ Makefile.in -@@ -100,11 +100,11 @@ infodir = $(prefix)/info - # Extension (not including `.') for the installed manual page filenames. - manext = 1 - # Where to install the manual pages. --mandir = $(prefix)/man/man$(manext) -+mandir = $(prefix)/$(PKGMANDIR)/man$(manext) - # Use manlinks=so to use the .so method instead of hard links - manlinks = ln - --alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir) -+alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(mandir) - - #### End of system configuration section. #### - -@@ -206,7 +206,7 @@ install: installdirs installbin installm - installbin: all - $(INSTALL_PROGRAM) gzip$X $(bindir)/gzip$X - for f in $(SCRIPTS); do \ -- $(INSTALL_PROGRAM) $${f} $(scriptdir)/$${f}; done -+ $(BSD_INSTALL_SCRIPT) $${f} $(scriptdir)/$${f}; done - rm -f $(scriptdir)/$(G)zcmp; \ - ln $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp - for f in gunzip$X ungzip$X $(ZCAT)$X ; do \ -@@ -237,8 +237,6 @@ installman: gzip.info - ln $(G)zdiff.$(manext) $(G)zcmp.$(manext);\ - ln gzip.$(manext) gunzip.$(manext);\ - fi -- -cd $(srcdir); for f in gzip.info* ; do $(INSTALL_DATA) $${f} \ -- $(infodir)/$${f}; done - - uninstall: force - -cd $(bindir); rm -f gzip$X gunzip$X $(ZCAT)$X diff --git a/archivers/gzip-base/patches/patch-ab b/archivers/gzip-base/patches/patch-ab deleted file mode 100644 index 98a1bd686ee..00000000000 --- a/archivers/gzip-base/patches/patch-ab +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2005/06/09 20:23:26 adrianp Exp $ - -# CAN-2005-1228 and CAN-2005-0988 - ---- gzip.c.orig 1993-08-19 09:39:00.000000000 +0100 -+++ gzip.c -@@ -824,8 +824,11 @@ local void treat_file(iname) - } - - close(ifd); -- if (!to_stdout && close(ofd)) { -- write_error(); -+ if (!to_stdout) { -+ /* Copy modes, times, ownership, and remove the input file */ -+ copy_stat(&istat); -+ if (close(ofd)) -+ write_error(); - } - if (method == -1) { - if (!to_stdout) unlink (ofname); -@@ -845,10 +848,6 @@ local void treat_file(iname) - } - fprintf(stderr, "\n"); - } -- /* Copy modes, times, ownership, and remove the input file */ -- if (!to_stdout) { -- copy_stat(&istat); -- } - } - - /* ======================================================================== -@@ -1005,7 +1004,14 @@ local int get_istat(iname, sbuf) - #ifdef NO_MULTIPLE_DOTS - char *dot; /* pointer to ifname extension, or NULL */ - #endif -+ int max_suffix_len = (z_len > 3 ? z_len : 3); - -+ /* Leave enough room in ifname or ofname for suffix: */ -+ if (strlen(iname) >= sizeof(ifname) - max_suffix_len) { -+ strncpy(ifname, iname, sizeof(ifname) - 1); -+ /* last byte of ifname is already zero and never overwritten */ -+ error("file name too long"); -+ } - strcpy(ifname, iname); - - /* If input file exists, return OK. */ -@@ -1244,6 +1250,7 @@ local int get_method(in) - /* Copy the base name. Keep a directory prefix intact. */ - char *p = basename(ofname); - char *base = p; -+ char *base2; - for (;;) { - *p = (char)get_char(); - if (*p++ == '\0') break; -@@ -1251,6 +1258,8 @@ local int get_method(in) - error("corrupted input -- file name too large"); - } - } -+ base2 = basename (base); -+ strcpy(base, base2); - /* If necessary, adapt the name to local OS conventions: */ - if (!list) { - MAKE_LEGAL_NAME(base); -@@ -1624,12 +1633,12 @@ local void copy_stat(ifstat) - reset_times(ofname, ifstat); - #endif - /* Copy the protection modes */ -- if (chmod(ofname, ifstat->st_mode & 07777)) { -+ if (fchmod(ofd, ifstat->st_mode & 07777)) { - WARN((stderr, "%s: ", progname)); - if (!quiet) perror(ofname); - } - #ifndef NO_CHOWN -- chown(ofname, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ -+ (void) fchown(ofd, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ - #endif - remove_ofname = 0; - /* It's now safe to remove the input file: */ diff --git a/archivers/gzip-base/patches/patch-ac b/archivers/gzip-base/patches/patch-ac deleted file mode 100644 index e6912509d70..00000000000 --- a/archivers/gzip-base/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/09/23 13:52:17 adrianp 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-base/patches/patch-ad b/archivers/gzip-base/patches/patch-ad deleted file mode 100644 index b93ba61758e..00000000000 --- a/archivers/gzip-base/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/09/23 13:52:17 adrianp Exp $ - ---- inflate.c.orig 1993-08-13 10:50:00.000000000 +0100 -+++ inflate.c -@@ -316,7 +316,7 @@ int *m; /* maximum looku - { - *t = (struct huft *)NULL; - *m = 0; -- return 0; -+ return 2; - } - - diff --git a/archivers/gzip-base/patches/patch-ae b/archivers/gzip-base/patches/patch-ae deleted file mode 100644 index 9cbb875bb43..00000000000 --- a/archivers/gzip-base/patches/patch-ae +++ /dev/null @@ -1,132 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/09/23 13:52:17 adrianp Exp $ - ---- unlzh.c.orig 1993-08-13 08:35:00.000000000 +0100 -+++ unlzh.c -@@ -148,13 +148,17 @@ local void make_table(nchar, bitlen, tab - unsigned i, k, len, ch, jutbits, avail, nextcode, mask; - - for (i = 1; i <= 16; i++) count[i] = 0; -- for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++; -+ for (i = 0; i < (unsigned)nchar; i++) { -+ if (bitlen[i] > 16) -+ error("Bad table (case a)\n"); -+ else count[bitlen[i]]++; -+ } - - start[1] = 0; - for (i = 1; i <= 16; i++) - start[i + 1] = start[i] + (count[i] << (16 - i)); -- if ((start[17] & 0xffff) != 0) -- error("Bad table\n"); -+ if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */ -+ error("Bad table (case b)\n"); - - jutbits = 16 - tablebits; - for (i = 1; i <= (unsigned)tablebits; i++) { -@@ -168,15 +172,15 @@ local void make_table(nchar, bitlen, tab - - i = start[tablebits + 1] >> jutbits; - if (i != 0) { -- k = 1 << tablebits; -- while (i != k) table[i++] = 0; -+ k = MIN(1 << tablebits, DIST_BUFSIZE); -+ while (i < k) table[i++] = 0; - } - - avail = nchar; - mask = (unsigned) 1 << (15 - tablebits); - for (ch = 0; ch < (unsigned)nchar; ch++) { - if ((len = bitlen[ch]) == 0) continue; -- nextcode = start[len] + weight[len]; -+ nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE); - if (len <= (unsigned)tablebits) { - for (i = start[len]; i < nextcode; i++) table[i] = ch; - } else { -@@ -217,7 +221,7 @@ local void read_pt_len(nn, nbit, i_speci - for (i = 0; i < 256; i++) pt_table[i] = c; - } else { - i = 0; -- while (i < n) { -+ while (i < MIN(n,NPT)) { - c = bitbuf >> (BITBUFSIZ - 3); - if (c == 7) { - mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3); -@@ -227,7 +231,7 @@ local void read_pt_len(nn, nbit, i_speci - pt_len[i++] = c; - if (i == i_special) { - c = getbits(2); -- while (--c >= 0) pt_len[i++] = 0; -+ while (--c >= 0 && i < NPT) pt_len[i++] = 0; - } - } - while (i < nn) pt_len[i++] = 0; -@@ -247,7 +251,7 @@ local void read_c_len() - for (i = 0; i < 4096; i++) c_table[i] = c; - } else { - i = 0; -- while (i < n) { -+ while (i < MIN(n,NC)) { - c = pt_table[bitbuf >> (BITBUFSIZ - 8)]; - if (c >= NT) { - mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8); -@@ -255,14 +259,14 @@ local void read_c_len() - if (bitbuf & mask) c = right[c]; - else c = left [c]; - mask >>= 1; -- } while (c >= NT); -+ } while (c >= NT && (mask || c != left[c])); - } - fillbuf((int) pt_len[c]); - if (c <= 2) { - if (c == 0) c = 1; - else if (c == 1) c = getbits(4) + 3; - else c = getbits(CBIT) + 20; -- while (--c >= 0) c_len[i++] = 0; -+ while (--c >= 0 && i < NC) c_len[i++] = 0; - } else c_len[i++] = c - 2; - } - while (i < NC) c_len[i++] = 0; -@@ -291,7 +295,7 @@ local unsigned decode_c() - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NC); -+ } while (j >= NC && (mask || j != left[j])); - } - fillbuf((int) c_len[j]); - return j; -@@ -308,7 +312,7 @@ local unsigned decode_p() - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NP); -+ } while (j >= NP && (mask || j != left[j])); - } - fillbuf((int) pt_len[j]); - if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1)); -@@ -355,7 +359,7 @@ local unsigned decode(count, buffer) - while (--j >= 0) { - buffer[r] = buffer[i]; - i = (i + 1) & (DICSIZ - 1); -- if (++r == count) return r; -+ if (++r >= count) return r; - } - for ( ; ; ) { - c = decode_c(); -@@ -365,14 +369,14 @@ local unsigned decode(count, buffer) - } - if (c <= UCHAR_MAX) { - buffer[r] = c; -- if (++r == count) return r; -+ if (++r >= count) return r; - } else { - j = c - (UCHAR_MAX + 1 - THRESHOLD); - i = (r - decode_p() - 1) & (DICSIZ - 1); - while (--j >= 0) { - buffer[r] = buffer[i]; - i = (i + 1) & (DICSIZ - 1); -- if (++r == count) return r; -+ if (++r >= count) return r; - } - } - } diff --git a/archivers/gzip-base/patches/patch-af b/archivers/gzip-base/patches/patch-af deleted file mode 100644 index b465798ce41..00000000000 --- a/archivers/gzip-base/patches/patch-af +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/09/23 13:52:17 adrianp 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< prefix_len) *--prefixp = (uch)len; - } - /* The length of all other codes is unknown: */ - while (prefixp > prefix_len) *--prefixp = 0; diff --git a/archivers/gzip-info/DESCR b/archivers/gzip-info/DESCR deleted file mode 100644 index 0ed5164deb6..00000000000 --- a/archivers/gzip-info/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -GZIP (GNU zip) is a popular data compression program written by -Jean-Loup Gailly for the GNU project. - -This package provides info pages for the GZIP utility. diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile deleted file mode 100644 index c4b24e3ae00..00000000000 --- a/archivers/gzip-info/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.23 2006/06/18 07:04:16 rillig Exp $ - -DISTNAME= gzip-1.2.4a -PKGNAME= gzip-info-1.2.4a -SVR4_PKGNAME= gzipi -CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_GNU:=gzip/} -EXTRACT_SUFX= .shar - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html -COMMENT= Info format documentation for the GZIP utility - -PKG_INSTALLATION_TYPES= overwrite pkgviews - -NO_CONFIGURE= yes -NO_BUILD= yes -INFO_FILES= yes - -INSTALLATION_DIRS= ${PKGINFODIR} - -do-install: - ${INSTALL_DATA} ${WRKSRC}/gzip.info ${PREFIX}/${PKGINFODIR} - -.include "../../mk/bsd.pkg.mk" diff --git a/archivers/gzip-info/PLIST b/archivers/gzip-info/PLIST deleted file mode 100644 index b5c29c9cf78..00000000000 --- a/archivers/gzip-info/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2006/03/20 18:15:37 jlam Exp $ -info/gzip.info diff --git a/archivers/gzip-info/distinfo b/archivers/gzip-info/distinfo deleted file mode 100644 index fd73bf40164..00000000000 --- a/archivers/gzip-info/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 14:45:23 agc Exp $ - -SHA1 (gzip-1.2.4a.shar) = 1e1e513f48be32ecfe24c06b609329963d5a5288 -RMD160 (gzip-1.2.4a.shar) = 529397e68b2ed7f39b3a4d3201fd73d10a9c1ebc -Size (gzip-1.2.4a.shar) = 832431 bytes -SHA1 (patch-aa) = 638a5f3fac7dd61d86f40a1fcee9b29bc77a63b7 diff --git a/archivers/gzip-info/patches/patch-aa b/archivers/gzip-info/patches/patch-aa deleted file mode 100644 index fc857206deb..00000000000 --- a/archivers/gzip-info/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/06/25 22:14:19 seb Exp $ - ---- gzip.info.orig 1999-02-02 18:51:00.000000000 +0000 -+++ gzip.info -@@ -1,6 +1,11 @@ - This is Info file gzip.info, produced by Makeinfo version 1.67 from the - input file gzip.texi. - -+INFO-DIR-SECTION Utilities -+START-INFO-DIR-ENTRY -+* GNU gzip: (gzip). Compress or expand files. -+END-INFO-DIR-ENTRY -+ - This file documents the the GNU `gzip' command for compressing files. - - Copyright (C) 1992-1993 Jean-loup Gailly 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 for the GNU project. +GZIP (GNU zip) is a popular data compression program written by Jean-Loup +Gailly 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< prefix_len) *--prefixp = (uch)len; + } + /* The length of all other codes is unknown: */ + while (prefixp > prefix_len) *--prefixp = 0; -- cgit v1.2.3