Skip to content

Commit bc586e3

Browse files
committed
Squashed commit of the following:
commit da37edc Author: Andrew Innes <[email protected]> Date: Thu Nov 17 12:01:26 2022 +0800 Don't cstyle zlib Signed-off-by: Andrew Innes <[email protected]> commit 74f4b56 Author: Andrew Innes <[email protected]> Date: Wed Nov 16 15:42:53 2022 +0800 rename to 1.2.13 commit df0772a Author: Andrew Innes <[email protected]> Date: Wed Nov 16 15:35:00 2022 +0800 remove stuff commit a19c926 Author: Andrew Innes <[email protected]> Date: Wed Nov 16 15:20:12 2022 +0800 zconf.in.h -> zconf.h.in commit de780c7 Author: Andrew Innes <[email protected]> Date: Wed Nov 16 06:26:27 2022 +0800 Remove asm Signed-off-by: Andrew Innes <[email protected]> commit efc13b4 Author: Andrew Innes <[email protected]> Date: Tue Nov 15 16:12:33 2022 +0800 Hacky fixes Signed-off-by: Andrew Innes <[email protected]> commit 46458df Author: Andrew Innes <[email protected]> Date: Tue Nov 15 16:08:47 2022 +0800 Breaking commit Signed-off-by: Andrew Innes <[email protected]> commit cc87aa1 Author: Andrew Innes <[email protected]> Date: Tue Nov 15 14:55:10 2022 +0800 Smallest I could get the diff before breaking Signed-off-by: Andrew Innes <[email protected]> commit 9059507 Author: Andrew Innes <[email protected]> Date: Tue Nov 15 14:15:57 2022 +0800 Update zlib now that gzio.c has been replaced Signed-off-by: Andrew Innes <[email protected]> commit 8984b57 Author: Andrew Innes <[email protected]> Date: Tue Nov 15 14:01:12 2022 +0800 gzio.c might have been expanded Signed-off-by: Andrew Innes <[email protected]> commit 849df2c Author: Andrew Innes <[email protected]> Date: Mon Nov 14 19:59:44 2022 +0800 Update zlib to 1.2.13 https://github.com/madler/zlib Signed-off-by: Andrew Innes <[email protected]> commit 06e895f Author: Andrew Innes <[email protected]> Date: Mon Nov 14 18:25:22 2022 +0800 Replace zlib with near stock gnuwin zlib 1.2.3 By replacing most of the reformatted code with original code, we can take advantage of cleaner diffs while upgrading https://gnuwin32.sourceforge.net/packages/zlib.htm Signed-off-by: Andrew Innes <[email protected]>
1 parent fb1ebba commit bc586e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+32239
-18308
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ cstyle:
128128
! -path './include/sys/lua/*' \
129129
! -path './module/lua/l*.[ch]' \
130130
! -path './module/zfs/lz4.c' \
131+
! -path './lib/os/windows/zlib-1.2.13/*' \
131132
$(cstyle_line)
132133

133134
filter_executable = -exec test -x '{}' \; -print

lib/os/windows/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_subdirectory(zlib-1.2.3)
1+
add_subdirectory(zlib-1.2.13)
22
add_subdirectory(libpthread)
33
add_subdirectory(libkstat)
44
add_subdirectory(libuuid)

lib/os/windows/zlib-1.2.3/CMakeLists.txt renamed to lib/os/windows/zlib-1.2.13/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ set(ZLIB_SOURCES
66
compress.c
77
crc32.c
88
deflate.c
9-
gzio.c
9+
#gzio.c
10+
gzlib.c
11+
gzread.c
12+
gzwrite.c
13+
gzclose.c
1014
infback.c
1115
inffast.c
1216
inflate.c
1317
inftrees.c
1418
trees.c
1519
uncompr.c
1620
zutil.c
17-
contrib/masmx64/inffas8664.c
18-
contrib/masmx86/gvmat32c.c
21+
#contrib/masmx64/inffas8664.c
22+
#contrib/masmx86/gvmat32c.c
1923
contrib/minizip/ioapi.c
2024
contrib/minizip/unzip.c
2125
contrib/minizip/zip.c

lib/os/windows/zlib-1.2.13/ChangeLog

Lines changed: 1590 additions & 0 deletions
Large diffs are not rendered by default.

lib/os/windows/zlib-1.2.13/FAQ

Lines changed: 368 additions & 0 deletions
Large diffs are not rendered by default.

lib/os/windows/zlib-1.2.13/INDEX

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
CMakeLists.txt cmake build file
2+
ChangeLog history of changes
3+
FAQ Frequently Asked Questions about zlib
4+
INDEX this file
5+
Makefile dummy Makefile that tells you to ./configure
6+
Makefile.in template for Unix Makefile
7+
README guess what
8+
configure configure script for Unix
9+
make_vms.com makefile for VMS
10+
test/example.c zlib usages examples for build testing
11+
test/minigzip.c minimal gzip-like functionality for build testing
12+
test/infcover.c inf*.c code coverage for build coverage testing
13+
treebuild.xml XML description of source file dependencies
14+
zconf.h.cmakein zconf.h template for cmake
15+
zconf.h.in zconf.h template for configure
16+
zlib.3 Man page for zlib
17+
zlib.3.pdf Man page in PDF format
18+
zlib.map Linux symbol information
19+
zlib.pc.in Template for pkg-config descriptor
20+
zlib.pc.cmakein zlib.pc template for cmake
21+
zlib2ansi perl script to convert source files for C++ compilation
22+
23+
amiga/ makefiles for Amiga SAS C
24+
as400/ makefiles for AS/400
25+
doc/ documentation for formats and algorithms
26+
msdos/ makefiles for MSDOS
27+
nintendods/ makefile for Nintendo DS
28+
old/ makefiles for various architectures and zlib documentation
29+
files that have not yet been updated for zlib 1.2.x
30+
qnx/ makefiles for QNX
31+
watcom/ makefiles for OpenWatcom
32+
win32/ makefiles for Windows
33+
34+
zlib public header files (required for library use):
35+
zconf.h
36+
zlib.h
37+
38+
private source files used to build the zlib library:
39+
adler32.c
40+
compress.c
41+
crc32.c
42+
crc32.h
43+
deflate.c
44+
deflate.h
45+
gzclose.c
46+
gzguts.h
47+
gzlib.c
48+
gzread.c
49+
gzwrite.c
50+
infback.c
51+
inffast.c
52+
inffast.h
53+
inffixed.h
54+
inflate.c
55+
inflate.h
56+
inftrees.c
57+
inftrees.h
58+
trees.c
59+
trees.h
60+
uncompr.c
61+
zutil.c
62+
zutil.h
63+
64+
source files for sample programs
65+
See examples/README.examples
66+
67+
unsupported contributions by third parties
68+
See contrib/README.contrib

lib/os/windows/zlib-1.2.13/README

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
ZLIB DATA COMPRESSION LIBRARY
2+
3+
zlib 1.2.13 is a general purpose data compression library. All the code is
4+
thread safe. The data format used by the zlib library is described by RFCs
5+
(Request for Comments) 1950 to 1952 in the files
6+
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7+
rfc1952 (gzip format).
8+
9+
All functions of the compression library are documented in the file zlib.h
10+
(volunteer to write man pages welcome, contact [email protected]). A usage example
11+
of the library is given in the file test/example.c which also tests that
12+
the library is working correctly. Another example is given in the file
13+
test/minigzip.c. The compression library itself is composed of all source
14+
files in the root directory.
15+
16+
To compile all files and run the test program, follow the instructions given at
17+
the top of Makefile.in. In short "./configure; make test", and if that goes
18+
well, "make install" should work for most flavors of Unix. For Windows, use
19+
one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use
20+
make_vms.com.
21+
22+
Questions about zlib should be sent to <[email protected]>, or to Gilles Vollant
23+
<[email protected]> for the Windows DLL version. The zlib home page is
24+
http://zlib.net/ . Before reporting a problem, please check this site to
25+
verify that you have the latest version of zlib; otherwise get the latest
26+
version and check whether the problem still exists or not.
27+
28+
PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
29+
30+
Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31+
issue of Dr. Dobb's Journal; a copy of the article is available at
32+
http://marknelson.us/1997/01/01/zlib-engine/ .
33+
34+
The changes made in version 1.2.13 are documented in the file ChangeLog.
35+
36+
Unsupported third party contributions are provided in directory contrib/ .
37+
38+
zlib is available in Java using the java.util.zip package, documented at
39+
http://java.sun.com/developer/technicalArticles/Programming/compression/ .
40+
41+
A Perl interface to zlib written by Paul Marquess <[email protected]> is available
42+
at CPAN (Comprehensive Perl Archive Network) sites, including
43+
http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
44+
45+
A Python interface to zlib written by A.M. Kuchling <[email protected]> is
46+
available in Python 1.5 and later versions, see
47+
http://docs.python.org/library/zlib.html .
48+
49+
zlib is built into tcl: http://wiki.tcl.tk/4610 .
50+
51+
An experimental package to read and write files in .zip format, written on top
52+
of zlib by Gilles Vollant <[email protected]>, is available in the
53+
contrib/minizip directory of zlib.
54+
55+
56+
Notes for some targets:
57+
58+
- For Windows DLL versions, please see win32/DLL_FAQ.txt
59+
60+
- For 64-bit Irix, deflate.c must be compiled without any optimization. With
61+
-O, one libpng test fails. The test works in 32 bit mode (with the -n32
62+
compiler flag). The compiler bug has been reported to SGI.
63+
64+
- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
65+
when compiled with cc.
66+
67+
- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
68+
necessary to get gzprintf working correctly. This is done by configure.
69+
70+
- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
71+
other compilers. Use "make test" to check your compiler.
72+
73+
- gzdopen is not supported on RISCOS or BEOS.
74+
75+
- For PalmOs, see http://palmzlib.sourceforge.net/
76+
77+
78+
Acknowledgments:
79+
80+
The deflate format used by zlib was defined by Phil Katz. The deflate and
81+
zlib specifications were written by L. Peter Deutsch. Thanks to all the
82+
people who reported problems and suggested various improvements in zlib; they
83+
are too numerous to cite here.
84+
85+
Copyright notice:
86+
87+
(C) 1995-2022 Jean-loup Gailly and Mark Adler
88+
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
91+
arising from the use of this software.
92+
93+
Permission is granted to anyone to use this software for any purpose,
94+
including commercial applications, and to alter it and redistribute it
95+
freely, subject to the following restrictions:
96+
97+
1. The origin of this software must not be misrepresented; you must not
98+
claim that you wrote the original software. If you use this software
99+
in a product, an acknowledgment in the product documentation would be
100+
appreciated but is not required.
101+
2. Altered source versions must be plainly marked as such, and must not be
102+
misrepresented as being the original software.
103+
3. This notice may not be removed or altered from any source distribution.
104+
105+
Jean-loup Gailly Mark Adler
106+
107+
108+
If you use the zlib library in a product, we would appreciate *not* receiving
109+
lengthy legal documents to sign. The sources are provided for free but without
110+
warranty of any kind. The library has been entirely written by Jean-loup
111+
Gailly and Mark Adler; it does not include third-party code. We make all
112+
contributions to and distributions of this project solely in our personal
113+
capacity, and are not conveying any rights to any intellectual property of
114+
any third parties.
115+
116+
If you redistribute modified sources, we would appreciate that you include in
117+
the file ChangeLog history information documenting your changes. Please read
118+
the FAQ for more information on the distribution of modified source versions.

0 commit comments

Comments
 (0)