pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/zlib Changes in 1.2.11 (15 Jan 2017)
details: https://anonhg.NetBSD.org/pkgsrc/rev/ee0183f5330d
branches: trunk
changeset: 360584:ee0183f5330d
user: adam <adam%pkgsrc.org@localhost>
date: Tue Apr 04 08:57:33 2017 +0000
description:
Changes in 1.2.11 (15 Jan 2017)
- Fix deflate stored bug when pulling last block from window
- Permit immediate deflateParams changes before any deflate input
Changes in 1.2.10 (2 Jan 2017)
- Avoid warnings on snprintf() return value
- Fix bug in deflate_stored() for zero-length input
- Fix bug in gzwrite.c that produced corrupt gzip files
- Remove files to be installed before copying them in Makefile.in
- Add warnings when compiling with assembler code
Changes in 1.2.9 (31 Dec 2016)
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
- Improve contrib/blast to return unused bytes
- Assure that gzoffset() is correct when appending
- Improve compress() and uncompress() to support large lengths
- Fix bug in test/example.c where error code not saved
- Remedy Coverity warning [Randers-Pehrson]
- Improve speed of gzprintf() in transparent mode
- Fix inflateInit2() bug when windowBits is 16 or 32
- Change DEBUG macro to ZLIB_DEBUG
- Avoid uninitialized access by gzclose_w()
- Allow building zlib outside of the source directory
- Fix bug that accepted invalid zlib header when windowBits is zero
- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
- Loop on write() calls in gzwrite.c in case of non-blocking I/O
- Add --warn (-w) option to ./configure for more compiler warnings
- Reject a window size of 256 bytes if not using the zlib wrapper
- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
- Fix bugs in creating a very large gzip header
- Add uncompress2() function, which returns the input size used
- Assure that deflateParams() will not switch functions mid-block
- Dramatically speed up deflation for level 0 (storing)
- Add gzfread(), duplicating the interface of fread()
- Add gzfwrite(), duplicating the interface of fwrite()
- Add deflateGetDictionary() function
- Use snprintf() for later versions of Microsoft C
- Fix *Init macros to use z_ prefix when requested
- Replace as400 with os400 for OS/400 support [Monnerat]
- Add crc32_z() and adler32_z() functions with size_t lengths
- Update Visual Studio project files [AraHaan]
diffstat:
devel/zlib/Makefile | 25 +-
devel/zlib/builtin.mk | 8 +-
devel/zlib/files/ChangeLog | 57 ++-
devel/zlib/files/README | 6 +-
devel/zlib/files/adler32.c | 23 +-
devel/zlib/files/compress.c | 44 +-
devel/zlib/files/crc32.c | 43 +-
devel/zlib/files/deflate.c | 868 ++++++++++++++++++++++++++-----------------
devel/zlib/files/deflate.h | 37 +-
devel/zlib/files/gzguts.h | 23 +-
devel/zlib/files/gzlib.c | 31 +-
devel/zlib/files/gzread.c | 158 +++++--
devel/zlib/files/gzwrite.c | 334 ++++++++++------
devel/zlib/files/infback.c | 4 +-
devel/zlib/files/inffast.c | 85 +--
devel/zlib/files/inflate.c | 123 ++++-
devel/zlib/files/inflate.h | 11 +-
devel/zlib/files/inftrees.c | 26 +-
devel/zlib/files/trees.c | 101 +---
devel/zlib/files/uncompr.c | 118 +++--
devel/zlib/files/zconf.h | 43 +-
devel/zlib/files/zlib.3 | 72 +-
devel/zlib/files/zlib.h | 444 ++++++++++++++-------
devel/zlib/files/zutil.c | 51 +-
devel/zlib/files/zutil.h | 54 +-
25 files changed, 1724 insertions(+), 1065 deletions(-)
diffs (truncated from 5344 to 300 lines):
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/Makefile
--- a/devel/zlib/Makefile Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/Makefile Tue Apr 04 08:57:33 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:08 agc Exp $
+# $NetBSD: Makefile,v 1.55 2017/04/04 08:57:33 adam Exp $
-DISTNAME= zlib-1.2.8
-PKGREVISION= 3
+DISTNAME= zlib-1.2.11
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/}
MASTER_SITES+= http://zlib.net/
@@ -27,16 +26,16 @@
.endif
LDFLAGS.SunOS+= -Wl,-zignore # avoid unused reference to libgcc_s.so
-SUBST_CLASSES+= pc
-SUBST_MESSAGE.pc= pkg-config file substitutions
-SUBST_STAGE.pc= pre-configure
-SUBST_FILES.pc= zlib.pc.in
-SUBST_SED.pc= -e "s,@prefix@,${PREFIX},g"
-SUBST_SED.pc+= -e "s,@exec_prefix@,${PREFIX},g"
-SUBST_SED.pc+= -e "s,@VERSION@,${PKGVERSION_NOREV},g"
-SUBST_SED.pc+= -e "s,@includedir@,${PREFIX}/include,g"
-SUBST_SED.pc+= -e "s,@libdir@,${PREFIX}/lib,g"
-SUBST_SED.pc+= -e "s,@sharedlibdir@,${PREFIX}/lib,g"
+SUBST_CLASSES+= pc
+SUBST_MESSAGE.pc= pkg-config file substitutions
+SUBST_STAGE.pc= pre-configure
+SUBST_FILES.pc= zlib.pc.in
+SUBST_SED.pc= -e "s,@prefix@,${PREFIX},g"
+SUBST_SED.pc+= -e "s,@exec_prefix@,${PREFIX},g"
+SUBST_SED.pc+= -e "s,@VERSION@,${PKGVERSION_NOREV},g"
+SUBST_SED.pc+= -e "s,@includedir@,${PREFIX}/include,g"
+SUBST_SED.pc+= -e "s,@libdir@,${PREFIX}/lib,g"
+SUBST_SED.pc+= -e "s,@sharedlibdir@,${PREFIX}/lib,g"
INSTALLATION_DIRS= include lib/pkgconfig ${PKGMANDIR}/man3
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/builtin.mk
--- a/devel/zlib/builtin.mk Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/builtin.mk Tue Apr 04 08:57:33 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2014/01/14 20:34:49 bsiegert Exp $
+# $NetBSD: builtin.mk,v 1.13 2017/04/04 08:57:33 adam Exp $
BUILTIN_PKG:= zlib
@@ -37,7 +37,7 @@
print vers; \
} \
' ${H_ZLIB:Q}
-BUILTIN_PKG.zlib= zlib-${BUILTIN_VERSION.zlib:C/-[A-Za-z]*//}
+BUILTIN_PKG.zlib= zlib-${BUILTIN_VERSION.zlib:C/-[A-Za-z]*//}
.endif
MAKEVARS+= BUILTIN_PKG.zlib
@@ -82,11 +82,11 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
-CHECK_BUILTIN.zlib?= no
+CHECK_BUILTIN.zlib?= no
.if !empty(CHECK_BUILTIN.zlib:M[nN][oO])
. if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
-BUILDLINK_TARGETS+= fake-zlib-pc
+BUILDLINK_TARGETS+= fake-zlib-pc
_FAKE_ZLIB_PC=${BUILDLINK_DIR}/lib/pkgconfig/zlib.pc
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/files/ChangeLog
--- a/devel/zlib/files/ChangeLog Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/files/ChangeLog Tue Apr 04 08:57:33 2017 +0000
@@ -1,10 +1,53 @@
ChangeLog file for zlib
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
+Changes in 1.2.10 (2 Jan 2017)
+- Avoid warnings on snprintf() return value
+- Fix bug in deflate_stored() for zero-length input
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
+
+Changes in 1.2.9 (31 Dec 2016)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
+- Improve contrib/blast to return unused bytes
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
+
Changes in 1.2.8 (28 Apr 2013)
- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
- Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Ro§]
+- Clean up contrib/vstudio [RoÃ?]
- Correct spelling error in zlib.h
- Fix mixed line endings in contrib/vstudio
@@ -34,7 +77,7 @@
- Clean up the usage of z_const and respect const usage within zlib
- Clean up examples/gzlog.[ch] comparisons of different types
- Avoid shift equal to bits in type (caused endless loop)
-- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix uninitialized value bug in gzputc() introduced by const patches
- Fix memory allocation error in examples/zran.c [Nor]
- Fix bug where gzopen(), gzclose() would write an empty file
- Fix bug in gzclose() when gzwrite() runs out of memory
@@ -194,7 +237,7 @@
- Add a transparent write mode to gzopen() when 'T' is in the mode
- Update python link in zlib man page
- Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no libary use
+- Add a ./config --solo option to make zlib subset with no library use
- Add undocumented inflateResetKeep() function for CAB file decoding
- Add --cover option to ./configure for gcc coverage testing
- Add #define ZLIB_CONST option to use const in the z_stream interface
@@ -564,7 +607,7 @@
- Update make_vms.com [Zinser]
- Use -fPIC for shared build in configure [Teredesai, Nicholson]
- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [B?ck]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
- Add some FAQ entries about the contrib directory
- Update the MVS question in the FAQ
- Avoid extraneous reads after EOF in gzio.c [Brown]
@@ -1178,7 +1221,7 @@
386 asm code replacing longest_match().
contrib/iostream/ by Kevin Ruland <kevin%rodin.wustl.edu@localhost>
A C++ I/O streams interface to the zlib gz* functions
- contrib/iostream2/ by Tyge Løvset <Tyge.Lovset%cmr.no@localhost>
+ contrib/iostream2/ by Tyge Løvset <Tyge.Lovset%cmr.no@localhost>
Another C++ I/O streams interface
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag%tid.es@localhost>
A very simple tar.gz file extractor using zlib
@@ -1216,7 +1259,7 @@
- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
- added makelcc.bat for lcc-win32 (Tom St Denis)
- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.4 2013/05/27 16:22:10 adam Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded $Id: ChangeLog,v 1.5 2017/04/04 08:57:33 adam Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
- check for unistd.h in configure (for off_t)
- remove useless check parameter in inflate_blocks_free
- avoid useless assignment of s->check to itself in inflate_blocks_new
@@ -1267,7 +1310,7 @@
- fix array overlay in deflate.c which sometimes caused bad compressed data
- fix inflate bug with empty stored block
- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
+- fix deflateParams() which could generate bad compressed data.
- Bytef is define'd instead of typedef'ed (work around Borland bug)
- added an INDEX file
- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/files/README
--- a/devel/zlib/files/README Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/files/README Tue Apr 04 08:57:33 2017 +0000
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.8 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.8 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
@@ -84,7 +84,7 @@
Copyright notice:
- (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/files/adler32.c
--- a/devel/zlib/files/adler32.c Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/files/adler32.c Tue Apr 04 08:57:33 2017 +0000
@@ -1,17 +1,15 @@
/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: adler32.c,v 1.3 2012/05/09 11:33:09 adam Exp $ */
+/* @(#) $Id: adler32.c,v 1.4 2017/04/04 08:57:33 adam Exp $ */
#include "zutil.h"
-#define local static
-
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-#define BASE 65521 /* largest prime smaller than 65536 */
+#define BASE 65521U /* largest prime smaller than 65536 */
#define NMAX 5552
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -62,10 +60,10 @@
#endif
/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
+uLong ZEXPORT adler32_z(adler, buf, len)
uLong adler;
const Bytef *buf;
- uInt len;
+ z_size_t len;
{
unsigned long sum2;
unsigned n;
@@ -133,6 +131,15 @@
}
/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+ uLong adler;
+ const Bytef *buf;
+ uInt len;
+{
+ return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
local uLong adler32_combine_(adler1, adler2, len2)
uLong adler1;
uLong adler2;
@@ -156,7 +163,7 @@
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
if (sum1 >= BASE) sum1 -= BASE;
if (sum1 >= BASE) sum1 -= BASE;
- if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+ if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
if (sum2 >= BASE) sum2 -= BASE;
return sum1 | (sum2 << 16);
}
diff -r 393f62742b73 -r ee0183f5330d devel/zlib/files/compress.c
--- a/devel/zlib/files/compress.c Tue Apr 04 08:28:01 2017 +0000
+++ b/devel/zlib/files/compress.c Tue Apr 04 08:57:33 2017 +0000
@@ -1,9 +1,9 @@
/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: compress.c,v 1.4 2013/05/27 16:22:10 adam Exp $ */
+/* @(#) $Id: compress.c,v 1.5 2017/04/04 08:57:33 adam Exp $ */
#define ZLIB_INTERNAL
#include "zlib.h"
@@ -28,16 +28,11 @@
{
z_stream stream;
int err;
+ const uInt max = (uInt)-1;
+ uLong left;
- stream.next_in = (z_const Bytef *)source;
- stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
Home |
Main Index |
Thread Index |
Old Index