[pkgsrc/trunk]: pkgsrc/devel/zlib add a patch for CAN-2005-2096, from Debian

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaf7b2d19ded
branches:  trunk
changeset: 496650:eaf7b2d19ded
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Jul 07 10:43:19 2005 +0000

description:
add a patch for CAN-2005-2096, from Debian

diffstat:

 devel/zlib/Makefile         |   3 ++-
 devel/zlib/distinfo         |   3 ++-
 devel/zlib/patches/patch-ab |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 968562b44c33 -r eaf7b2d19ded devel/zlib/Makefile
--- a/devel/zlib/Makefile       Thu Jul 07 09:01:28 2005 +0000
+++ b/devel/zlib/Makefile       Thu Jul 07 10:43:19 2005 +0000
@@ -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 -r 968562b44c33 -r eaf7b2d19ded devel/zlib/distinfo
--- a/devel/zlib/distinfo       Thu Jul 07 09:01:28 2005 +0000
+++ b/devel/zlib/distinfo       Thu Jul 07 10:43:19 2005 +0000
@@ -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 -r 968562b44c33 -r eaf7b2d19ded devel/zlib/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/zlib/patches/patch-ab       Thu Jul 07 10:43:19 2005 +0000
@@ -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 */