Squashed commit of the following:

commit da37edc
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Thu Nov 17 12:01:26 2022 +0800

    Don't cstyle zlib

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit 74f4b56
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Wed Nov 16 15:42:53 2022 +0800

    rename to 1.2.13

commit df0772a
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Wed Nov 16 15:35:00 2022 +0800

    remove stuff

commit a19c926
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Wed Nov 16 15:20:12 2022 +0800

    zconf.in.h -> zconf.h.in

commit de780c7
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Wed Nov 16 06:26:27 2022 +0800

    Remove asm

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit efc13b4
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Tue Nov 15 16:12:33 2022 +0800

    Hacky fixes

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit 46458df
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Tue Nov 15 16:08:47 2022 +0800

    Breaking commit

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit cc87aa1
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Tue Nov 15 14:55:10 2022 +0800

    Smallest I could get the diff before breaking

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit 9059507
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Tue Nov 15 14:15:57 2022 +0800

    Update zlib now that gzio.c has been replaced

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit 8984b57
Author: Andrew Innes <andrew.c12@gmail.com>
Date:   Tue Nov 15 14:01:12 2022 +0800

    gzio.c might have been expanded

    Signed-off-by: Andrew Innes <andrew.c12@gmail.com>

commit 849df2c
Author: Andrew Innes <andrew.c12@gmail.com>
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 <andrew.c12@gmail.com>

commit 06e895f
Author: Andrew Innes <andrew.c12@gmail.com>
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 <andrew.c12@gmail.com>

Makefile.am

@@ -128,6 +128,7 @@ cstyle:
 		! -path './include/sys/lua/*' \
 		! -path './module/lua/l*.[ch]' \
 		! -path './module/zfs/lz4.c' \
+		! -path './lib/os/windows/zlib-1.2.13/*' \
 		$(cstyle_line)
 
 filter_executable = -exec test -x '{}' \; -print

lib/os/windows/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory(zlib-1.2.3)
+add_subdirectory(zlib-1.2.13)
 add_subdirectory(libpthread)
 add_subdirectory(libkstat)
 add_subdirectory(libuuid)

lib/os/windows/zlib-1.2.3/CMakeLists.txt → lib/os/windows/zlib-1.2.13/CMakeLists.txt

@@ -6,16 +6,20 @@ set(ZLIB_SOURCES
   compress.c
   crc32.c
   deflate.c
-  gzio.c
+  #gzio.c
+  gzlib.c
+  gzread.c
+  gzwrite.c
+  gzclose.c
   infback.c
   inffast.c
   inflate.c
   inftrees.c
   trees.c
   uncompr.c
   zutil.c
-  contrib/masmx64/inffas8664.c
-  contrib/masmx86/gvmat32c.c
+  #contrib/masmx64/inffas8664.c
+  #contrib/masmx86/gvmat32c.c
   contrib/minizip/ioapi.c
   contrib/minizip/unzip.c
   contrib/minizip/zip.c

lib/os/windows/zlib-1.2.13/INDEX

@@ -0,0 +1,68 @@
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs
+See examples/README.examples
+
+                unsupported contributions by third parties
+See contrib/README.contrib

lib/os/windows/zlib-1.2.13/README

@@ -0,0 +1,118 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.13 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
+rfc1952 (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in.  In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version.  The zlib home page is
+http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+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.13 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://docs.python.org/library/zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz.  The deflate and
+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+  people who reported problems and suggested various improvements in zlib; they
+  are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2022 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.  We make all
+contributions to and distributions of this project solely in our personal
+capacity, and are not conveying any rights to any intellectual property of
+any third parties.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.