summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner>2005-07-07 10:43:19 +0000
committerdrochner <drochner>2005-07-07 10:43:19 +0000
commit33acc08d170a679a155481f36fb3691ee8062c0d (patch)
tree8c6de9b4637f19f71a78c6f10645a04b649fdea9
parent57d41ffcda6529d90811864140ad820568f48735 (diff)
downloadpkgsrc-33acc08d170a679a155481f36fb3691ee8062c0d.tar.gz
add a patch for CAN-2005-2096, from Debian
-rw-r--r--devel/zlib/Makefile3
-rw-r--r--devel/zlib/distinfo3
-rw-r--r--devel/zlib/patches/patch-ab13
3 files changed, 17 insertions, 2 deletions
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
index 1c644fbb6e6..306baf688b8 100644
--- a/devel/zlib/Makefile
+++ b/devel/zlib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/07 10:43:19 drochner Exp $
DISTNAME= zlib-1.2.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
http://www.libpng.org/pub/png/src/ \
diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo
index 00d6dcd33ac..b8ea516e9e0 100644
--- a/devel/zlib/distinfo
+++ b/devel/zlib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/04/10 17:43:27 schwarz Exp $
+$NetBSD: distinfo,v 1.13 2005/07/07 10:43:19 drochner Exp $
SHA1 (zlib-1.2.2.tar.gz) = e6ec67108bfd1f321eb4f1bd192b648725219595
RMD160 (zlib-1.2.2.tar.gz) = 374a85839d821c75f5630c7effd7f7e2047f67bb
Size (zlib-1.2.2.tar.gz) = 430469 bytes
SHA1 (patch-aa) = d3edeb170bf192ca986b00bc984b0de3487068b9
+SHA1 (patch-ab) = e9980a8dc5de17dffce276c147e4909867a4ef8b
diff --git a/devel/zlib/patches/patch-ab b/devel/zlib/patches/patch-ab
new file mode 100644
index 00000000000..af636eb29ff
--- /dev/null
+++ b/devel/zlib/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2005/07/07 10:43:19 drochner Exp $
+
+--- inftrees.c.orig 2005-07-07 12:31:09.000000000 +0200
++++ inftrees.c
+@@ -134,7 +134,7 @@ unsigned short FAR *work;
+ left -= count[len];
+ if (left < 0) return -1; /* over-subscribed */
+ }
+- if (left > 0 && (type == CODES || (codes - count[0] != 1)))
++ if (left > 0 && (type == CODES || max != 1))
+ return -1; /* incomplete set */
+
+ /* generate offsets into symbol table for each length for sorting */