pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers Update gzip to 1.3.12 and merge base and inf...
details: https://anonhg.NetBSD.org/pkgsrc/rev/944ead3f5a6b
branches: trunk
changeset: 535144:944ead3f5a6b
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Nov 08 19:26:52 2007 +0000
description:
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.
diffstat:
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(-)
diffs (truncated from 626 to 300 lines):
diff -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/DESCR
--- a/archivers/gzip-base/DESCR Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-GZIP (GNU zip) is a popular data compression program written by Jean-Loup
-Gailly <gzip%gnu.org@localhost> 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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/Makefile
--- a/archivers/gzip-base/Makefile Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/PLIST
--- a/archivers/gzip-base/PLIST Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/distinfo
--- a/archivers/gzip-base/distinfo Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/patches/patch-aa
--- a/archivers/gzip-base/patches/patch-aa Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/patches/patch-ab
--- a/archivers/gzip-base/patches/patch-ab Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/patches/patch-ac
--- a/archivers/gzip-base/patches/patch-ac Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/patches/patch-ad
--- a/archivers/gzip-base/patches/patch-ad Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r cc7d9cc2dafb -r 944ead3f5a6b archivers/gzip-base/patches/patch-ae
--- a/archivers/gzip-base/patches/patch-ae Thu Nov 08 19:00:56 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
Home |
Main Index |
Thread Index |
Old Index