summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/gzip/Makefile7
-rw-r--r--archivers/gzip/distinfo16
-rw-r--r--archivers/gzip/patches/patch-ab32
-rw-r--r--archivers/gzip/patches/patch-ac13
-rw-r--r--archivers/gzip/patches/patch-ad20
-rw-r--r--archivers/gzip/patches/patch-ae9
-rw-r--r--archivers/gzip/patches/patch-af13
-rw-r--r--archivers/gzip/patches/patch-ag24
-rw-r--r--archivers/gzip/patches/patch-ah16
9 files changed, 24 insertions, 126 deletions
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 5e930fd364d..135cf372115 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2012/09/11 19:46:55 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/09 16:55:08 ryoon Exp $
#
-DISTNAME= gzip-1.3.12
-PKGREVISION= 3
+DISTNAME= gzip-1.5
SVR4_PKGNAME= gzip
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=gzip/}
-EXTRACT_SUFX= .tar
+EXTRACT_SUFX= .tar.gz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html
diff --git a/archivers/gzip/distinfo b/archivers/gzip/distinfo
index 78bcf07a3a7..8e0d34cfda7 100644
--- a/archivers/gzip/distinfo
+++ b/archivers/gzip/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/02/02 14:42:43 taca Exp $
+$NetBSD: distinfo,v 1.5 2013/06/09 16:55:08 ryoon Exp $
-SHA1 (gzip-1.3.12.tar) = 330eb5f1b3dfab13a491352cb00b6573e5b55a5f
-RMD160 (gzip-1.3.12.tar) = 6845dfba2a275f4de488c3fb97e64405838a5005
-Size (gzip-1.3.12.tar) = 1822720 bytes
+SHA1 (gzip-1.5.tar.gz) = 56a80da7b032107372d3f3343bed7c7af452a826
+RMD160 (gzip-1.5.tar.gz) = 641a4a095a44174e924569c051a089c86081c7ac
+Size (gzip-1.5.tar.gz) = 1114684 bytes
SHA1 (patch-aa) = 77b3cb5c2824f88295eb8c8c7c46c4ca23b776c4
-SHA1 (patch-ab) = 42309926f601998b97051aadc31ad44413716029
-SHA1 (patch-ac) = 8ef4b7105ca9b201079f5cf8799642e12184fda4
-SHA1 (patch-ad) = 082ced7d4a89a49b750525cc71bbf9a9abfc5b9e
-SHA1 (patch-ae) = a1d245c5cf055e9bd35fb7e810d5183a71cbfc74
-SHA1 (patch-af) = 28639dbe11ed8ce81bd1c29248b53af6cea55b88
-SHA1 (patch-ag) = 6b499fe28525643bfd5e5ece73fcd221eb9f964f
-SHA1 (patch-ah) = 0f92048912c2e682ba28d93bf5f309774d337790
+SHA1 (patch-ab) = 53f75c7852c29dc00098c756dfd68b2831df13ed
diff --git a/archivers/gzip/patches/patch-ab b/archivers/gzip/patches/patch-ab
index b3329e01611..441fc21cf63 100644
--- a/archivers/gzip/patches/patch-ab
+++ b/archivers/gzip/patches/patch-ab
@@ -1,30 +1,30 @@
-$NetBSD: patch-ab,v 1.1 2007/11/08 19:26:53 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2013/06/09 16:55:08 ryoon Exp $
---- unpack.c.orig 1993-08-13 08:35:00.000000000 +0100
+--- unpack.c.orig 2012-01-01 08:53:58.000000000 +0000
+++ unpack.c
-@@ -12,7 +12,6 @@ static char rcsid[] = "$Id: unpack.c,v 1
+@@ -21,7 +21,6 @@
+ #include "tailor.h"
#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();
- }
+@@ -145,7 +144,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()
+@@ -181,7 +180,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;
+ 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;
diff --git a/archivers/gzip/patches/patch-ac b/archivers/gzip/patches/patch-ac
deleted file mode 100644
index 945e5759677..00000000000
--- a/archivers/gzip/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/12/22 20:05:44 minskim Exp $
-
---- gzip.c.orig 2007-03-19 22:09:51.000000000 -0700
-+++ gzip.c
-@@ -1637,7 +1637,7 @@ local void copy_stat(ifstat)
- }
- }
-
-- if (futimens (ofd, ofname, timespec) != 0)
-+ if (gl_futimens (ofd, ofname, timespec) != 0)
- {
- int e = errno;
- WARN ((stderr, "%s: ", program_name));
diff --git a/archivers/gzip/patches/patch-ad b/archivers/gzip/patches/patch-ad
deleted file mode 100644
index 2220df16798..00000000000
--- a/archivers/gzip/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/12/22 20:05:44 minskim Exp $
-
---- lib/utimens.c.orig 2007-01-18 00:33:34.000000000 -0800
-+++ lib/utimens.c
-@@ -75,7 +75,7 @@ struct utimbuf
- Return 0 on success, -1 (setting errno) on failure. */
-
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
- char const *file, struct timespec const timespec[2])
- {
- /* Some Linux-based NFS clients are buggy, and mishandle time stamps
-@@ -185,5 +185,5 @@ futimens (int fd ATTRIBUTE_UNUSED,
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
-- return futimens (-1, file, timespec);
-+ return gl_futimens (-1, file, timespec);
- }
diff --git a/archivers/gzip/patches/patch-ae b/archivers/gzip/patches/patch-ae
deleted file mode 100644
index 8dd8051515e..00000000000
--- a/archivers/gzip/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/12/22 20:05:44 minskim Exp $
-
---- lib/utimens.h.orig 2007-02-23 10:25:21.000000000 -0800
-+++ lib/utimens.h
-@@ -1,3 +1,3 @@
- #include <time.h>
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
diff --git a/archivers/gzip/patches/patch-af b/archivers/gzip/patches/patch-af
deleted file mode 100644
index 698b1921f30..00000000000
--- a/archivers/gzip/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/09/07 08:02:27 dholland Exp $
-
---- zgrep.in~ 2007-02-05 15:54:26.000000000 -0500
-+++ zgrep.in 2008-09-07 03:58:59.000000000 -0400
-@@ -105,7 +105,7 @@ while test $# -ne 0; do
- files_with_matches=1;;
- (-L | --files-witho*)
- files_without_matches=1;;
-- (--no-f*)
-+ (-h | --no-f*)
- no_filename=1;;
- (-V | --v | --ve | --ver | --vers | --versi | --versio | --version)
- echo "$version" || exit 2
diff --git a/archivers/gzip/patches/patch-ag b/archivers/gzip/patches/patch-ag
deleted file mode 100644
index 03f98715bba..00000000000
--- a/archivers/gzip/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/02/02 14:42:43 taca Exp $
-
-Fix for CVE-2009-2624.
-
---- inflate.c.orig 2006-12-20 23:30:17.000000000 +0000
-+++ inflate.c
-@@ -335,13 +335,15 @@ int *m; /* maximum looku
- } while (--i);
- if (c[0] == n) /* null input--all zero length codes */
- {
-- q = (struct huft *) malloc (2 * sizeof *q);
-+ q = (struct huft *) malloc (3 * sizeof *q);
- if (!q)
- return 3;
-- hufts += 2;
-+ hufts += 3;
- q[0].v.t = (struct huft *) NULL;
- q[1].e = 99; /* invalid code marker */
- q[1].b = 1;
-+ q[2].e = 99; /* invalid code marker */
-+ q[2].b = 1;
- *t = q + 1;
- *m = 1;
- return 0;
diff --git a/archivers/gzip/patches/patch-ah b/archivers/gzip/patches/patch-ah
deleted file mode 100644
index 4673d11e765..00000000000
--- a/archivers/gzip/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2010/02/02 14:42:43 taca Exp $
-
-Fix for CVE-2010-0001.
-
---- unlzw.c.orig 2006-12-11 18:54:39.000000000 +0000
-+++ unlzw.c
-@@ -248,7 +248,8 @@ int unlzw(in, out)
- int o;
-
- resetbuf:
-- e = insize-(o = (posbits>>3));
-+ o = posbits >> 3;
-+ e = o <= insize ? insize - o : 0;
-
- for (i = 0 ; i < e ; ++i) {
- inbuf[i] = inbuf[i+o];
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 03:14:44 +0000