summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog162
-rw-r--r--Makefile.in2
-rw-r--r--README6
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/pascal/zlibpas.pas2
-rw-r--r--contrib/vstudio/readme.txt2
-rw-r--r--contrib/vstudio/vc10/zlib.rc8
-rw-r--r--contrib/vstudio/vc10/zlibvc.def5
-rw-r--r--contrib/vstudio/vc11/zlib.rc8
-rw-r--r--contrib/vstudio/vc11/zlibvc.def5
-rw-r--r--contrib/vstudio/vc12/zlib.rc8
-rw-r--r--contrib/vstudio/vc12/zlibvc.def5
-rw-r--r--contrib/vstudio/vc14/zlib.rc8
-rw-r--r--contrib/vstudio/vc14/zlibvc.def5
-rw-r--r--contrib/vstudio/vc9/zlib.rc8
-rw-r--r--contrib/vstudio/vc9/zlibvc.def5
-rw-r--r--crc32.c2
-rw-r--r--deflate.c4
-rw-r--r--deflate.h2
-rw-r--r--gzguts.h2
-rw-r--r--gzlib.c2
-rw-r--r--gzread.c2
-rw-r--r--gzwrite.c2
-rw-r--r--infback.c2
-rw-r--r--inflate.c2
-rw-r--r--inflate.h2
-rw-r--r--inftrees.c6
-rw-r--r--os400/README4002
-rw-r--r--os400/zlib.inc8
-rw-r--r--qnx/package.qpg10
-rw-r--r--treebuild.xml4
-rw-r--r--trees.c2
-rw-r--r--win32/README-WIN32.txt4
-rw-r--r--win32/zlib.def3
-rw-r--r--zlib.36
-rw-r--r--zlib.3.pdfbin19320 -> 8848 bytes
-rw-r--r--zlib.h14
-rw-r--r--zlib.map6
-rw-r--r--zutil.h2
43 files changed, 218 insertions, 124 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e108c16..e6fbb37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3 3
4project(zlib C) 4project(zlib C)
5 5
6set(VERSION "1.2.11.1") 6set(VERSION "1.2.12")
7 7
8option(ASM686 "Enable building i686 assembly implementation") 8option(ASM686 "Enable building i686 assembly implementation")
9option(AMD64 "Enable building amd64 assembly implementation") 9option(AMD64 "Enable building amd64 assembly implementation")
diff --git a/ChangeLog b/ChangeLog
index 9c6d95b..f0b0e61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,68 @@
1 1
2 ChangeLog file for zlib 2 ChangeLog file for zlib
3 3
4Changes in 1.2.11.1 (xx Jan 2017) 4Changes in 1.2.12 (27 Mar 2022)
5- 5- Cygwin does not have _wopen(), so do not create gzopen_w() there
6- Permit a deflateParams() parameter change as soon as possible
7- Limit hash table inserts after switch from stored deflate
8- Fix bug when window full in deflate_stored()
9- Fix CLEAR_HASH macro to be usable as a single statement
10- Avoid a conversion error in gzseek when off_t type too small
11- Have Makefile return non-zero error code on test failure
12- Avoid some conversion warnings in gzread.c and gzwrite.c
13- Update use of errno for newer Windows CE versions
14- Small speedup to inflate [psumbera]
15- Return an error if the gzputs string length can't fit in an int
16- Add address checking in clang to -w option of configure
17- Don't compute check value for raw inflate if asked to validate
18- Handle case where inflateSync used when header never processed
19- Avoid the use of ptrdiff_t
20- Avoid an undefined behavior of memcpy() in gzappend()
21- Avoid undefined behaviors of memcpy() in gz*printf()
22- Avoid an undefined behavior of memcpy() in _tr_stored_block()
23- Make the names in functions declarations identical to definitions
24- Remove old assembler code in which bugs have manifested
25- Fix deflateEnd() to not report an error at start of raw deflate
26- Add legal disclaimer to README
27- Emphasize the need to continue decompressing gzip members
28- Correct the initialization requirements for deflateInit2()
29- Fix a bug that can crash deflate on some input when using Z_FIXED
30- Assure that the number of bits for deflatePrime() is valid
31- Use a structure to make globals in enough.c evident
32- Use a macro for the printf format of big_t in enough.c
33- Clean up code style in enough.c, update version
34- Use inline function instead of macro for index in enough.c
35- Clarify that prefix codes are counted in enough.c
36- Show all the codes for the maximum tables size in enough.c
37- Add gznorm.c example, which normalizes gzip files
38- Fix the zran.c example to work on a multiple-member gzip file
39- Add tables for crc32_combine(), to speed it up by a factor of 200
40- Add crc32_combine_gen() and crc32_combine_op() for fast combines
41- Speed up software CRC-32 computation by a factor of 1.5 to 3
42- Use atomic test and set, if available, for dynamic CRC tables
43- Don't bother computing check value after successful inflateSync()
44- Correct comment in crc32.c
45- Add use of the ARMv8 crc32 instructions when requested
46- Use ARM crc32 instructions if the ARM architecture has them
47- Explicitly note that the 32-bit check values are 32 bits
48- Avoid adding empty gzip member after gzflush with Z_FINISH
49- Fix memory leak on error in gzlog.c
50- Fix error in comment on the polynomial representation of a byte
51- Clarify gz* function interfaces, referring to parameter names
52- Change macro name in inflate.c to avoid collision in VxWorks
53- Correct typo in blast.c
54- Improve portability of contrib/minizip
55- Fix indentation in minizip's zip.c
56- Replace black/white with allow/block. (theresa-m)
57- minizip warning fix if MAXU32 already defined. (gvollant)
58- Fix unztell64() in minizip to work past 4GB. (Daniël Hörchner)
59- Clean up minizip to reduce warnings for testing
60- Add fallthrough comments for gcc
61- Eliminate use of ULL constants
62- Separate out address sanitizing from warnings in configure
63- Remove destructive aspects of make distclean
64- Check for cc masquerading as gcc or clang in configure
65- Fix crc32.c to compile local functions only if used
6 66
7Changes in 1.2.11 (15 Jan 2017) 67Changes in 1.2.11 (15 Jan 2017)
8- Fix deflate stored bug when pulling last block from window 68- Fix deflate stored bug when pulling last block from window
@@ -514,7 +574,7 @@ Changes in 1.2.3.5 (8 Jan 2010)
514- Don't use _vsnprintf on later versions of MSVC [Lowman] 574- Don't use _vsnprintf on later versions of MSVC [Lowman]
515- Add CMake build script and input file [Lowman] 575- Add CMake build script and input file [Lowman]
516- Update contrib/minizip to 1.1 [Svensson, Vollant] 576- Update contrib/minizip to 1.1 [Svensson, Vollant]
517- Moved nintendods directory from contrib to . 577- Moved nintendods directory from contrib to root
518- Replace gzio.c with a new set of routines with the same functionality 578- Replace gzio.c with a new set of routines with the same functionality
519- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above 579- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
520- Update contrib/minizip to 1.1b 580- Update contrib/minizip to 1.1b
@@ -688,7 +748,7 @@ Changes in 1.2.2.4 (11 July 2005)
688- Be more strict on incomplete code sets in inflate_table() and increase 748- Be more strict on incomplete code sets in inflate_table() and increase
689 ENOUGH and MAXD -- this repairs a possible security vulnerability for 749 ENOUGH and MAXD -- this repairs a possible security vulnerability for
690 invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for 750 invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for
691 discovering the vulnerability and providing test cases. 751 discovering the vulnerability and providing test cases
692- Add ia64 support to configure for HP-UX [Smith] 752- Add ia64 support to configure for HP-UX [Smith]
693- Add error return to gzread() for format or i/o error [Levin] 753- Add error return to gzread() for format or i/o error [Levin]
694- Use malloc.h for OS/2 [Necasek] 754- Use malloc.h for OS/2 [Necasek]
@@ -724,7 +784,7 @@ Changes in 1.2.2.2 (30 December 2004)
724- Add Z_FIXED strategy option to deflateInit2() to force fixed trees 784- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
725- Add updated make_vms.com [Coghlan], update README 785- Add updated make_vms.com [Coghlan], update README
726- Create a new "examples" directory, move gzappend.c there, add zpipe.c, 786- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
727 fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html. 787 fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html
728- Add FAQ entry and comments in deflate.c on uninitialized memory access 788- Add FAQ entry and comments in deflate.c on uninitialized memory access
729- Add Solaris 9 make options in configure [Gilbert] 789- Add Solaris 9 make options in configure [Gilbert]
730- Allow strerror() usage in gzio.c for STDC 790- Allow strerror() usage in gzio.c for STDC
@@ -795,7 +855,7 @@ Changes in 1.2.1.1 (9 January 2004)
795- Fix a big fat bug in inftrees.c that prevented decoding valid 855- Fix a big fat bug in inftrees.c that prevented decoding valid
796 dynamic blocks with only literals and no distance codes -- 856 dynamic blocks with only literals and no distance codes --
797 Thanks to "Hot Emu" for the bug report and sample file 857 Thanks to "Hot Emu" for the bug report and sample file
798- Add a note to puff.c on no distance codes case. 858- Add a note to puff.c on no distance codes case
799 859
800Changes in 1.2.1 (17 November 2003) 860Changes in 1.2.1 (17 November 2003)
801- Remove a tab in contrib/gzappend/gzappend.c 861- Remove a tab in contrib/gzappend/gzappend.c
@@ -1039,14 +1099,14 @@ Changes in 1.2.0 (9 March 2003)
1039- Add contrib/puff/ simple inflate for deflate format description 1099- Add contrib/puff/ simple inflate for deflate format description
1040 1100
1041Changes in 1.1.4 (11 March 2002) 1101Changes in 1.1.4 (11 March 2002)
1042- ZFREE was repeated on same allocation on some error conditions. 1102- ZFREE was repeated on same allocation on some error conditions
1043 This creates a security problem described in 1103 This creates a security problem described in
1044 http://www.zlib.org/advisory-2002-03-11.txt 1104 http://www.zlib.org/advisory-2002-03-11.txt
1045- Returned incorrect error (Z_MEM_ERROR) on some invalid data 1105- Returned incorrect error (Z_MEM_ERROR) on some invalid data
1046- Avoid accesses before window for invalid distances with inflate window 1106- Avoid accesses before window for invalid distances with inflate window
1047 less than 32K. 1107 less than 32K
1048- force windowBits > 8 to avoid a bug in the encoder for a window size 1108- force windowBits > 8 to avoid a bug in the encoder for a window size
1049 of 256 bytes. (A complete fix will be available in 1.1.5). 1109 of 256 bytes. (A complete fix will be available in 1.1.5)
1050 1110
1051Changes in 1.1.3 (9 July 1998) 1111Changes in 1.1.3 (9 July 1998)
1052- fix "an inflate input buffer bug that shows up on rare but persistent 1112- fix "an inflate input buffer bug that shows up on rare but persistent
@@ -1120,7 +1180,7 @@ Changes in 1.1.1 (27 Feb 98)
1120- remove block truncation heuristic which had very marginal effect for zlib 1180- remove block truncation heuristic which had very marginal effect for zlib
1121 (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the 1181 (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
1122 compression ratio on some files. This also allows inlining _tr_tally for 1182 compression ratio on some files. This also allows inlining _tr_tally for
1123 matches in deflate_slow. 1183 matches in deflate_slow
1124- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier) 1184- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
1125 1185
1126Changes in 1.1.0 (24 Feb 98) 1186Changes in 1.1.0 (24 Feb 98)
@@ -1165,7 +1225,7 @@ Changes in 1.0.8 (27 Jan 1998)
1165- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong) 1225- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
1166- use constant arrays for the static trees in trees.c instead of computing 1226- use constant arrays for the static trees in trees.c instead of computing
1167 them at run time (thanks to Ken Raeburn for this suggestion). To create 1227 them at run time (thanks to Ken Raeburn for this suggestion). To create
1168 trees.h, compile with GEN_TREES_H and run "make test". 1228 trees.h, compile with GEN_TREES_H and run "make test"
1169- check return code of example in "make test" and display result 1229- check return code of example in "make test" and display result
1170- pass minigzip command line options to file_compress 1230- pass minigzip command line options to file_compress
1171- simplifying code of inflateSync to avoid gcc 2.8 bug 1231- simplifying code of inflateSync to avoid gcc 2.8 bug
@@ -1204,12 +1264,12 @@ Changes in 1.0.6 (19 Jan 1998)
1204- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and 1264- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
1205 gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) 1265 gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
1206- Fix a deflate bug occurring only with compression level 0 (thanks to 1266- Fix a deflate bug occurring only with compression level 0 (thanks to
1207 Andy Buckler for finding this one). 1267 Andy Buckler for finding this one)
1208- In minigzip, pass transparently also the first byte for .Z files. 1268- In minigzip, pass transparently also the first byte for .Z files
1209- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() 1269- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
1210- check Z_FINISH in inflate (thanks to Marc Schluper) 1270- check Z_FINISH in inflate (thanks to Marc Schluper)
1211- Implement deflateCopy (thanks to Adam Costello) 1271- Implement deflateCopy (thanks to Adam Costello)
1212- make static libraries by default in configure, add --shared option. 1272- make static libraries by default in configure, add --shared option
1213- move MSDOS or Windows specific files to directory msdos 1273- move MSDOS or Windows specific files to directory msdos
1214- suppress the notion of partial flush to simplify the interface 1274- suppress the notion of partial flush to simplify the interface
1215 (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4) 1275 (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
@@ -1221,7 +1281,7 @@ Changes in 1.0.6 (19 Jan 1998)
1221- added Makefile.nt (thanks to Stephen Williams) 1281- added Makefile.nt (thanks to Stephen Williams)
1222- added the unsupported "contrib" directory: 1282- added the unsupported "contrib" directory:
1223 contrib/asm386/ by Gilles Vollant <info@winimage.com> 1283 contrib/asm386/ by Gilles Vollant <info@winimage.com>
1224 386 asm code replacing longest_match(). 1284 386 asm code replacing longest_match()
1225 contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu> 1285 contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
1226 A C++ I/O streams interface to the zlib gz* functions 1286 A C++ I/O streams interface to the zlib gz* functions
1227 contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no> 1287 contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
@@ -1229,7 +1289,7 @@ Changes in 1.0.6 (19 Jan 1998)
1229 contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es> 1289 contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
1230 A very simple tar.gz file extractor using zlib 1290 A very simple tar.gz file extractor using zlib
1231 contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl> 1291 contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
1232 How to use compress(), uncompress() and the gz* functions from VB. 1292 How to use compress(), uncompress() and the gz* functions from VB
1233- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression 1293- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
1234 level) in minigzip (thanks to Tom Lane) 1294 level) in minigzip (thanks to Tom Lane)
1235 1295
@@ -1238,8 +1298,8 @@ Changes in 1.0.6 (19 Jan 1998)
1238- add undocumented function inflateSyncPoint() (hack for Paul Mackerras) 1298- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
1239- add undocumented function zError to convert error code to string 1299- add undocumented function zError to convert error code to string
1240 (for Tim Smithers) 1300 (for Tim Smithers)
1241- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code. 1301- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code
1242- Use default memcpy for Symantec MSDOS compiler. 1302- Use default memcpy for Symantec MSDOS compiler
1243- Add EXPORT keyword for check_func (needed for Windows DLL) 1303- Add EXPORT keyword for check_func (needed for Windows DLL)
1244- add current directory to LD_LIBRARY_PATH for "make test" 1304- add current directory to LD_LIBRARY_PATH for "make test"
1245- create also a link for libz.so.1 1305- create also a link for libz.so.1
@@ -1252,7 +1312,7 @@ Changes in 1.0.6 (19 Jan 1998)
1252- allow compilation with ANSI keywords only enabled for TurboC in large model 1312- allow compilation with ANSI keywords only enabled for TurboC in large model
1253- avoid "versionString"[0] (Borland bug) 1313- avoid "versionString"[0] (Borland bug)
1254- add NEED_DUMMY_RETURN for Borland 1314- add NEED_DUMMY_RETURN for Borland
1255- use variable z_verbose for tracing in debug mode (L. Peter Deutsch). 1315- use variable z_verbose for tracing in debug mode (L. Peter Deutsch)
1256- allow compilation with CC 1316- allow compilation with CC
1257- defined STDC for OS/2 (David Charlap) 1317- defined STDC for OS/2 (David Charlap)
1258- limit external names to 8 chars for MVS (Thomas Lund) 1318- limit external names to 8 chars for MVS (Thomas Lund)
@@ -1262,7 +1322,7 @@ Changes in 1.0.6 (19 Jan 1998)
1262- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) 1322- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
1263- added makelcc.bat for lcc-win32 (Tom St Denis) 1323- added makelcc.bat for lcc-win32 (Tom St Denis)
1264- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) 1324- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
1265- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. 1325- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion
1266- check for unistd.h in configure (for off_t) 1326- check for unistd.h in configure (for off_t)
1267- remove useless check parameter in inflate_blocks_free 1327- remove useless check parameter in inflate_blocks_free
1268- avoid useless assignment of s->check to itself in inflate_blocks_new 1328- avoid useless assignment of s->check to itself in inflate_blocks_new
@@ -1283,7 +1343,7 @@ Changes in 1.0.5 (3 Jan 98)
1283Changes in 1.0.4 (24 Jul 96) 1343Changes in 1.0.4 (24 Jul 96)
1284- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF 1344- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
1285 bit, so the decompressor could decompress all the correct data but went 1345 bit, so the decompressor could decompress all the correct data but went
1286 on to attempt decompressing extra garbage data. This affected minigzip too. 1346 on to attempt decompressing extra garbage data. This affected minigzip too
1287- zlibVersion and gzerror return const char* (needed for DLL) 1347- zlibVersion and gzerror return const char* (needed for DLL)
1288- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno) 1348- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
1289- use z_error only for DEBUG (avoid problem with DLLs) 1349- use z_error only for DEBUG (avoid problem with DLLs)
@@ -1313,7 +1373,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
1313- fix array overlay in deflate.c which sometimes caused bad compressed data 1373- fix array overlay in deflate.c which sometimes caused bad compressed data
1314- fix inflate bug with empty stored block 1374- fix inflate bug with empty stored block
1315- fix MSDOS medium model which was broken in 0.99 1375- fix MSDOS medium model which was broken in 0.99
1316- fix deflateParams() which could generate bad compressed data. 1376- fix deflateParams() which could generate bad compressed data
1317- Bytef is define'd instead of typedef'ed (work around Borland bug) 1377- Bytef is define'd instead of typedef'ed (work around Borland bug)
1318- added an INDEX file 1378- added an INDEX file
1319- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), 1379- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
@@ -1334,7 +1394,7 @@ Changes in 0.99 (27 Jan 96)
1334- allow preset dictionary shared between compressor and decompressor 1394- allow preset dictionary shared between compressor and decompressor
1335- allow compression level 0 (no compression) 1395- allow compression level 0 (no compression)
1336- add deflateParams in zlib.h: allow dynamic change of compression level 1396- add deflateParams in zlib.h: allow dynamic change of compression level
1337 and compression strategy. 1397 and compression strategy
1338- test large buffers and deflateParams in example.c 1398- test large buffers and deflateParams in example.c
1339- add optional "configure" to build zlib as a shared library 1399- add optional "configure" to build zlib as a shared library
1340- suppress Makefile.qnx, use configure instead 1400- suppress Makefile.qnx, use configure instead
@@ -1376,30 +1436,30 @@ Changes in 0.99 (27 Jan 96)
1376- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... 1436- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
1377- use Z_BINARY instead of BINARY 1437- use Z_BINARY instead of BINARY
1378- document that gzclose after gzdopen will close the file 1438- document that gzclose after gzdopen will close the file
1379- allow "a" as mode in gzopen. 1439- allow "a" as mode in gzopen
1380- fix error checking in gzread 1440- fix error checking in gzread
1381- allow skipping .gz extra-field on pipes 1441- allow skipping .gz extra-field on pipes
1382- added reference to Perl interface in README 1442- added reference to Perl interface in README
1383- put the crc table in FAR data (I dislike more and more the medium model :) 1443- put the crc table in FAR data (I dislike more and more the medium model :)
1384- added get_crc_table 1444- added get_crc_table
1385- added a dimension to all arrays (Borland C can't count). 1445- added a dimension to all arrays (Borland C can't count)
1386- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast 1446- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
1387- guard against multiple inclusion of *.h (for precompiled header on Mac) 1447- guard against multiple inclusion of *.h (for precompiled header on Mac)
1388- Watcom C pretends to be Microsoft C small model even in 32 bit mode. 1448- Watcom C pretends to be Microsoft C small model even in 32 bit mode
1389- don't use unsized arrays to avoid silly warnings by Visual C++: 1449- don't use unsized arrays to avoid silly warnings by Visual C++:
1390 warning C4746: 'inflate_mask' : unsized array treated as '__far' 1450 warning C4746: 'inflate_mask' : unsized array treated as '__far'
1391 (what's wrong with far data in far model?). 1451 (what's wrong with far data in far model?)
1392- define enum out of inflate_blocks_state to allow compilation with C++ 1452- define enum out of inflate_blocks_state to allow compilation with C++
1393 1453
1394Changes in 0.95 (16 Aug 95) 1454Changes in 0.95 (16 Aug 95)
1395- fix MSDOS small and medium model (now easier to adapt to any compiler) 1455- fix MSDOS small and medium model (now easier to adapt to any compiler)
1396- inlined send_bits 1456- inlined send_bits
1397- fix the final (:-) bug for deflate with flush (output was correct but 1457- fix the final (:-) bug for deflate with flush (output was correct but
1398 not completely flushed in rare occasions). 1458 not completely flushed in rare occasions)
1399- default window size is same for compression and decompression 1459- default window size is same for compression and decompression
1400 (it's now sufficient to set MAX_WBITS in zconf.h). 1460 (it's now sufficient to set MAX_WBITS in zconf.h)
1401- voidp -> voidpf and voidnp -> voidp (for consistency with other 1461- voidp -> voidpf and voidnp -> voidp (for consistency with other
1402 typedefs and because voidnp was not near in large model). 1462 typedefs and because voidnp was not near in large model)
1403 1463
1404Changes in 0.94 (13 Aug 95) 1464Changes in 0.94 (13 Aug 95)
1405- support MSDOS medium model 1465- support MSDOS medium model
@@ -1408,12 +1468,12 @@ Changes in 0.94 (13 Aug 95)
1408- added support for VMS 1468- added support for VMS
1409- allow a compression level in gzopen() 1469- allow a compression level in gzopen()
1410- gzflush now calls fflush 1470- gzflush now calls fflush
1411- For deflate with flush, flush even if no more input is provided. 1471- For deflate with flush, flush even if no more input is provided
1412- rename libgz.a as libz.a 1472- rename libgz.a as libz.a
1413- avoid complex expression in infcodes.c triggering Turbo C bug 1473- avoid complex expression in infcodes.c triggering Turbo C bug
1414- work around a problem with gcc on Alpha (in INSERT_STRING) 1474- work around a problem with gcc on Alpha (in INSERT_STRING)
1415- don't use inline functions (problem with some gcc versions) 1475- don't use inline functions (problem with some gcc versions)
1416- allow renaming of Byte, uInt, etc... with #define. 1476- allow renaming of Byte, uInt, etc... with #define
1417- avoid warning about (unused) pointer before start of array in deflate.c 1477- avoid warning about (unused) pointer before start of array in deflate.c
1418- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c 1478- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
1419- avoid reserved word 'new' in trees.c 1479- avoid reserved word 'new' in trees.c
@@ -1432,7 +1492,7 @@ Changes in 0.92 (3 May 95)
1432- no memcpy on Pyramid 1492- no memcpy on Pyramid
1433- suppressed inftest.c 1493- suppressed inftest.c
1434- optimized fill_window, put longest_match inline for gcc 1494- optimized fill_window, put longest_match inline for gcc
1435- optimized inflate on stored blocks. 1495- optimized inflate on stored blocks
1436- untabify all sources to simplify patches 1496- untabify all sources to simplify patches
1437 1497
1438Changes in 0.91 (2 May 95) 1498Changes in 0.91 (2 May 95)
@@ -1450,7 +1510,7 @@ Changes in 0.9 (1 May 95)
1450- let again gzread copy uncompressed data unchanged (was working in 0.71) 1510- let again gzread copy uncompressed data unchanged (was working in 0.71)
1451- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented 1511- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
1452- added a test of inflateSync in example.c 1512- added a test of inflateSync in example.c
1453- moved MAX_WBITS to zconf.h because users might want to change that. 1513- moved MAX_WBITS to zconf.h because users might want to change that
1454- document explicitly that zalloc(64K) on MSDOS must return a normalized 1514- document explicitly that zalloc(64K) on MSDOS must return a normalized
1455 pointer (zero offset) 1515 pointer (zero offset)
1456- added Makefiles for Microsoft C, Turbo C, Borland C++ 1516- added Makefiles for Microsoft C, Turbo C, Borland C++
@@ -1459,7 +1519,7 @@ Changes in 0.9 (1 May 95)
1459Changes in 0.8 (29 April 95) 1519Changes in 0.8 (29 April 95)
1460- added fast inflate (inffast.c) 1520- added fast inflate (inffast.c)
1461- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this 1521- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
1462 is incompatible with previous versions of zlib which returned Z_OK. 1522 is incompatible with previous versions of zlib which returned Z_OK
1463- work around a TurboC compiler bug (bad code for b << 0, see infutil.h) 1523- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
1464 (actually that was not a compiler bug, see 0.81 above) 1524 (actually that was not a compiler bug, see 0.81 above)
1465- gzread no longer reads one extra byte in certain cases 1525- gzread no longer reads one extra byte in certain cases
@@ -1469,50 +1529,50 @@ Changes in 0.8 (29 April 95)
1469 1529
1470Changes in 0.71 (14 April 95) 1530Changes in 0.71 (14 April 95)
1471- Fixed more MSDOS compilation problems :( There is still a bug with 1531- Fixed more MSDOS compilation problems :( There is still a bug with
1472 TurboC large model. 1532 TurboC large model
1473 1533
1474Changes in 0.7 (14 April 95) 1534Changes in 0.7 (14 April 95)
1475- Added full inflate support. 1535- Added full inflate support
1476- Simplified the crc32() interface. The pre- and post-conditioning 1536- Simplified the crc32() interface. The pre- and post-conditioning
1477 (one's complement) is now done inside crc32(). WARNING: this is 1537 (one's complement) is now done inside crc32(). WARNING: this is
1478 incompatible with previous versions; see zlib.h for the new usage. 1538 incompatible with previous versions; see zlib.h for the new usage
1479 1539
1480Changes in 0.61 (12 April 95) 1540Changes in 0.61 (12 April 95)
1481- workaround for a bug in TurboC. example and minigzip now work on MSDOS. 1541- workaround for a bug in TurboC. example and minigzip now work on MSDOS
1482 1542
1483Changes in 0.6 (11 April 95) 1543Changes in 0.6 (11 April 95)
1484- added minigzip.c 1544- added minigzip.c
1485- added gzdopen to reopen a file descriptor as gzFile 1545- added gzdopen to reopen a file descriptor as gzFile
1486- added transparent reading of non-gziped files in gzread. 1546- added transparent reading of non-gziped files in gzread
1487- fixed bug in gzread (don't read crc as data) 1547- fixed bug in gzread (don't read crc as data)
1488- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose). 1548- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose)
1489- don't allocate big arrays in the stack (for MSDOS) 1549- don't allocate big arrays in the stack (for MSDOS)
1490- fix some MSDOS compilation problems 1550- fix some MSDOS compilation problems
1491 1551
1492Changes in 0.5: 1552Changes in 0.5:
1493- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but 1553- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
1494 not yet Z_FULL_FLUSH. 1554 not yet Z_FULL_FLUSH
1495- support decompression but only in a single step (forced Z_FINISH) 1555- support decompression but only in a single step (forced Z_FINISH)
1496- added opaque object for zalloc and zfree. 1556- added opaque object for zalloc and zfree
1497- added deflateReset and inflateReset 1557- added deflateReset and inflateReset
1498- added a variable zlib_version for consistency checking. 1558- added a variable zlib_version for consistency checking
1499- renamed the 'filter' parameter of deflateInit2 as 'strategy'. 1559- renamed the 'filter' parameter of deflateInit2 as 'strategy'
1500 Added Z_FILTERED and Z_HUFFMAN_ONLY constants. 1560 Added Z_FILTERED and Z_HUFFMAN_ONLY constants
1501 1561
1502Changes in 0.4: 1562Changes in 0.4:
1503- avoid "zip" everywhere, use zlib instead of ziplib. 1563- avoid "zip" everywhere, use zlib instead of ziplib
1504- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush 1564- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
1505 if compression method == 8. 1565 if compression method == 8
1506- added adler32 and crc32 1566- added adler32 and crc32
1507- renamed deflateOptions as deflateInit2, call one or the other but not both 1567- renamed deflateOptions as deflateInit2, call one or the other but not both
1508- added the method parameter for deflateInit2. 1568- added the method parameter for deflateInit2
1509- added inflateInit2 1569- added inflateInit2
1510- simplied considerably deflateInit and inflateInit by not supporting 1570- simplied considerably deflateInit and inflateInit by not supporting
1511 user-provided history buffer. This is supported only in deflateInit2 1571 user-provided history buffer. This is supported only in deflateInit2
1512 and inflateInit2. 1572 and inflateInit2
1513 1573
1514Changes in 0.3: 1574Changes in 0.3:
1515- prefix all macro names with Z_ 1575- prefix all macro names with Z_
1516- use Z_FINISH instead of deflateEnd to finish compression. 1576- use Z_FINISH instead of deflateEnd to finish compression
1517- added Z_HUFFMAN_ONLY 1577- added Z_HUFFMAN_ONLY
1518- added gzerror() 1578- added gzerror()
diff --git a/Makefile.in b/Makefile.in
index 802be7f..3d858aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ CPP=$(CC) -E
32 32
33STATICLIB=libz.a 33STATICLIB=libz.a
34SHAREDLIB=libz.so 34SHAREDLIB=libz.so
35SHAREDLIBV=libz.so.1.2.11.1 35SHAREDLIBV=libz.so.1.2.12
36SHAREDLIBM=libz.so.1 36SHAREDLIBM=libz.so.1
37LIBS=$(STATICLIB) $(SHAREDLIBV) 37LIBS=$(STATICLIB) $(SHAREDLIBV)
38 38
diff --git a/README b/README
index 5b74a3c..024b79d 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.11.1 is a general purpose data compression library. All the code is 3zlib 1.2.12 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and 6http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
31issue of Dr. Dobb's Journal; a copy of the article is available at 31issue of Dr. Dobb's Journal; a copy of the article is available at
32http://marknelson.us/1997/01/01/zlib-engine/ . 32http://marknelson.us/1997/01/01/zlib-engine/ .
33 33
34The changes made in version 1.2.11.1 are documented in the file ChangeLog. 34The changes made in version 1.2.12 are documented in the file ChangeLog.
35 35
36Unsupported third party contributions are provided in directory contrib/ . 36Unsupported third party contributions are provided in directory contrib/ .
37 37
@@ -84,7 +84,7 @@ Acknowledgments:
84 84
85Copyright notice: 85Copyright notice:
86 86
87 (C) 1995-2017 Jean-loup Gailly and Mark Adler 87 (C) 1995-2022 Jean-loup Gailly and Mark Adler
88 88
89 This software is provided 'as-is', without any express or implied 89 This software is provided 'as-is', without any express or implied
90 warranty. In no event will the authors be held liable for any damages 90 warranty. In no event will the authors be held liable for any damages
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index dd63f2f..d40dad8 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152 const OutBuf: Pointer; BufSize: Integer); 152 const OutBuf: Pointer; BufSize: Integer);
153 153
154const 154const
155 zlib_version = '1.2.11.1'; 155 zlib_version = '1.2.12';
156 156
157type 157type
158 EZlibError = class(Exception); 158 EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 7266199..865c802 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
156 public void Info_Version() 156 public void Info_Version()
157 { 157 {
158 Info info = new Info(); 158 Info info = new Info();
159 Assert.AreEqual("1.2.11.1", Info.Version); 159 Assert.AreEqual("1.2.12", Info.Version);
160 Assert.AreEqual(32, info.SizeOfUInt); 160 Assert.AreEqual(32, info.SizeOfUInt);
161 Assert.AreEqual(32, info.SizeOfULong); 161 Assert.AreEqual(32, info.SizeOfULong);
162 Assert.AreEqual(32, info.SizeOfPointer); 162 Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 7552172..0550606 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2017 Mark Adler 2 * Copyright (C) 1995-2022 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.2.11.1 Copyright 1995-2017 Mark Adler "; 12 " inflate9 1.2.12 Copyright 1995-2022 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
64 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 64 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 65 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, 66 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67 133, 133, 133, 133, 144, 198, 196}; 67 133, 133, 133, 133, 144, 199, 202};
68 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 68 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 69 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 70 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 30c4b7f..6409abc 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
1# -*- Autoconf -*- 1# -*- Autoconf -*-
2# Process this file with autoconf to produce a configure script. 2# Process this file with autoconf to produce a configure script.
3 3
4AC_INIT([minizip], [1.2.11.1], [bugzilla.redhat.com]) 4AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com])
5AC_CONFIG_SRCDIR([minizip.c]) 5AC_CONFIG_SRCDIR([minizip.c])
6AM_INIT_AUTOMAKE([foreign]) 6AM_INIT_AUTOMAKE([foreign])
7LT_INIT 7LT_INIT
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index a457b20..adb5cd6 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
10interface 10interface
11 11
12const 12const
13 ZLIB_VERSION = '1.2.11.1'; 13 ZLIB_VERSION = '1.2.12';
14 ZLIB_VERNUM = $12a0; 14 ZLIB_VERNUM = $12a0;
15 15
16type 16type
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index e457195..d396d43 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
1Building instructions for the DLL versions of Zlib 1.2.11.1 1Building instructions for the DLL versions of Zlib 1.2.12
2======================================================== 2========================================================
3 3
4This directory contains projects that build zlib and minizip using 4This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 761947b..8ad25f1 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 11, 1 5 FILEVERSION 1, 2, 12, 0
6 PRODUCTVERSION 1, 2, 11, 1 6 PRODUCTVERSION 1, 2, 12, 0
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20 VALUE "FileVersion", "1.2.11.1\0" 20 VALUE "FileVersion", "1.2.12\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlibwapi.dll\0" 22 VALUE "OriginalFilename", "zlibwapi.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
151 deflateGetDictionary @173 151 deflateGetDictionary @173
152 adler32_z @174 152 adler32_z @174
153 crc32_z @175 153 crc32_z @175
154
155; zlib1 v1.2.12 added:
156 crc32_combine_gen @176
157 crc32_combine_gen64 @177
158 crc32_combine_op @178
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index 761947b..8ad25f1 100644
--- a/contrib/vstudio/vc11/zlib.rc
+++ b/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 11, 1 5 FILEVERSION 1, 2, 12, 0
6 PRODUCTVERSION 1, 2, 11, 1 6 PRODUCTVERSION 1, 2, 12, 0
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20 VALUE "FileVersion", "1.2.11.1\0" 20 VALUE "FileVersion", "1.2.12\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlibwapi.dll\0" 22 VALUE "OriginalFilename", "zlibwapi.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc11/zlibvc.def
+++ b/contrib/vstudio/vc11/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
151 deflateGetDictionary @173 151 deflateGetDictionary @173
152 adler32_z @174 152 adler32_z @174
153 crc32_z @175 153 crc32_z @175
154
155; zlib1 v1.2.12 added:
156 crc32_combine_gen @176
157 crc32_combine_gen64 @177
158 crc32_combine_op @178
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index 0e5b703..9475873 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 11, 1 5 FILEVERSION 1, 2, 12, 0
6 PRODUCTVERSION 1, 2, 11, 1 6 PRODUCTVERSION 1, 2, 12, 0
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20 VALUE "FileVersion", "1.2.11.1\0" 20 VALUE "FileVersion", "1.2.12\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlibwapi.dll\0" 22 VALUE "OriginalFilename", "zlibwapi.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
151 deflateGetDictionary @173 151 deflateGetDictionary @173
152 adler32_z @174 152 adler32_z @174
153 crc32_z @175 153 crc32_z @175
154
155; zlib1 v1.2.12 added:
156 crc32_combine_gen @176
157 crc32_combine_gen64 @177
158 crc32_combine_op @178
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index 0e5b703..9475873 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 11, 1 5 FILEVERSION 1, 2, 12, 0
6 PRODUCTVERSION 1, 2, 11, 1 6 PRODUCTVERSION 1, 2, 12, 0
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20 VALUE "FileVersion", "1.2.11.1\0" 20 VALUE "FileVersion", "1.2.12\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlibwapi.dll\0" 22 VALUE "OriginalFilename", "zlibwapi.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc14/zlibvc.def
+++ b/contrib/vstudio/vc14/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
151 deflateGetDictionary @173 151 deflateGetDictionary @173
152 adler32_z @174 152 adler32_z @174
153 crc32_z @175 153 crc32_z @175
154
155; zlib1 v1.2.12 added:
156 crc32_combine_gen @176
157 crc32_combine_gen64 @177
158 crc32_combine_op @178
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 761947b..8ad25f1 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
2 2
3#define IDR_VERSION1 1 3#define IDR_VERSION1 1
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 11, 1 5 FILEVERSION 1, 2, 12, 0
6 PRODUCTVERSION 1, 2, 11, 1 6 PRODUCTVERSION 1, 2, 12, 0
7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK 7 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8 FILEFLAGS 0 8 FILEFLAGS 0
9 FILEOS VOS_DOS_WINDOWS32 9 FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
17 17
18 BEGIN 18 BEGIN
19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" 19 VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20 VALUE "FileVersion", "1.2.11.1\0" 20 VALUE "FileVersion", "1.2.12\0"
21 VALUE "InternalName", "zlib\0" 21 VALUE "InternalName", "zlib\0"
22 VALUE "OriginalFilename", "zlibwapi.dll\0" 22 VALUE "OriginalFilename", "zlibwapi.dll\0"
23 VALUE "ProductName", "ZLib.DLL\0" 23 VALUE "ProductName", "ZLib.DLL\0"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 54e683d..ba09bc1 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -151,3 +151,8 @@ EXPORTS
151 deflateGetDictionary @173 151 deflateGetDictionary @173
152 adler32_z @174 152 adler32_z @174
153 crc32_z @175 153 crc32_z @175
154
155; zlib1 v1.2.12 added:
156 crc32_combine_gen @176
157 crc32_combine_gen64 @177
158 crc32_combine_op @178
diff --git a/crc32.c b/crc32.c
index 5fab3f5..a1bdce5 100644
--- a/crc32.c
+++ b/crc32.c
@@ -1,5 +1,5 @@
1/* crc32.c -- compute the CRC-32 of a data stream 1/* crc32.c -- compute the CRC-32 of a data stream
2 * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler 2 * Copyright (C) 1995-2022 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 * 4 *
5 * This interleaved implementation of a CRC makes use of pipelined multiple 5 * This interleaved implementation of a CRC makes use of pipelined multiple
diff --git a/deflate.c b/deflate.c
index 23aef18..799fb93 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
1/* deflate.c -- compress data using the deflation algorithm 1/* deflate.c -- compress data using the deflation algorithm
2 * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 2 * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.2.11.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; 55 " deflate 1.2.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 in the documentation of your product. If for some reason you cannot
diff --git a/deflate.h b/deflate.h
index d4cf1a9..17c2261 100644
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
1/* deflate.h -- internal compression state 1/* deflate.h -- internal compression state
2 * Copyright (C) 1995-2016 Jean-loup Gailly 2 * Copyright (C) 1995-2018 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzguts.h b/gzguts.h
index fc712dc..57faf37 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,5 +1,5 @@
1/* gzguts.h -- zlib internal header definitions for gz* operations 1/* gzguts.h -- zlib internal header definitions for gz* operations
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler 2 * Copyright (C) 2004-2019 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzlib.c b/gzlib.c
index f6b3b40..dddaf26 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -1,5 +1,5 @@
1/* gzlib.c -- zlib functions common to reading and writing gzip files 1/* gzlib.c -- zlib functions common to reading and writing gzip files
2 * Copyright (C) 2004-2017 Mark Adler 2 * Copyright (C) 2004-2019 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzread.c b/gzread.c
index f94abfe..884c9bf 100644
--- a/gzread.c
+++ b/gzread.c
@@ -1,5 +1,5 @@
1/* gzread.c -- zlib functions for reading gzip files 1/* gzread.c -- zlib functions for reading gzip files
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler 2 * Copyright (C) 2004-2017 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzwrite.c b/gzwrite.c
index 85b576b..a8ffc8f 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -1,5 +1,5 @@
1/* gzwrite.c -- zlib functions for writing gzip files 1/* gzwrite.c -- zlib functions for writing gzip files
2 * Copyright (C) 2004-2017 Mark Adler 2 * Copyright (C) 2004-2019 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/infback.c b/infback.c
index b891bd6..a390c58 100644
--- a/infback.c
+++ b/infback.c
@@ -1,5 +1,5 @@
1/* infback.c -- inflate using a call-back interface 1/* infback.c -- inflate using a call-back interface
2 * Copyright (C) 1995-2016 Mark Adler 2 * Copyright (C) 1995-2022 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inflate.c b/inflate.c
index 38b1415..7be8c63 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
1/* inflate.c -- zlib decompression 1/* inflate.c -- zlib decompression
2 * Copyright (C) 1995-2016 Mark Adler 2 * Copyright (C) 1995-2022 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inflate.h b/inflate.h
index 98679fa..f127b6b 100644
--- a/inflate.h
+++ b/inflate.h
@@ -1,5 +1,5 @@
1/* inflate.h -- internal inflate state definition 1/* inflate.h -- internal inflate state definition
2 * Copyright (C) 1995-2016 Mark Adler 2 * Copyright (C) 1995-2019 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inftrees.c b/inftrees.c
index 716c988..09462a7 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
1/* inftrees.c -- generate Huffman trees for efficient decoding 1/* inftrees.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2017 Mark Adler 2 * Copyright (C) 1995-2022 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate_copyright[] = 11const char inflate_copyright[] =
12 " inflate 1.2.11.1 Copyright 1995-2017 Mark Adler "; 12 " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 198, 196}; 65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 202};
66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 8cab107..10f6c9d 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
1 ZLIB version 1.2.11.1 for OS/400 installation instructions 1 ZLIB version 1.2.12 for OS/400 installation instructions
2 2
31) Download and unpack the zlib tarball to some IFS directory. 31) Download and unpack the zlib tarball to some IFS directory.
4 (i.e.: /path/to/the/zlib/ifs/source/directory) 4 (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/zlib.inc b/os400/zlib.inc
index 81d0022..fda156b 100644
--- a/os400/zlib.inc
+++ b/os400/zlib.inc
@@ -1,7 +1,7 @@
1 * ZLIB.INC - Interface to the general purpose compression library 1 * ZLIB.INC - Interface to the general purpose compression library
2 * 2 *
3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE. 3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4 * Version 1.2.11.1 4 * Version 1.2.12
5 * 5 *
6 * 6 *
7 * WARNING: 7 * WARNING:
@@ -22,14 +22,14 @@
22 * 22 *
23 * Versioning information. 23 * Versioning information.
24 * 24 *
25 D ZLIB_VERSION C '1.2.11.1' 25 D ZLIB_VERSION C '1.2.12'
26 D ZLIB_VERNUM C X'12a0' 26 D ZLIB_VERNUM C X'12a0'
27 D ZLIB_VER_MAJOR C 1 27 D ZLIB_VER_MAJOR C 1
28 D ZLIB_VER_MINOR C 2 28 D ZLIB_VER_MINOR C 2
29 D ZLIB_VER_REVISION... 29 D ZLIB_VER_REVISION...
30 D C 11 30 D C 12
31 D ZLIB_VER_SUBREVISION... 31 D ZLIB_VER_SUBREVISION...
32 D C 1 32 D C 0
33 * 33 *
34 * Other equates. 34 * Other equates.
35 * 35 *
diff --git a/qnx/package.qpg b/qnx/package.qpg
index 50b6129..badd1d5 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
25 <QPG:Files> 25 <QPG:Files>
26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> 26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> 27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28 <QPG:Add file="../libz.so.1.2.11.1" install="/opt/lib/" user="root:bin" permission="644"/> 28 <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" user="root:bin" permission="644"/>
29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11.1"/> 29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.12"/>
30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11.1"/> 30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.12"/>
31 <QPG:Add file="../libz.so.1.2.11.1" install="/opt/lib/" component="slib"/> 31 <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" component="slib"/>
32 </QPG:Files> 32 </QPG:Files>
33 33
34 <QPG:PackageFilter> 34 <QPG:PackageFilter>
@@ -63,7 +63,7 @@
63 </QPM:ProductDescription> 63 </QPM:ProductDescription>
64 64
65 <QPM:ReleaseDescription> 65 <QPM:ReleaseDescription>
66 <QPM:ReleaseVersion>1.2.11.1</QPM:ReleaseVersion> 66 <QPM:ReleaseVersion>1.2.12</QPM:ReleaseVersion>
67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> 67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability> 68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> 69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/treebuild.xml b/treebuild.xml
index 6bd6677..781b4c9 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<package name="zlib" version="1.2.11.1"> 2<package name="zlib" version="1.2.12">
3 <library name="zlib" dlversion="1.2.11.1" dlname="z"> 3 <library name="zlib" dlversion="1.2.12" dlname="z">
4 <property name="description"> zip compression library </property> 4 <property name="description"> zip compression library </property>
5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> 5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6 6
diff --git a/trees.c b/trees.c
index 6896067..f73fd99 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
1/* trees.c -- output deflated data using Huffman coding 1/* trees.c -- output deflated data using Huffman coding
2 * Copyright (C) 1995-2017 Jean-loup Gailly 2 * Copyright (C) 1995-2021 Jean-loup Gailly
3 * detect_data_type() function provided freely by Cosmin Truta, 2006 3 * detect_data_type() function provided freely by Cosmin Truta, 2006
4 * For conditions of distribution and use, see copyright notice in zlib.h 4 * For conditions of distribution and use, see copyright notice in zlib.h
5 */ 5 */
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index a1de359..536cfec 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.11.1 is a general purpose data compression library. All the code is 3zlib 1.2.12 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) 6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
22 22
23Manifest: 23Manifest:
24 24
25The package zlib-1.2.11.1-win32-x86.zip will contain the following files: 25The package zlib-1.2.12-win32-x86.zip will contain the following files:
26 26
27 README-WIN32.txt This document 27 README-WIN32.txt This document
28 ChangeLog Changes since previous zlib packages 28 ChangeLog Changes since previous zlib packages
diff --git a/win32/zlib.def b/win32/zlib.def
index 784b138..53c8011 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -69,6 +69,7 @@ EXPORTS
69 gzoffset64 69 gzoffset64
70 adler32_combine64 70 adler32_combine64
71 crc32_combine64 71 crc32_combine64
72 crc32_combine_gen64
72; checksum functions 73; checksum functions
73 adler32 74 adler32
74 adler32_z 75 adler32_z
@@ -76,6 +77,8 @@ EXPORTS
76 crc32_z 77 crc32_z
77 adler32_combine 78 adler32_combine
78 crc32_combine 79 crc32_combine
80 crc32_combine_gen
81 crc32_combine_op
79; various hacks, don't look :) 82; various hacks, don't look :)
80 deflateInit_ 83 deflateInit_
81 deflateInit2_ 84 deflateInit2_
diff --git a/zlib.3 b/zlib.3
index fac206b..bcaebd9 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
1.TH ZLIB 3 "xx Jan 2017" 1.TH ZLIB 3 "27 Mar 2022"
2.SH NAME 2.SH NAME
3zlib \- compression/decompression library 3zlib \- compression/decompression library
4.SH SYNOPSIS 4.SH SYNOPSIS
@@ -105,9 +105,9 @@ before asking for help.
105Send questions and/or comments to zlib@gzip.org, 105Send questions and/or comments to zlib@gzip.org,
106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). 106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
107.SH AUTHORS AND LICENSE 107.SH AUTHORS AND LICENSE
108Version 1.2.11.1 108Version 1.2.12
109.LP 109.LP
110Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 110Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
111.LP 111.LP
112This software is provided 'as-is', without any express or implied 112This software is provided 'as-is', without any express or implied
113warranty. In no event will the authors be held liable for any damages 113warranty. In no event will the authors be held liable for any damages
diff --git a/zlib.3.pdf b/zlib.3.pdf
index 48e6147..54d677a 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index 3bde3a6..4a98e38 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
1/* zlib.h -- interface of the 'zlib' general purpose compression library 1/* zlib.h -- interface of the 'zlib' general purpose compression library
2 version 1.2.11.1, January xxth, 2017 2 version 1.2.12, March 11th, 2022
3 3
4 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
5 5
6 This software is provided 'as-is', without any express or implied 6 This software is provided 'as-is', without any express or implied
7 warranty. In no event will the authors be held liable for any damages 7 warranty. In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
37extern "C" { 37extern "C" {
38#endif 38#endif
39 39
40#define ZLIB_VERSION "1.2.11.1-motley" 40#define ZLIB_VERSION "1.2.12"
41#define ZLIB_VERNUM 0x12b1 41#define ZLIB_VERNUM 0x12c0
42#define ZLIB_VER_MAJOR 1 42#define ZLIB_VER_MAJOR 1
43#define ZLIB_VER_MINOR 2 43#define ZLIB_VER_MINOR 2
44#define ZLIB_VER_REVISION 11 44#define ZLIB_VER_REVISION 12
45#define ZLIB_VER_SUBREVISION 1 45#define ZLIB_VER_SUBREVISION 0
46 46
47/* 47/*
48 The 'zlib' compression library provides in-memory compression and 48 The 'zlib' compression library provides in-memory compression and
@@ -1870,7 +1870,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
1870# define z_gzoffset z_gzoffset64 1870# define z_gzoffset z_gzoffset64
1871# define z_adler32_combine z_adler32_combine64 1871# define z_adler32_combine z_adler32_combine64
1872# define z_crc32_combine z_crc32_combine64 1872# define z_crc32_combine z_crc32_combine64
1873# define z_crc32_combine_gen z_crc32_combine64_gen 1873# define z_crc32_combine_gen z_crc32_combine_gen64
1874# else 1874# else
1875# define gzopen gzopen64 1875# define gzopen gzopen64
1876# define gzseek gzseek64 1876# define gzseek gzseek64
diff --git a/zlib.map b/zlib.map
index 40fa9db..b330b60 100644
--- a/zlib.map
+++ b/zlib.map
@@ -92,3 +92,9 @@ ZLIB_1.2.9 {
92 adler32_z; 92 adler32_z;
93 crc32_z; 93 crc32_z;
94} ZLIB_1.2.7.1; 94} ZLIB_1.2.7.1;
95
96ZLIB_1.2.12 {
97 crc32_combine_gen;
98 crc32_combine_gen64;
99 crc32_combine_op;
100} ZLIB_1.2.9;
diff --git a/zutil.h b/zutil.h
index 21f8e7a..d9a20ae 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
1/* zutil.h -- internal interface and configuration of the compression library 1/* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5