diff options
| author | snj <snj@pkgsrc.org> | 2005-07-07 20:52:10 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2005-07-07 20:52:10 +0000 |
| commit | c966b845818749fb27d17dfec9e7e1f169f9d504 (patch) | |
| tree | b1f0735b78da7ffa0ad7f51a65d649bebf50c945 /devel | |
| parent | 08b036b0133ac0154b0881ebc82d6fca9c9195f0 (diff) | |
| download | pkgsrc-c966b845818749fb27d17dfec9e7e1f169f9d504.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/zlib/Makefile | 3 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/zlib/distinfo | 3 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-ab | 13 |
4 files changed, 19 insertions, 4 deletions
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile index 1c644fbb6e6..0b01f79823f 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.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 --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 3f67c30ae4d..6761a3d075a 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -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 @@ BUILDLINK_PACKAGES+= zlib .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 --git a/devel/zlib/distinfo b/devel/zlib/distinfo index 00d6dcd33ac..9d30b7bc2c7 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.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 --git a/devel/zlib/patches/patch-ab b/devel/zlib/patches/patch-ab new file mode 100644 index 00000000000..d394628fd27 --- /dev/null +++ b/devel/zlib/patches/patch-ab @@ -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 */ |