[pkgsrc/pkgsrc-2005Q2]: pkgsrc/devel/zlib Pullup ticket 590 - requested by Ma...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95f95bcc527e
branches:  pkgsrc-2005Q2
changeset: 495861:95f95bcc527e
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu Jul 07 20:52:10 2005 +0000

description:
Pullup ticket 590 - requested by Matthias Drochner
security fix for zlib

Revisions pulled up:
- pkgsrc/devel/zlib/Makefile            1.30
- pkgsrc/devel/zlib/distinfo            1.13
- pkgsrc/devel/zlib/patches/patch-ab    1.5
- pkgsrc/devel/zlib/buildlink3.mk       1.19

    Module Name:    pkgsrc
    Committed By:   drochner
    Date:           Thu Jul  7 10:43:19 UTC 2005

    Modified Files:
            pkgsrc/devel/zlib: Makefile distinfo
    Added Files:
            pkgsrc/devel/zlib/patches: patch-ab

    Log Message:
    add a patch for CAN-2005-2096, from Debian
----
    Module Name:    pkgsrc
    Committed By:   tron
    Date:           Thu Jul  7 11:46:55 UTC 2005

    Modified Files:
            pkgsrc/devel/zlib: buildlink3.mk

    Log Message:
    Bump recommented version to 1.2.2nb1 because of CAN-2005-2096.

diffstat:

 devel/zlib/Makefile         |   3 ++-
 devel/zlib/buildlink3.mk    |   4 ++--
 devel/zlib/distinfo         |   3 ++-
 devel/zlib/patches/patch-ab |  13 +++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r 66ddce01fc0d -r 95f95bcc527e devel/zlib/Makefile
--- a/devel/zlib/Makefile       Sat Jul 02 07:12:32 2005 +0000
+++ b/devel/zlib/Makefile       Thu Jul 07 20:52:10 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.29.2.1 2005/07/07 20:52:10 snj 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 66ddce01fc0d -r 95f95bcc527e devel/zlib/buildlink3.mk
--- a/devel/zlib/buildlink3.mk  Sat Jul 02 07:12:32 2005 +0000
+++ b/devel/zlib/buildlink3.mk  Thu Jul 07 20:52:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.18.6.1 2005/07/07 20:52:10 snj Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=   ${ZLIB_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(ZLIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.zlib+=       zlib>=1.1.4nb1
-BUILDLINK_RECOMMENDED.zlib+=   zlib>=1.2.1nb3
+BUILDLINK_RECOMMENDED.zlib+=   zlib>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.zlib?=     ../../devel/zlib
 .endif # ZLIB_BUILDLINK3_MK
 
diff -r 66ddce01fc0d -r 95f95bcc527e devel/zlib/distinfo
--- a/devel/zlib/distinfo       Sat Jul 02 07:12:32 2005 +0000
+++ b/devel/zlib/distinfo       Thu Jul 07 20:52:10 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/04/10 17:43:27 schwarz Exp $
+$NetBSD: distinfo,v 1.12.2.1 2005/07/07 20:52:10 snj 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 66ddce01fc0d -r 95f95bcc527e devel/zlib/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/zlib/patches/patch-ab       Thu Jul 07 20:52:10 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4.6.1 2005/07/07 20:52:10 snj 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 */