diff options
| author | adam <adam@pkgsrc.org> | 2004-11-04 14:17:55 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2004-11-04 14:17:55 +0000 |
| commit | aad4ecc12fb9e16d4763f265fbe0edb3377cef26 (patch) | |
| tree | 7946250b0e4b96769402a98cf2d8546a09f772b9 /devel/zlib | |
| parent | bdf4be4da49e5f089e8cd4c744e9d0843c26c7fa (diff) | |
| download | pkgsrc-aad4ecc12fb9e16d4763f265fbe0edb3377cef26.tar.gz | |
Changes 1.2.2:
* Eliminate a potential security vulnerability when decoding invalid compressed data
* Fix bug when decompressing dynamic blocks with no distance codes
* Do not return error when using gzread() on an empty file
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/Makefile | 9 | ||||
| -rw-r--r-- | devel/zlib/distinfo | 8 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-ab | 14 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-ac | 14 |
4 files changed, 7 insertions, 38 deletions
diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile index 8259e6c0a5d..0e1030d7449 100644 --- a/devel/zlib/Makefile +++ b/devel/zlib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2004/10/03 00:13:34 tv Exp $ +# $NetBSD: Makefile,v 1.28 2004/11/04 14:17:55 adam Exp $ -DISTNAME= zlib-1.2.1 -PKGREVISION= 3 +DISTNAME= zlib-1.2.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ http://www.libpng.org/pub/png/src/ \ @@ -15,8 +14,8 @@ COMMENT= General purpose data compression library PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes -USE_LIBTOOL= # defined -HAS_CONFIGURE= # defined +USE_LIBTOOL= yes +HAS_CONFIGURE= yes INSTALLATION_DIRS= include lib man/man3 .include "../../mk/bsd.pkg.mk" diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo index 18c6f2fa6e5..8484b6fec24 100644 --- a/devel/zlib/distinfo +++ b/devel/zlib/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.9 2004/08/31 23:16:23 reed Exp $ +$NetBSD: distinfo,v 1.10 2004/11/04 14:17:55 adam Exp $ -SHA1 (zlib-1.2.1.tar.gz) = a3d51efc98b87b9ebd1a528d726007b0cb08a612 -Size (zlib-1.2.1.tar.gz) = 345833 bytes +SHA1 (zlib-1.2.2.tar.gz) = e6ec67108bfd1f321eb4f1bd192b648725219595 +Size (zlib-1.2.2.tar.gz) = 430469 bytes SHA1 (patch-aa) = 98ad332ebd33ab7eaa4fc8ee9a4b9269ba823b49 -SHA1 (patch-ab) = 1632590ca7c324d895686bab9c32cf104e9aa058 -SHA1 (patch-ac) = a345342e69d09c1172ac5c968511f4657fdd80cb diff --git a/devel/zlib/patches/patch-ab b/devel/zlib/patches/patch-ab deleted file mode 100644 index 4041c7fac03..00000000000 --- a/devel/zlib/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/08/31 23:16:23 reed Exp $ - ---- infback.c.orig Mon Aug 11 16:48:06 2003 -+++ infback.c -@@ -434,6 +434,9 @@ void FAR *out_desc; - } - } - -+ if (state->mode == BAD) -+ break; -+ - /* build code tables */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); diff --git a/devel/zlib/patches/patch-ac b/devel/zlib/patches/patch-ac deleted file mode 100644 index a4bd596709b..00000000000 --- a/devel/zlib/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/08/31 23:16:23 reed Exp $ - ---- inflate.c.orig Sat Oct 25 23:15:36 2003 -+++ inflate.c -@@ -861,6 +861,9 @@ int flush; - } - } - -+ if (state->mode == BAD) -+ break; -+ - /* build code tables */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); |