diff options
| author | drochner <drochner@pkgsrc.org> | 2005-07-22 16:04:43 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2005-07-22 16:04:43 +0000 |
| commit | 5ddb8cbb636e96650c450fb9424c66674654df0d (patch) | |
| tree | 52b54f0465fcb7bb0552c7e45459abff2fae81fb /devel/zlib | |
| parent | 5cc5034daaa15da842a892c5f0c2f97c5beffe46 (diff) | |
| download | pkgsrc-5ddb8cbb636e96650c450fb9424c66674654df0d.tar.gz | |
update to 1.2.3
this fixes (at least) another security problem (DoS, CAN-2005-1849)
changes:
-Eliminate a potential security vulnerability when decoding invalid
compressed data
-Eliminate a potential security vulnerability when decoding specially
crafted compressed data
-Fix a bug when decompressing dynamic blocks with no distance codes
-Fix crc check bug in gzread() after gzungetc()
-Do not return an error when using gzread() on an empty file
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/Makefile | 5 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/zlib/distinfo | 9 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-ab | 13 |
4 files changed, 8 insertions, 23 deletions
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile index 306baf688b8..d1f83ea4ecc 100644 --- a/devel/zlib/Makefile +++ b/devel/zlib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2005/07/07 10:43:19 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2005/07/22 16:04:43 drochner Exp $ -DISTNAME= zlib-1.2.2 -PKGREVISION= 1 +DISTNAME= zlib-1.2.3 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 4b3435f08af..c94b0b636ea 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2005/07/07 11:46:55 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2005/07/22 16:04:43 drochner 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.2nb1 +BUILDLINK_RECOMMENDED.zlib+= zlib>=1.2.3 BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib .endif # ZLIB_BUILDLINK3_MK diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo index b8ea516e9e0..ca8d3cd3914 100644 --- a/devel/zlib/distinfo +++ b/devel/zlib/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.13 2005/07/07 10:43:19 drochner Exp $ +$NetBSD: distinfo,v 1.14 2005/07/22 16:04:43 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 (zlib-1.2.3.tar.gz) = 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 +RMD160 (zlib-1.2.3.tar.gz) = 89a57e336c24f7f6eebda3a1724e14b71187e117 +Size (zlib-1.2.3.tar.gz) = 496597 bytes SHA1 (patch-aa) = d3edeb170bf192ca986b00bc984b0de3487068b9 -SHA1 (patch-ab) = e9980a8dc5de17dffce276c147e4909867a4ef8b diff --git a/devel/zlib/patches/patch-ab b/devel/zlib/patches/patch-ab deleted file mode 100644 index af636eb29ff..00000000000 --- a/devel/zlib/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$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 */ |