From 88e50f170525c0a6237ca5ed4db0c620af366fe7 Mon Sep 17 00:00:00 2001
From: tbeu <tc@tbeu.de>
Date: Tue, 15 Nov 2016 21:04:58 +0100
Subject: [PATCH 01/33] Update miniunz version.

---
 contrib/minizip/miniunz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index a12aec8be..8ada038db 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -186,7 +186,7 @@ static int makedir(const char *newdir) {
 }
 
 static void do_banner(void) {
-    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("MiniUnz 1.1, demo of zLib + Unz package written by Gilles Vollant\n");
     printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
 }
 

From 5af7cef45eeef86ddf6ab00b4e363c1eecaf47b6 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Thu, 24 Aug 2023 02:14:23 -0400
Subject: [PATCH 02/33] Fix bug in inflateSync() for data held in bit buffer.

---
 inflate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inflate.c b/inflate.c
index b0757a9b2..94ecff015 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1387,7 +1387,7 @@ int ZEXPORT inflateSync(z_streamp strm) {
     /* if first time, start search in bit buffer */
     if (state->mode != SYNC) {
         state->mode = SYNC;
-        state->hold <<= state->bits & 7;
+        state->hold >>= state->bits & 7;
         state->bits -= state->bits & 7;
         len = 0;
         while (state->bits >= 8) {

From bd9c329c1055a9265812352655ed2eec93f36e92 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 3 Sep 2023 13:10:10 -0700
Subject: [PATCH 03/33] Make internal functions static in the test code.

To avoid warnings when building with -Wmissing-prototypes.
---
 test/example.c  | 25 +++++++++++++------------
 test/minigzip.c | 30 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/test/example.c b/test/example.c
index 582a17a3c..c3521dd59 100644
--- a/test/example.c
+++ b/test/example.c
@@ -36,12 +36,12 @@ static uLong dictId;    /* Adler32 value of the dictionary */
 
 #ifdef Z_SOLO
 
-void *myalloc(void *q, unsigned n, unsigned m) {
+static void *myalloc(void *q, unsigned n, unsigned m) {
     (void)q;
     return calloc(n, m);
 }
 
-void myfree(void *q, void *p) {
+static void myfree(void *q, void *p) {
     (void)q;
     free(p);
 }
@@ -57,7 +57,7 @@ static free_func zfree = (free_func)0;
 /* ===========================================================================
  * Test compress() and uncompress()
  */
-void test_compress(Byte *compr, uLong comprLen, Byte *uncompr,
+static void test_compress(Byte *compr, uLong comprLen, Byte *uncompr,
                    uLong uncomprLen) {
     int err;
     uLong len = (uLong)strlen(hello)+1;
@@ -81,7 +81,7 @@ void test_compress(Byte *compr, uLong comprLen, Byte *uncompr,
 /* ===========================================================================
  * Test read/write of .gz files
  */
-void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) {
+static void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) {
 #ifdef NO_GZCOMPRESS
     fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
 #else
@@ -163,7 +163,7 @@ void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) {
 /* ===========================================================================
  * Test deflate() with small buffers
  */
-void test_deflate(Byte *compr, uLong comprLen) {
+static void test_deflate(Byte *compr, uLong comprLen) {
     z_stream c_stream; /* compression stream */
     int err;
     uLong len = (uLong)strlen(hello)+1;
@@ -198,7 +198,7 @@ void test_deflate(Byte *compr, uLong comprLen) {
 /* ===========================================================================
  * Test inflate() with small buffers
  */
-void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
+static void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
                   uLong uncomprLen) {
     int err;
     z_stream d_stream; /* decompression stream */
@@ -237,7 +237,7 @@ void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
 /* ===========================================================================
  * Test deflate() with large buffers and dynamic change of compression level
  */
-void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr,
+static void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr,
                         uLong uncomprLen) {
     z_stream c_stream; /* compression stream */
     int err;
@@ -290,7 +290,7 @@ void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr,
 /* ===========================================================================
  * Test inflate() with large buffers
  */
-void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
+static void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
                         uLong uncomprLen) {
     int err;
     z_stream d_stream; /* decompression stream */
@@ -329,7 +329,7 @@ void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
 /* ===========================================================================
  * Test deflate() with full flush
  */
-void test_flush(Byte *compr, uLong *comprLen) {
+static void test_flush(Byte *compr, uLong *comprLen) {
     z_stream c_stream; /* compression stream */
     int err;
     uInt len = (uInt)strlen(hello)+1;
@@ -364,7 +364,8 @@ void test_flush(Byte *compr, uLong *comprLen) {
 /* ===========================================================================
  * Test inflateSync()
  */
-void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) {
+static void test_sync(Byte *compr, uLong comprLen, Byte *uncompr,
+                      uLong uncomprLen) {
     int err;
     z_stream d_stream; /* decompression stream */
 
@@ -404,7 +405,7 @@ void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) {
 /* ===========================================================================
  * Test deflate() with preset dictionary
  */
-void test_dict_deflate(Byte *compr, uLong comprLen) {
+static void test_dict_deflate(Byte *compr, uLong comprLen) {
     z_stream c_stream; /* compression stream */
     int err;
 
@@ -438,7 +439,7 @@ void test_dict_deflate(Byte *compr, uLong comprLen) {
 /* ===========================================================================
  * Test inflate() with a preset dictionary
  */
-void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
+static void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr,
                        uLong uncomprLen) {
     int err;
     z_stream d_stream; /* decompression stream */
diff --git a/test/minigzip.c b/test/minigzip.c
index 8a21ddfb5..c72356dbc 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -149,12 +149,12 @@ static void pwinerror (s)
 #  include <unistd.h>       /* for unlink() */
 #endif
 
-void *myalloc(void *q, unsigned n, unsigned m) {
+static void *myalloc(void *q, unsigned n, unsigned m) {
     (void)q;
     return calloc(n, m);
 }
 
-void myfree(void *q, void *p) {
+static void myfree(void *q, void *p) {
     (void)q;
     free(p);
 }
@@ -167,7 +167,7 @@ typedef struct gzFile_s {
     z_stream strm;
 } *gzFile;
 
-gzFile gz_open(const char *path, int fd, const char *mode) {
+static gzFile gz_open(const char *path, int fd, const char *mode) {
     gzFile gz;
     int ret;
 
@@ -201,15 +201,15 @@ gzFile gz_open(const char *path, int fd, const char *mode) {
     return gz;
 }
 
-gzFile gzopen(const char *path, const char *mode) {
+static gzFile gzopen(const char *path, const char *mode) {
     return gz_open(path, -1, mode);
 }
 
-gzFile gzdopen(int fd, const char *mode) {
+static gzFile gzdopen(int fd, const char *mode) {
     return gz_open(NULL, fd, mode);
 }
 
-int gzwrite(gzFile gz, const void *buf, unsigned len) {
+static int gzwrite(gzFile gz, const void *buf, unsigned len) {
     z_stream *strm;
     unsigned char out[BUFLEN];
 
@@ -227,7 +227,7 @@ int gzwrite(gzFile gz, const void *buf, unsigned len) {
     return len;
 }
 
-int gzread(gzFile gz, void *buf, unsigned len) {
+static int gzread(gzFile gz, void *buf, unsigned len) {
     int ret;
     unsigned got;
     unsigned char in[1];
@@ -258,7 +258,7 @@ int gzread(gzFile gz, void *buf, unsigned len) {
     return len - strm->avail_out;
 }
 
-int gzclose(gzFile gz) {
+static int gzclose(gzFile gz) {
     z_stream *strm;
     unsigned char out[BUFLEN];
 
@@ -283,7 +283,7 @@ int gzclose(gzFile gz) {
     return Z_OK;
 }
 
-const char *gzerror(gzFile gz, int *err) {
+static const char *gzerror(gzFile gz, int *err) {
     *err = gz->err;
     return gz->msg;
 }
@@ -295,7 +295,7 @@ static char *prog;
 /* ===========================================================================
  * Display error message and exit
  */
-void error(const char *msg) {
+static void error(const char *msg) {
     fprintf(stderr, "%s: %s\n", prog, msg);
     exit(1);
 }
@@ -305,7 +305,7 @@ void error(const char *msg) {
 /* Try compressing the input file at once using mmap. Return Z_OK if
  * if success, Z_ERRNO otherwise.
  */
-int gz_compress_mmap(FILE *in, gzFile out) {
+static int gz_compress_mmap(FILE *in, gzFile out) {
     int len;
     int err;
     int ifd = fileno(in);
@@ -338,7 +338,7 @@ int gz_compress_mmap(FILE *in, gzFile out) {
  * Compress input to output then close both files.
  */
 
-void gz_compress(FILE *in, gzFile out) {
+static void gz_compress(FILE *in, gzFile out) {
     local char buf[BUFLEN];
     int len;
     int err;
@@ -366,7 +366,7 @@ void gz_compress(FILE *in, gzFile out) {
 /* ===========================================================================
  * Uncompress input to output then close both files.
  */
-void gz_uncompress(gzFile in, FILE *out) {
+static void gz_uncompress(gzFile in, FILE *out) {
     local char buf[BUFLEN];
     int len;
     int err;
@@ -390,7 +390,7 @@ void gz_uncompress(gzFile in, FILE *out) {
  * Compress the given file: create a corresponding .gz file and remove the
  * original.
  */
-void file_compress(char *file, char *mode) {
+static void file_compress(char *file, char *mode) {
     local char outfile[MAX_NAME_LEN];
     FILE  *in;
     gzFile out;
@@ -426,7 +426,7 @@ void file_compress(char *file, char *mode) {
 /* ===========================================================================
  * Uncompress the given file and remove the original.
  */
-void file_uncompress(char *file) {
+static void file_uncompress(char *file) {
     local char buf[MAX_NAME_LEN];
     char *infile, *outfile;
     FILE  *out;

From ac8f12c97d1afd9bafa9c710f827d40a407d3266 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 18 Sep 2023 21:17:00 -0700
Subject: [PATCH 04/33] Add LIT_MEM define to use more memory for a small
 deflate speedup.

A bug fix in zlib 1.2.12 resulted in a slight slowdown (1-2%) of
deflate. This commit provides the option to #define LIT_MEM, which
uses more memory to reverse most of that slowdown. The memory for
the pending buffer and symbol buffers is increased by 25%, which
increases the total memory usage with the default parameters by
about 6%.
---
 deflate.c | 21 +++++++++++++++++++++
 deflate.h | 31 ++++++++++++++++++++++++++++++-
 trees.c   | 18 ++++++++++++++++--
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/deflate.c b/deflate.c
index 5e72cd926..263bbc8d4 100644
--- a/deflate.c
+++ b/deflate.c
@@ -493,7 +493,11 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
      * symbols from which it is being constructed.
      */
 
+#ifdef LIT_MEM
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 5);
+#else
     s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
+#endif
     s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
@@ -503,8 +507,14 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
+#ifdef LIT_MEM
+    s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1));
+    s->l_buf = s->pending_buf + (s->lit_bufsize << 2);
+    s->sym_end = s->lit_bufsize - 1;
+#else
     s->sym_buf = s->pending_buf + s->lit_bufsize;
     s->sym_end = (s->lit_bufsize - 1) * 3;
+#endif
     /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
      * on 16 bit machines and because stored blocks are restricted to
      * 64K-1 bytes.
@@ -720,9 +730,15 @@ int ZEXPORT deflatePrime(z_streamp strm, int bits, int value) {
 
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
+#ifdef LIT_MEM
+    if (bits < 0 || bits > 16 ||
+        (uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+#else
     if (bits < 0 || bits > 16 ||
         s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
         return Z_BUF_ERROR;
+#endif
     do {
         put = Buf_size - s->bi_valid;
         if (put > bits)
@@ -1308,7 +1324,12 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+#ifdef LIT_MEM
+    ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));
+    ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);
+#else
     ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+#endif
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
diff --git a/deflate.h b/deflate.h
index 869679142..69fe3a934 100644
--- a/deflate.h
+++ b/deflate.h
@@ -23,6 +23,10 @@
 #  define GZIP
 #endif
 
+/* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at
+   the cost of a larger memory footprint */
+/* #define LIT_MEM */
+
 /* ===========================================================================
  * Internal compression state.
  */
@@ -217,7 +221,12 @@ typedef struct internal_state {
     /* Depth of each subtree used as tie breaker for trees of equal frequency
      */
 
+#ifdef LIT_MEM
+    ushf *d_buf;          /* buffer for distances */
+    uchf *l_buf;          /* buffer for literals/lengths */
+#else
     uchf *sym_buf;        /* buffer for distances and literals/lengths */
+#endif
 
     uInt  lit_bufsize;
     /* Size of match buffer for literals/lengths.  There are 4 reasons for
@@ -239,7 +248,7 @@ typedef struct internal_state {
      *   - I can't count above 4
      */
 
-    uInt sym_next;      /* running index in sym_buf */
+    uInt sym_next;      /* running index in symbol buffer */
     uInt sym_end;       /* symbol table full when sym_next reaches this */
 
     ulg opt_len;        /* bit length of current block with optimal trees */
@@ -318,6 +327,25 @@ void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
   extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
+#ifdef LIT_MEM
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->sym_next] = 0; \
+    s->l_buf[s->sym_next++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (uch)(length); \
+    ush dist = (ush)(distance); \
+    s->d_buf[s->sym_next] = dist; \
+    s->l_buf[s->sym_next++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->sym_next == s->sym_end); \
+  }
+#else
 # define _tr_tally_lit(s, c, flush) \
   { uch cc = (c); \
     s->sym_buf[s->sym_next++] = 0; \
@@ -337,6 +365,7 @@ void ZLIB_INTERNAL _tr_stored_block(deflate_state *s, charf *buf,
     s->dyn_dtree[d_code(dist)].Freq++; \
     flush = (s->sym_next == s->sym_end); \
   }
+#endif
 #else
 # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
 # define _tr_tally_dist(s, distance, length, flush) \
diff --git a/trees.c b/trees.c
index 8dbdc40ba..5ca23e938 100644
--- a/trees.c
+++ b/trees.c
@@ -899,14 +899,19 @@ local void compress_block(deflate_state *s, const ct_data *ltree,
                           const ct_data *dtree) {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned sx = 0;    /* running index in sym_buf */
+    unsigned sx = 0;    /* running index in symbol buffers */
     unsigned code;      /* the code to send */
     int extra;          /* number of extra bits to send */
 
     if (s->sym_next != 0) do {
+#ifdef LIT_MEM
+        dist = s->d_buf[sx];
+        lc = s->l_buf[sx++];
+#else
         dist = s->sym_buf[sx++] & 0xff;
         dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
         lc = s->sym_buf[sx++];
+#endif
         if (dist == 0) {
             send_code(s, lc, ltree); /* send a literal byte */
             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
@@ -931,8 +936,12 @@ local void compress_block(deflate_state *s, const ct_data *ltree,
             }
         } /* literal or match pair ? */
 
-        /* Check that the overlay between pending_buf and sym_buf is ok: */
+        /* Check for no overlay of pending_buf on needed symbols */
+#ifdef LIT_MEM
+        Assert(s->pending < (s->lit_bufsize << 1) + sx, "pendingBuf overflow");
+#else
         Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+#endif
 
     } while (sx < s->sym_next);
 
@@ -1082,9 +1091,14 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
  * the current block must be flushed.
  */
 int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
+#ifdef LIT_MEM
+    s->d_buf[s->sym_next] = (ush)dist;
+    s->l_buf[s->sym_next++] = (uch)lc;
+#else
     s->sym_buf[s->sym_next++] = (uch)dist;
     s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
     s->sym_buf[s->sym_next++] = (uch)lc;
+#endif
     if (dist == 0) {
         /* lc is the unmatched char */
         s->dyn_ltree[lc].Freq++;

From 15c45adb76e81a7e3a8a9e17b2a56eb90f668f44 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Tue, 7 Nov 2023 15:46:41 -0800
Subject: [PATCH 05/33] Fix decision on the emission of Zip64 end records in
 minizip.

The appnote says that if the number of entries in the end record
is 0xffff, then the actual number of entries will be found in the
Zip64 end record. Therefore if the number of entries is equal to
0xffff, it can't be in the end record by itself, since that is an
instruction to get the number from the Zip64 end record. This code
would just store 0xffff in the end record in that case, not making
a Zip64 end record. This commit fixes that.
---
 contrib/minizip/zip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 0446109b2..86be90b7c 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1872,7 +1872,7 @@ extern int ZEXPORT zipClose(zipFile file, const char* global_comment) {
     free_linkedlist(&(zi->central_dir));
 
     pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+    if(pos >= 0xffffffff || zi->number_entry >= 0xFFFF)
     {
       ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
       Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);

From 643e17b7498d12ab8d15565662880579692f769d Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Tue, 14 Nov 2023 16:23:02 -0800
Subject: [PATCH 06/33] Correct repeated words in source file comments and a
 readme.

---
 contrib/infback9/inftree9.h | 4 ++--
 contrib/minizip/ioapi.h     | 2 +-
 contrib/minizip/zip.c       | 4 ++--
 contrib/minizip/zip.h       | 4 ++--
 inftrees.h                  | 4 ++--
 win32/README-WIN32.txt      | 4 ++--
 zlib.h                      | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/contrib/infback9/inftree9.h b/contrib/infback9/inftree9.h
index 2c1252f57..ab2ea28b2 100644
--- a/contrib/infback9/inftree9.h
+++ b/contrib/infback9/inftree9.h
@@ -41,8 +41,8 @@ typedef struct {
    examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
    maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 32 6 15" for distance codes returns 594.
-   The initial root table size (9 or 6) is found in the fifth argument of the
+   returns 852, and "enough 32 6 15" for distance codes returns 594. The
+   initial root table size (9 or 6) is found in the fifth argument of the
    inflate_table() calls in infback9.c.  If the root table size is changed,
    then these maximum sizes would be need to be recalculated and updated. */
 #define ENOUGH_LENS 852
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index c588a18d0..a2d2e6e60 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -144,7 +144,7 @@ typedef long     (ZCALLBACK *tell_file_func)      (voidpf opaque, voidpf stream)
 typedef long     (ZCALLBACK *seek_file_func)      (voidpf opaque, voidpf stream, uLong offset, int origin);
 
 
-/* here is the "old" 32 bits structure structure */
+/* here is the "old" 32 bits structure */
 typedef struct zlib_filefunc_def_s
 {
     open_file_func      zopen_file;
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 86be90b7c..e2e9da07c 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -614,9 +614,9 @@ local int LoadCentralDirectoryRecord(zip64_internal* pziinit) {
   ZPOS64_T central_pos;
   uLong uL;
 
-  uLong number_disk;          /* number of the current dist, used for
+  uLong number_disk;          /* number of the current disk, used for
                               spanning ZIP, unsupported, always 0*/
-  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+  uLong number_disk_with_CD;  /* number of the disk with central dir, used
                               for spanning ZIP, unsupported, always 0*/
   ZPOS64_T number_entry;
   ZPOS64_T number_entry_CD;      /* total number of entries in
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 5fc084132..3e230d340 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -177,9 +177,9 @@ extern int ZEXPORT zipOpenNewFileInZip64(zipFile file,
   filename : the filename in zip (if NULL, '-' without quote will be used
   *zipfi contain supplemental information
   if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
+    contains the extrafield data for the local header
   if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
+    contains the extrafield data for the global header
   if comment != NULL, comment contain the comment string
   method contain the compression method (0 for store, Z_DEFLATED for deflate)
   level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
diff --git a/inftrees.h b/inftrees.h
index a10712d8c..396f74b5d 100644
--- a/inftrees.h
+++ b/inftrees.h
@@ -41,8 +41,8 @@ typedef struct {
    examples/enough.c found in the zlib distribution.  The arguments to that
    program are the number of symbols, the initial root table size, and the
    maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
+   returns 852, and "enough 30 6 15" for distance codes returns 592. The
+   initial root table size (9 or 6) is found in the fifth argument of the
    inflate_table() calls in inflate.c and infback.c.  If the root table size is
    changed, then these maximum sizes would be need to be recalculated and
    updated. */
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 2790e838c..600fa3f52 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -16,8 +16,8 @@ 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 DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
-before asking for help.
+PLEASE read DLL_FAQ.txt, and the zlib FAQ http://zlib.net/zlib_faq.html before
+asking for help.
 
 
 Manifest:
diff --git a/zlib.h b/zlib.h
index ff0fd7e8a..b3e19fce8 100644
--- a/zlib.h
+++ b/zlib.h
@@ -936,10 +936,10 @@ ZEXTERN int ZEXPORT inflateSync(z_streamp strm);
      inflateSync returns Z_OK if a possible full flush point has been found,
    Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
    has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
+   In the success case, the application may save the current value of total_in
+   which indicates where valid compressed data was found.  In the error case,
+   the application may repeatedly call inflateSync, providing more input each
+   time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,

From 431a9b65eacab7efabf2230ba97ff426c0e07f9d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Thu, 7 Dec 2023 06:38:10 -0800
Subject: [PATCH 07/33] Add bounds checking to ERR_MSG() macro, used by
 zError().

---
 zutil.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zutil.h b/zutil.h
index 902a304cc..0bd2dbcba 100644
--- a/zutil.h
+++ b/zutil.h
@@ -56,7 +56,7 @@ typedef unsigned long  ulg;
 extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+#define ERR_MSG(err) z_errmsg[(err) < -6 || (err) > 2 ? 9 : 2 - (err)]
 
 #define ERR_RETURN(strm,err) \
   return (strm->msg = ERR_MSG(err), (err))

From 4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Tue, 12 Dec 2023 22:19:05 -0600
Subject: [PATCH 08/33] Remove fdopen #defines in zutil.h.

fdopen() is not used by zlib anymore. The #defines are vestigial.
---
 zutil.h | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/zutil.h b/zutil.h
index 0bd2dbcba..bb513cb4b 100644
--- a/zutil.h
+++ b/zutil.h
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#if defined(MACOS)
 #  define OS_CODE  7
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
 #endif
 
 #ifdef __acorn
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE 19
 #endif
 
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
 #if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008

From ee474ff2d11715485a87b123edbdd615ba218b88 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@chromium.org>
Date: Fri, 15 Dec 2023 15:10:19 +0100
Subject: [PATCH 09/33] Fix pending buffer overflow assert with LIT_MEM
 allocation.

Since each element in s->d_buf is 2 bytes, the sx index should be
multiplied by 2 in the assert.

Fixes #897
---
 trees.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trees.c b/trees.c
index 5ca23e938..e816d32bb 100644
--- a/trees.c
+++ b/trees.c
@@ -938,7 +938,7 @@ local void compress_block(deflate_state *s, const ct_data *ltree,
 
         /* Check for no overlay of pending_buf on needed symbols */
 #ifdef LIT_MEM
-        Assert(s->pending < (s->lit_bufsize << 1) + sx, "pendingBuf overflow");
+        Assert(s->pending < 2 * (s->lit_bufsize + sx), "pendingBuf overflow");
 #else
         Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
 #endif

From 60c31985ecdc2b40873564867e1ad2aef0b88697 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@chromium.org>
Date: Wed, 20 Dec 2023 12:26:25 +0100
Subject: [PATCH 10/33] Fix the copy of pending_buf in deflateCopy() for the
 LIT_MEM case.

---
 deflate.c | 10 +++-------
 deflate.h |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/deflate.c b/deflate.c
index 263bbc8d4..61e34fe80 100644
--- a/deflate.c
+++ b/deflate.c
@@ -493,11 +493,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
      * symbols from which it is being constructed.
      */
 
-#ifdef LIT_MEM
-    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 5);
-#else
-    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
-#endif
+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS);
     s->pending_buf_size = (ulg)s->lit_bufsize * 4;
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
@@ -1310,7 +1306,7 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, LIT_BUFS);
 
     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
         ds->pending_buf == Z_NULL) {
@@ -1321,7 +1317,7 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
     zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
     zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+    zmemcpy(ds->pending_buf, ss->pending_buf, ds->lit_bufsize * LIT_BUFS);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
 #ifdef LIT_MEM
diff --git a/deflate.h b/deflate.h
index 69fe3a934..854b156ba 100644
--- a/deflate.h
+++ b/deflate.h
@@ -222,9 +222,11 @@ typedef struct internal_state {
      */
 
 #ifdef LIT_MEM
+#   define LIT_BUFS 5
     ushf *d_buf;          /* buffer for distances */
     uchf *l_buf;          /* buffer for literals/lengths */
 #else
+#   define LIT_BUFS 4
     uchf *sym_buf;        /* buffer for distances and literals/lengths */
 #endif
 

From 36e369e1a54b35a978dc584496af69a07ec2d71a Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Thu, 11 Jan 2024 12:53:58 -0800
Subject: [PATCH 11/33] Note that the len2 argument of crc_combine*() must be
 non-negative.

If it is negative, then the code will enter an infinite loop.
---
 zlib.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zlib.h b/zlib.h
index b3e19fce8..39991a418 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1758,14 +1758,14 @@ ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2);
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
    check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
+   len2. len2 must be non-negative.
 */
 
 /*
 ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
 
      Return the operator corresponding to length len2, to be used with
-   crc32_combine_op().
+   crc32_combine_op(). len2 must be non-negative.
 */
 
 ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);

From 762cf49e6368af44dface31e809e69bd4ef7808f Mon Sep 17 00:00:00 2001
From: William Leara <william.leara@dell.com>
Date: Mon, 11 Dec 2023 12:01:52 -0600
Subject: [PATCH 12/33] Refer to correct function in contrib/minizip/unzip.c
 comment.

---
 contrib/minizip/unzip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index ed763f89f..8c42af661 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -117,7 +117,7 @@
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
+/* unz_file_info64_internal contain internal info about a file in zipfile*/
 typedef struct unz_file_info64_internal_s
 {
     ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */

From 190168cc1ce9c03c0a4ee296ef13c6d607ced027 Mon Sep 17 00:00:00 2001
From: William Leara <william.leara@dell.com>
Date: Mon, 11 Dec 2023 11:47:43 -0600
Subject: [PATCH 13/33] Correct case of MSDOS in contrib/minizip/miniunz.c.

---
 contrib/minizip/miniunz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 8ada038db..0c2fb0d82 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -79,7 +79,7 @@
 
 /* change_file_date : change the date/time of a file
     filename : the filename of the file where date/time must be modified
-    dosdate : the new date at the MSDos format (4 bytes)
+    dosdate : the new date at the MSDOS format (4 bytes)
     tmu_date : the SAME new date at the tm_unz format */
 static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date) {
 #ifdef _WIN32

From 16799d064b55a6b093fc52364f3343a1b1fa3b2f Mon Sep 17 00:00:00 2001
From: William Leara <william.leara@dell.com>
Date: Mon, 11 Dec 2023 11:32:09 -0600
Subject: [PATCH 14/33] Fix "the the" in examples/gzlog.c.

---
 examples/gzlog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/gzlog.c b/examples/gzlog.c
index b977802dd..da1b02e73 100644
--- a/examples/gzlog.c
+++ b/examples/gzlog.c
@@ -212,8 +212,8 @@
      to the appropriate recovery below.  If there is no foo.add file, provide
      a zero data length to the recovery.  In that case, the append recovery
      restores the foo.gz to the previous compressed + uncompressed data state.
-     For the the compress recovery, a missing foo.add file results in foo.gz
-     being restored to the previous compressed-only data state.
+     For the compress recovery, a missing foo.add file results in foo.gz being
+     restored to the previous compressed-only data state.
    - Append recovery:
      - Pick up append at + step above
    - Compress recovery:

From 01155ccc3f822a31291a64e4ecd5f1dbb8a8ee63 Mon Sep 17 00:00:00 2001
From: THE-Spellchecker <The.Spellchecker@outlook.com>
Date: Sat, 2 Dec 2023 16:56:47 -0600
Subject: [PATCH 15/33] Fix random typos over several source and text files.

---
 contrib/dotzlib/DotZLib/ChecksumImpl.cs | 2 +-
 contrib/iostream3/zfstream.h            | 4 ++--
 contrib/minizip/unzip.c                 | 4 ++--
 contrib/minizip/unzip.h                 | 2 +-
 contrib/minizip/zip.c                   | 4 ++--
 doc/algorithm.txt                       | 2 +-
 examples/zran.c                         | 2 +-
 old/visual-basic.txt                    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/contrib/dotzlib/DotZLib/ChecksumImpl.cs
index c1230bf03..de88dcf11 100644
--- a/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ b/contrib/dotzlib/DotZLib/ChecksumImpl.cs
@@ -34,7 +34,7 @@ public ChecksumGeneratorBase()
         }
 
         /// <summary>
-        /// Initializes a new instance of the checksum generator basewith a specified value
+        /// Initializes a new instance of the checksum generator base with a specified value
         /// </summary>
         /// <param name="initialValue">The value to set the current checksum to</param>
         public ChecksumGeneratorBase(uint initialValue)
diff --git a/contrib/iostream3/zfstream.h b/contrib/iostream3/zfstream.h
index 8574479ae..3dabc0f97 100644
--- a/contrib/iostream3/zfstream.h
+++ b/contrib/iostream3/zfstream.h
@@ -413,7 +413,7 @@ template<typename T1, typename T2>
   class gzomanip2
   {
   public:
-    // Allows insertor to peek at internals
+    // Allows inserter to peek at internals
     template <typename Ta, typename Tb>
       friend gzofstream&
       operator<<(gzofstream&,
@@ -452,7 +452,7 @@ template<typename T1, typename T2>
   : func(f), val1(v1), val2(v2)
   { }
 
-// Insertor applies underlying manipulator function to stream
+// Inserter applies underlying manipulator function to stream
 template<typename T1, typename T2>
   inline gzofstream&
   operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 8c42af661..d3c0cead7 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -450,7 +450,7 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
         return CENTRALDIRINVALID;
 
-    /* number of the disk with the start of the zip64 end of  central directory */
+    /* number of the disk with the start of the zip64 end of central directory */
     if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
         return CENTRALDIRINVALID;
     if (uL != 0)
@@ -499,7 +499,7 @@ local unzFile unzOpenInternal(const void *path,
 
     uLong number_disk;          /* number of the current dist, used for
                                    spanning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+    uLong number_disk_with_CD;  /* number the disk with central dir, used
                                    for spanning ZIP, unsupported, always 0*/
     ZPOS64_T number_entry_CD;      /* total number of entries in
                                    the central dir
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index 14105840f..5cfc9c627 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -306,7 +306,7 @@ extern int ZEXPORT unzGetCurrentFileInfo(unzFile file,
   Get Info about the current file
   if pfile_info!=NULL, the *pfile_info structure will contain some info about
         the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
+  if szFileName!=NULL, the filename string will be copied in szFileName
             (fileNameBufferSize is the size of the buffer)
   if extraField!=NULL, the extra field information will be copied in extraField
             (extraFieldBufferSize is the size of the buffer).
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index e2e9da07c..60bdffac3 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -575,7 +575,7 @@ local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib
   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
     return 0;
 
-  /* number of the disk with the start of the zip64 end of  central directory */
+  /* number of the disk with the start of the zip64 end of central directory */
   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
     return 0;
   if (uL != 0)
@@ -1608,7 +1608,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
 
       if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
       {
-        // we can not write more data to the buffer that we have room for.
+        // we cannot write more data to the buffer that we have room for.
         return ZIP_BADZIPFILE;
       }
 
diff --git a/doc/algorithm.txt b/doc/algorithm.txt
index c97f49502..029e5a313 100644
--- a/doc/algorithm.txt
+++ b/doc/algorithm.txt
@@ -77,7 +77,7 @@ table took no time (and if you had infinite memory), then there would only
 be a first level table to cover all the way to the longest code.  However,
 building the table ends up taking a lot longer for more bits since short
 codes are replicated many times in such a table.  What inflate() does is
-simply to make the number of bits in the first table a variable, and  then
+simply to make the number of bits in the first table a variable, and then
 to set that variable for the maximum speed.
 
 For inflate, which has 286 possible codes for the literal/length tree, the size
diff --git a/examples/zran.c b/examples/zran.c
index 32c93686c..d3135955b 100644
--- a/examples/zran.c
+++ b/examples/zran.c
@@ -267,7 +267,7 @@ static inline void append_bits(unsigned value, int bits,
     }
 }
 
-// Insert enough bits in the form of empty deflate blocks in front of the the
+// Insert enough bits in the form of empty deflate blocks in front of the
 // low bits bits of value, in order to bring the sequence to a byte boundary.
 // Then feed that to inflate(). This does what inflatePrime() does, except that
 // a negative value of bits is not supported. bits must be in 0..16. If the
diff --git a/old/visual-basic.txt b/old/visual-basic.txt
index 57efe5812..3c8d2a42d 100644
--- a/old/visual-basic.txt
+++ b/old/visual-basic.txt
@@ -115,7 +115,7 @@ SUCCESS Then
         ReDim Preserve bytaryCpr(lngCprSiz - 1)
         Open strCprPth For Binary Access Write As #1
             Put #1, , bytaryCpr()
-            Put #1, , lngOriSiz 'Add the the original size value to the end
+            Put #1, , lngOriSiz 'Add the original size value to the end
 (last 4 bytes)
         Close #1
     Else

From 44dc43ab047d65febed972a17b0e3bf7e994e8f2 Mon Sep 17 00:00:00 2001
From: tbeu <tc@tbeu.de>
Date: Sun, 19 Nov 2023 21:39:14 +0100
Subject: [PATCH 16/33] Add a CMake option to link the C runtime statically.

---
 CMakeLists.txt | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae0f8ea29..157097e02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,16 @@
 cmake_minimum_required(VERSION 2.4.4...3.15.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
+if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW)
+endif()
+
 project(zlib C)
 
 set(VERSION "1.3.0.1")
 
+option(ZLIB_STATIC_LINK_CRT "Link the MSVC runtime library statically" OFF)
+
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -76,12 +82,24 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
 endif()
 
 set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-		${ZLIB_PC} @ONLY)
-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+        ${ZLIB_PC} @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+       ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 
+if(POLICY CMP0091)
+    # CMake >= 3.15 has CMAKE_MSVC_RUNTIME_LIBRARY to set the MSVCC runtime library
+    if(WIN32 AND CMAKE_GENERATOR MATCHES "Visual Studio .*|NMake .*")
+        if(ZLIB_STATIC_LINK_CRT)
+            message(STATUS "Configuring to link the MSVC runtime library statically")
+            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+        else()
+            message(STATUS "Configuring to link the MSVC runtime library dynamically")
+            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+        endif()
+    endif()
+endif()
 
 #============================================================================
 # zlib

From 14a5f8f266c16c87ab6c086fc52b770b27701e01 Mon Sep 17 00:00:00 2001
From: Matt Wilson <msw@amazon.com>
Date: Wed, 17 Jan 2024 14:46:18 -0800
Subject: [PATCH 17/33] Neutralize zip file traversal attacks in miniunz.

Archive formats such as .zip files are generally susceptible to
so-called "traversal attacks". This allows an attacker to craft
an archive that writes to unexpected locations of the file system
(e.g., /etc/shadow) if an unspecting root user were to unpack a
malicious archive.

This patch neutralizes absolute paths such as /tmp/moo and deeply
relative paths such as dummy/../../../../../../../../../../tmp/moo

The Debian project requested CVE-2014-9485 be allocated for the
first identified weakness. The fix was incomplete, resulting in a
revised patch applied here. Since there wasn't an updated version
released by Debian with the incomplete fix, I suggest we use this
CVE to identify both issues.

Link: https://security.snyk.io/research/zip-slip-vulnerability
Link: https://bugs.debian.org/774321
Link: https://bugs.debian.org/776831
Link: https://nvd.nist.gov/vuln/detail/CVE-2014-9485
Reported-by: Jakub Wilk <jwilk@debian.org>
Fixed-by: Michael Gilbert <mgilbert@debian.org>
---
 contrib/minizip/miniunz.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 0c2fb0d82..d627c4226 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -356,6 +356,20 @@ static int do_extract_currentfile(unzFile uf, const int* popt_extract_without_pa
         else
             write_filename = filename_withoutpath;
 
+        if (write_filename[0]!='\0')
+        {
+            const char* relative_check = write_filename;
+            while (relative_check[1]!='\0')
+            {
+                if (relative_check[0]=='.' && relative_check[1]=='.')
+                    write_filename = relative_check;
+                relative_check++;
+            }
+        }
+
+        while (write_filename[0]=='/' || write_filename[0]=='.')
+            write_filename++;
+
         err = unzOpenCurrentFilePassword(uf,password);
         if (err!=UNZ_OK)
         {

From 6201f893846bfd22faf060e84a3bb7bfc0e61761 Mon Sep 17 00:00:00 2001
From: Peter Taylor <emersont1@outlook.com>
Date: Fri, 10 Feb 2017 18:37:09 +0000
Subject: [PATCH 18/33] Add cmake option to control the build of the example
 executables.

---
 CMakeLists.txt | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 157097e02..61188e42b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ project(zlib C)
 
 set(VERSION "1.3.0.1")
 
+option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
 option(ZLIB_STATIC_LINK_CRT "Link the MSVC runtime library statically" OFF)
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
@@ -211,21 +212,22 @@ endif()
 #============================================================================
 # Example binaries
 #============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+if(ZLIB_BUILD_EXAMPLES)
+    add_executable(example test/example.c)
+    target_link_libraries(example zlib)
+    add_test(example example)
+
+    add_executable(minigzip test/minigzip.c)
+    target_link_libraries(minigzip zlib)
+
+    if(HAVE_OFF64_T)
+        add_executable(example64 test/example.c)
+        target_link_libraries(example64 zlib)
+        set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+        add_test(example64 example64)
+
+        add_executable(minigzip64 test/minigzip.c)
+        target_link_libraries(minigzip64 zlib)
+        set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    endif()
 endif()

From 01253ecd7e0a01d311670f2d03c61b82fc12d338 Mon Sep 17 00:00:00 2001
From: Milan Bulat <milan@peer.inc>
Date: Mon, 9 Oct 2023 17:04:51 +0400
Subject: [PATCH 19/33] Make the existence of gz_intmax() unconditional.

gz_intmax() is noted in zlib.map. This assures it's always there.
---
 gzguts.h |  6 +-----
 gzlib.c  | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gzguts.h b/gzguts.h
index f9375047e..adc2b34fe 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -210,9 +210,5 @@ char ZLIB_INTERNAL *gz_strwinerror(DWORD error);
 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
    value -- needed when comparing unsigned to z_off64_t, which is signed
    (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
 unsigned ZLIB_INTERNAL gz_intmax(void);
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif
+#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
diff --git a/gzlib.c b/gzlib.c
index 29fc4486f..9c103dbd1 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -563,20 +563,20 @@ void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char *msg) {
 #endif
 }
 
-#ifndef INT_MAX
 /* portably return maximum value for an int (when limits.h presumed not
    available) -- we need to do this to cover cases where 2's complement not
    used, since C standard permits 1's complement and sign-bit representations,
    otherwise we could just use ((unsigned)-1) >> 1 */
 unsigned ZLIB_INTERNAL gz_intmax(void) {
-    unsigned p, q;
-
-    p = 1;
+#ifdef INT_MAX
+    return INT_MAX;
+#else
+    unsigned p = 1, q;
     do {
         q = p;
         p <<= 1;
         p++;
     } while (p > q);
     return q >> 1;
-}
 #endif
+}

From fe41d1892117fa81bd49f69b1c87d805635b853c Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:56:45 +0200
Subject: [PATCH 20/33] Correct typos in source code.

---
 contrib/minizip/unzip.c | 2 +-
 contrib/puff/puff.c     | 8 ++++----
 test/minigzip.c         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index d3c0cead7..ea05b7d62 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -497,7 +497,7 @@ local unzFile unzOpenInternal(const void *path,
     ZPOS64_T central_pos;
     uLong   uL;
 
-    uLong number_disk;          /* number of the current dist, used for
+    uLong number_disk;          /* number of the current disk, used for
                                    spanning ZIP, unsupported, always 0*/
     uLong number_disk_with_CD;  /* number the disk with central dir, used
                                    for spanning ZIP, unsupported, always 0*/
diff --git a/contrib/puff/puff.c b/contrib/puff/puff.c
index 6737ff615..d759825ab 100644
--- a/contrib/puff/puff.c
+++ b/contrib/puff/puff.c
@@ -593,10 +593,10 @@ local int fixed(struct state *s)
  *   provided for each of the literal/length symbols, and for each of the
  *   distance symbols.
  *
- * - If a symbol is not used in the block, this is represented by a zero as
- *   as the code length.  This does not mean a zero-length code, but rather
- *   that no code should be created for this symbol.  There is no way in the
- *   deflate format to represent a zero-length code.
+ * - If a symbol is not used in the block, this is represented by a zero as the
+ *   code length.  This does not mean a zero-length code, but rather that no
+ *   code should be created for this symbol.  There is no way in the deflate
+ *   format to represent a zero-length code.
  *
  * - The maximum number of bits in a code is 15, so the possible lengths for
  *   any code are 1..15.
diff --git a/test/minigzip.c b/test/minigzip.c
index c72356dbc..134e10e6c 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -303,7 +303,7 @@ static void error(const char *msg) {
 #ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
 
 /* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
+ * success, Z_ERRNO otherwise.
  */
 static int gz_compress_mmap(FILE *in, gzFile out) {
     int len;

From 25263462377fa5c569947a40315815bd59e37f4b Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Wed, 17 Jan 2024 17:19:03 -0800
Subject: [PATCH 21/33] Remove mentions of an official zlib DLL distribution.

There used to be one, but no more. It is up to the user or vendor
to compile zlib.
---
 FAQ               |  3 +--
 win32/DLL_FAQ.txt | 20 ++------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/FAQ b/FAQ
index 55f1cdc22..92f5d3e29 100644
--- a/FAQ
+++ b/FAQ
@@ -14,8 +14,7 @@ The latest zlib FAQ is at http://zlib.net/zlib_faq.html
  2. Where can I get a Windows DLL version?
 
     The zlib sources can be compiled without change to produce a DLL.  See the
-    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
-    precompiled DLL are found in the zlib web site at http://zlib.net/ .
+    file win32/DLL_FAQ.txt in the zlib distribution.
 
  3. Where can I get a Visual Basic interface to zlib?
 
diff --git a/win32/DLL_FAQ.txt b/win32/DLL_FAQ.txt
index 12c009018..d8cf5f31e 100644
--- a/win32/DLL_FAQ.txt
+++ b/win32/DLL_FAQ.txt
@@ -3,7 +3,7 @@
 
 
 This document describes the design, the rationale, and the usage
-of the official DLL build of zlib, named ZLIB1.DLL.  If you have
+of the common DLL build of zlib, named ZLIB1.DLL.  If you have
 general questions about zlib, you should see the file "FAQ" found
 in the zlib distribution, or at the following location:
   http://www.gzip.org/zlib/zlib_faq.html
@@ -11,13 +11,9 @@ in the zlib distribution, or at the following location:
 
  1. What is ZLIB1.DLL, and how can I get it?
 
-  - ZLIB1.DLL is the official build of zlib as a DLL.
+  - ZLIB1.DLL is the common build of zlib as a DLL.
     (Please remark the character '1' in the name.)
 
-    Pointers to a precompiled ZLIB1.DLL can be found in the zlib
-    web site at:
-      http://www.zlib.net/
-
     Applications that link to ZLIB1.DLL can rely on the following
     specification:
 
@@ -379,18 +375,6 @@ in the zlib distribution, or at the following location:
     code.  But you can make your own private DLL build, under a
     different file name, as suggested in the previous answer.
 
-
-17. I made my own ZLIB1.DLL build.  Can I test it for compliance?
-
-  - We prefer that you download the official DLL from the zlib
-    web site.  If you need something peculiar from this DLL, you
-    can send your suggestion to the zlib mailing list.
-
-    However, in case you do rebuild the DLL yourself, you can run
-    it with the test programs found in the DLL distribution.
-    Running these test programs is not a guarantee of compliance,
-    but a failure can imply a detected problem.
-
 **
 
 This document is written and maintained by

From ade6825c4996f73d776b0ffa038360762bd318ae Mon Sep 17 00:00:00 2001
From: gastush <gastush@gmail.com>
Date: Fri, 30 Sep 2022 16:04:19 +0200
Subject: [PATCH 22/33] Fix cmake build on AIX.

The --version-script linker option is not supported by the linker on AIX systems
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61188e42b..6ae4d6f14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ endif()
 if(UNIX)
     # On unix-like platforms the library is almost always called libz
    set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
+   if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
    endif()
 elseif(BUILD_SHARED_LIBS AND WIN32)

From 3f635df97edbb85f55f8e991e5f00d94f4132a14 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Wed, 17 Jan 2024 18:20:32 -0800
Subject: [PATCH 23/33] Remove unused Z_ARG macro.

---
 zconf.h         | 8 --------
 zconf.h.cmakein | 8 --------
 zconf.h.in      | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/zconf.h b/zconf.h
index fb76ffe31..9baa9527f 100644
--- a/zconf.h
+++ b/zconf.h
@@ -300,14 +300,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 310c43928..51558cef9 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -302,14 +302,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
diff --git a/zconf.h.in b/zconf.h.in
index fb76ffe31..9baa9527f 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -300,14 +300,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have

From 7b632b486a591aa28d3d98d0ed8aa2235ee34643 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Fri, 19 Jan 2024 10:09:32 -0800
Subject: [PATCH 24/33] Revert "Add a CMake option to link the C runtime
 statically."

This reverts commit 44dc43ab047d65febed972a17b0e3bf7e994e8f2.
---
 CMakeLists.txt | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ae4d6f14..6fab3dcb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,11 @@
 cmake_minimum_required(VERSION 2.4.4...3.15.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-if(POLICY CMP0091)
-    cmake_policy(SET CMP0091 NEW)
-endif()
-
 project(zlib C)
 
 set(VERSION "1.3.0.1")
 
 option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
-option(ZLIB_STATIC_LINK_CRT "Link the MSVC runtime library statically" OFF)
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@@ -83,24 +78,12 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
 endif()
 
 set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-        ${ZLIB_PC} @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-       ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 
-if(POLICY CMP0091)
-    # CMake >= 3.15 has CMAKE_MSVC_RUNTIME_LIBRARY to set the MSVCC runtime library
-    if(WIN32 AND CMAKE_GENERATOR MATCHES "Visual Studio .*|NMake .*")
-        if(ZLIB_STATIC_LINK_CRT)
-            message(STATUS "Configuring to link the MSVC runtime library statically")
-            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        else()
-            message(STATUS "Configuring to link the MSVC runtime library dynamically")
-            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-        endif()
-    endif()
-endif()
 
 #============================================================================
 # zlib

From 7af6320ad78b390de42f414fabdc64dc6d67a5ea Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Fri, 19 Jan 2024 12:19:53 -0800
Subject: [PATCH 25/33] Fix a bug in ZLIB_DEBUG compiles in check_match().

This avoids trying to compare a match starting one byte before the
current window. Thanks to @zmodem (Hans) for discovering this.
---
 deflate.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/deflate.c b/deflate.c
index 61e34fe80..d73a73eef 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1556,13 +1556,21 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
  */
 local void check_match(deflate_state *s, IPos start, IPos match, int length) {
     /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
+    Bytef *back = s->window + (int)match, *here = s->window + start;
+    IPos len = length;
+    if (match == (IPos)-1) {
+        /* match starts one byte before the current window -- just compare the
+           subsequent length-1 bytes */
+        back++;
+        here++;
+        len--;
+    }
+    if (zmemcmp(back, here, len) != EQUAL) {
+        fprintf(stderr, " start %u, match %d, length %d\n",
+                start, (int)match, length);
         do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
+            fprintf(stderr, "(%02x %02x)", *back++, *here++);
+        } while (--len != 0);
         z_error("invalid match");
     }
     if (z_verbose > 1) {

From 84f0bafd7cd76ef3787b8612ea79ba77c489d7bd Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Fri, 19 Jan 2024 15:26:17 -0800
Subject: [PATCH 26/33] Remove carriage returns from zlib.map.

---
 zlib.map | 200 +++++++++++++++++++++++++++----------------------------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/zlib.map b/zlib.map
index b330b606f..31544f2e9 100644
--- a/zlib.map
+++ b/zlib.map
@@ -1,100 +1,100 @@
-ZLIB_1.2.0 {
-  global:
-    compressBound;
-    deflateBound;
-    inflateBack;
-    inflateBackEnd;
-    inflateBackInit_;
-    inflateCopy;
-  local:
-    deflate_copyright;
-    inflate_copyright;
-    inflate_fast;
-    inflate_table;
-    zcalloc;
-    zcfree;
-    z_errmsg;
-    gz_error;
-    gz_intmax;
-    _*;
-};
-
-ZLIB_1.2.0.2 {
-    gzclearerr;
-    gzungetc;
-    zlibCompileFlags;
-} ZLIB_1.2.0;
-
-ZLIB_1.2.0.8 {
-    deflatePrime;
-} ZLIB_1.2.0.2;
-
-ZLIB_1.2.2 {
-    adler32_combine;
-    crc32_combine;
-    deflateSetHeader;
-    inflateGetHeader;
-} ZLIB_1.2.0.8;
-
-ZLIB_1.2.2.3 {
-    deflateTune;
-    gzdirect;
-} ZLIB_1.2.2;
-
-ZLIB_1.2.2.4 {
-    inflatePrime;
-} ZLIB_1.2.2.3;
-
-ZLIB_1.2.3.3 {
-    adler32_combine64;
-    crc32_combine64;
-    gzopen64;
-    gzseek64;
-    gztell64;
-    inflateUndermine;
-} ZLIB_1.2.2.4;
-
-ZLIB_1.2.3.4 {
-    inflateReset2;
-    inflateMark;
-} ZLIB_1.2.3.3;
-
-ZLIB_1.2.3.5 {
-    gzbuffer;
-    gzoffset;
-    gzoffset64;
-    gzclose_r;
-    gzclose_w;
-} ZLIB_1.2.3.4;
-
-ZLIB_1.2.5.1 {
-    deflatePending;
-} ZLIB_1.2.3.5;
-
-ZLIB_1.2.5.2 {
-    deflateResetKeep;
-    gzgetc_;
-    inflateResetKeep;
-} ZLIB_1.2.5.1;
-
-ZLIB_1.2.7.1 {
-    inflateGetDictionary;
-    gzvprintf;
-} ZLIB_1.2.5.2;
-
-ZLIB_1.2.9 {
-    inflateCodesUsed;
-    inflateValidate;
-    uncompress2;
-    gzfread;
-    gzfwrite;
-    deflateGetDictionary;
-    adler32_z;
-    crc32_z;
-} ZLIB_1.2.7.1;
-
-ZLIB_1.2.12 {
-	crc32_combine_gen;
-	crc32_combine_gen64;
-	crc32_combine_op;
-} ZLIB_1.2.9;
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;
+
+ZLIB_1.2.7.1 {
+    inflateGetDictionary;
+    gzvprintf;
+} ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+    inflateCodesUsed;
+    inflateValidate;
+    uncompress2;
+    gzfread;
+    gzfwrite;
+    deflateGetDictionary;
+    adler32_z;
+    crc32_z;
+} ZLIB_1.2.7.1;
+
+ZLIB_1.2.12 {
+	crc32_combine_gen;
+	crc32_combine_gen64;
+	crc32_combine_op;
+} ZLIB_1.2.9;

From 9404df5a1f35866d441e8033b34186ca42962ea9 Mon Sep 17 00:00:00 2001
From: Dan Kegel <dank@kegel.com>
Date: Fri, 22 May 2020 14:35:01 -0700
Subject: [PATCH 27/33] Use updated zconf.h when building out of directory with
 configure.

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 7aaf5dfa3..0b86d04e0 100755
--- a/configure
+++ b/configure
@@ -25,7 +25,7 @@ if test $SRCDIR = "."; then
     ZINCOUT="-I."
     SRCDIR=""
 else
-    ZINC='-include zconf.h'
+    ZINC='-I. -include zconf.h'
     ZINCOUT='-I. -I$(SRCDIR)'
     SRCDIR="$SRCDIR/"
 fi

From 88ec24670e9c484219392def5f2f4b5e3f839db3 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sat, 20 Jan 2024 18:29:31 -0800
Subject: [PATCH 28/33] Remove -w compile option in configure test.

Not all C compilers have a -w option.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 0b86d04e0..c55098afc 100755
--- a/configure
+++ b/configure
@@ -442,7 +442,7 @@ EOF
 if test $shared -eq 1; then
   echo Checking for shared library support... | tee -a configure.log
   # we must test in two steps (cc then ld), required at least on SunOS 4.x
-  if try $CC -w -c $SFLAGS $test.c &&
+  if try $CC -c $SFLAGS $test.c &&
      try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
     echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
   elif test -z "$old_cc" -a -z "$old_cflags"; then

From c06dfecb8a0c996dce87148b9086f0fe79734f32 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 21 Jan 2024 09:24:10 -0800
Subject: [PATCH 29/33] Use Makefile compiler for minizip-test target.

---
 Makefile.in              | 2 +-
 contrib/minizip/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b584073b6..acda3b148 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -360,7 +360,7 @@ zconf: $(SRCDIR)zconf.h.in
 	cp -p $(SRCDIR)zconf.h.in zconf.h
 
 minizip-test: static
-	cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
+	cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
 
 minizip-clean:
 	cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile
index aac76e07f..3d927ec14 100644
--- a/contrib/minizip/Makefile
+++ b/contrib/minizip/Makefile
@@ -1,4 +1,4 @@
-CC=cc
+CC?=cc
 CFLAGS := $(CFLAGS) -O -I../..
 
 UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a

From 2e3d86c4e12c4c23db4229eea7d0c1cd4571273e Mon Sep 17 00:00:00 2001
From: tr1cks <tr1cks>
Date: Mon, 26 Mar 2018 18:19:39 +0500
Subject: [PATCH 30/33] Add target include directories to CMakeLists.txt.

This enables the addition of zlib to other projects.
---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fab3dcb1..c053a959b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,9 @@ if(MINGW)
 endif(MINGW)
 
 add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 

From 1a8db63788c34a50e39e273d39b7e1033208aea2 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 22 Jan 2024 05:54:21 -0800
Subject: [PATCH 31/33] Move the load flags before the object files in Makefile
 tests.

---
 Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index acda3b148..7200c96d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ CFLAGS=-O
 
 SFLAGS=-O
 LDFLAGS=
-TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
+TEST_LIBS=-L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E
 
@@ -282,10 +282,10 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
 	-@rmdir objs
 
 example$(EXE): example.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(TEST_LIBS)
 
 minigzip$(EXE): minigzip.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip.o $(TEST_LIBS)
 
 examplesh$(EXE): example.o $(SHAREDLIBV)
 	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
@@ -294,10 +294,10 @@ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
 
 example64$(EXE): example64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example64.o $(TEST_LIBS)
 
 minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip64.o $(TEST_LIBS)
 
 install-libs: $(LIBS)
 	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi

From 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 22 Jan 2024 10:14:31 -0800
Subject: [PATCH 32/33] zlib 1.3.1

---
 CMakeLists.txt                       |   2 +-
 ChangeLog                            |  11 +++++++++--
 Makefile.in                          |   4 ++--
 README                               |   6 +++---
 contrib/delphi/ZLib.pas              |   2 +-
 contrib/dotzlib/DotZLib/UnitTests.cs |   2 +-
 contrib/infback9/inftree9.c          |   6 +++---
 contrib/minizip/configure.ac         |   2 +-
 contrib/nuget/nuget.csproj           |   4 ++--
 contrib/pascal/zlibpas.pas           |   2 +-
 contrib/vstudio/readme.txt           |   2 +-
 contrib/vstudio/vc10/zlib.rc         |   8 ++++----
 contrib/vstudio/vc10/zlibvc.def      |   2 +-
 contrib/vstudio/vc11/zlib.rc         |   8 ++++----
 contrib/vstudio/vc11/zlibvc.def      |   2 +-
 contrib/vstudio/vc12/zlib.rc         |   8 ++++----
 contrib/vstudio/vc12/zlibvc.def      |   2 +-
 contrib/vstudio/vc14/zlib.rc         |   8 ++++----
 contrib/vstudio/vc14/zlibvc.def      |   2 +-
 contrib/vstudio/vc17/zlib.rc         |   8 ++++----
 contrib/vstudio/vc17/zlibvc.def      |   2 +-
 contrib/vstudio/vc9/zlib.rc          |   8 ++++----
 contrib/vstudio/vc9/zlibvc.def       |   2 +-
 deflate.c                            |   4 ++--
 deflate.h                            |   2 +-
 gzguts.h                             |   2 +-
 gzlib.c                              |   2 +-
 inftrees.c                           |   6 +++---
 os400/README400                      |   2 +-
 os400/zlib.inc                       |   8 ++++----
 qnx/package.qpg                      |  10 +++++-----
 treebuild.xml                        |   4 ++--
 trees.c                              |   2 +-
 win32/README-WIN32.txt               |   4 ++--
 zconf.h                              |   2 +-
 zconf.h.cmakein                      |   2 +-
 zconf.h.in                           |   2 +-
 zlib.3                               |   6 +++---
 zlib.3.pdf                           | Bin 19505 -> 25523 bytes
 zlib.h                               |  12 ++++++------
 zutil.h                              |   2 +-
 41 files changed, 91 insertions(+), 84 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c053a959b..15ceebe78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.3.0.1")
+set(VERSION "1.3.1")
 
 option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
 
diff --git a/ChangeLog b/ChangeLog
index dfd652469..b801a1031 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 
                 ChangeLog file for zlib
 
-Changes in 1.3.0.1 (xx Aug 2023)
-- 
+Changes in 1.3.1 (22 Jan 2024)
+- Reject overflows of zip header fields in minizip
+- Fix bug in inflateSync() for data held in bit buffer
+- Add LIT_MEM define to use more memory for a small deflate speedup
+- Fix decision on the emission of Zip64 end records in minizip
+- Add bounds checking to ERR_MSG() macro, used by zError()
+- Neutralize zip file traversal attacks in miniunz
+- Fix a bug in ZLIB_DEBUG compiles in check_match()
+- Various portability and appearance improvements
 
 Changes in 1.3 (18 Aug 2023)
 - Remove K&R function definitions and zlib2ansi
diff --git a/Makefile.in b/Makefile.in
index 7200c96d1..cb8b00a9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
 # For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile and test, type:
@@ -28,7 +28,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.3.0.1
+SHAREDLIBV=libz.so.1.3.1
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
diff --git a/README b/README
index 20f7064a5..c5f917540 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.3.0.1 is a general purpose data compression library.  All the code is
+zlib 1.3.1 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 @@ 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
 https://marknelson.us/posts/1997/01/01/zlib-engine.html .
 
-The changes made in version 1.3.0.1 are documented in the file ChangeLog.
+The changes made in version 1.3.1 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -83,7 +83,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2023 Jean-loup Gailly and Mark Adler
+ (C) 1995-2024 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 --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 814ffa670..93fa4c9ed 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.3.0';
+  zlib_version = '1.3.1';
 
 type
   EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index c5fce221a..d4f098023 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ public class InfoTests
         public void Info_Version()
         {
             Info info = new Info();
-            Assert.AreEqual("1.3.0", Info.Version);
+            Assert.AreEqual("1.3.1", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);
             Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 23f305010..ac707ed3f 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2023 Mark Adler
+ * Copyright (C) 1995-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.3.0.1 Copyright 1995-2023 Mark Adler ";
+   " inflate9 1.3.1 Copyright 1995-2024 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes,
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 70, 200};
+        133, 133, 133, 133, 144, 203, 77};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         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 cdfee49cd..15ec91718 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.3.0.1], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.3.1], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj
index b72cbb67b..68627f034 100644
--- a/contrib/nuget/nuget.csproj
+++ b/contrib/nuget/nuget.csproj
@@ -6,8 +6,8 @@
     <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId>
     <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId>
     <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId>
-    <Copyright>(C) 1995-2023 Jean-loup Gailly and Mark Adler</Copyright>
-    <version>1.3.0.1</version>
+    <Copyright>(C) 1995-2024 Jean-loup Gailly and Mark Adler</Copyright>
+    <version>1.3.1</version>
     <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription>
     <!--
         Warns about not having any lib or ref assemblies (.NET Assemblies) in those directories.
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 1b79ca00a..0cf0e7b82 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@
 interface
 
 const
-  ZLIB_VERSION = '1.3.0.1';
+  ZLIB_VERSION = '1.3.1';
   ZLIB_VERNUM  = $12a0;
 
 type
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index a5000ae7b..061bbc0e2 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.3.0.1
+Building instructions for the DLL versions of Zlib 1.3.1
 ========================================================
 
 This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 75b928396..856bd11f0 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index f28aa6c73..3234a02d9 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index 75b928396..856bd11f0 100644
--- a/contrib/vstudio/vc11/zlib.rc
+++ b/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def
index f28aa6c73..3234a02d9 100644
--- a/contrib/vstudio/vc11/zlibvc.def
+++ b/contrib/vstudio/vc11/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index e54fac43c..a55f341c7 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index f28aa6c73..3234a02d9 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index e54fac43c..a55f341c7 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def
index f28aa6c73..3234a02d9 100644
--- a/contrib/vstudio/vc14/zlibvc.def
+++ b/contrib/vstudio/vc14/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/contrib/vstudio/vc17/zlib.rc b/contrib/vstudio/vc17/zlib.rc
index e54fac43c..a55f341c7 100644
--- a/contrib/vstudio/vc17/zlib.rc
+++ b/contrib/vstudio/vc17/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc17/zlibvc.def b/contrib/vstudio/vc17/zlibvc.def
index c34923505..53947cc31 100644
--- a/contrib/vstudio/vc17/zlibvc.def
+++ b/contrib/vstudio/vc17/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 75b928396..856bd11f0 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 3, 0, 1
-  PRODUCTVERSION 1, 3, 0, 1
+  FILEVERSION	 1, 3, 1, 0
+  PRODUCTVERSION 1, 3, 1, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.3.0.1\0"
+      VALUE "FileVersion",	"1.3.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index f28aa6c73..3234a02d9 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY
 ; zlib data compression and ZIP file I/O library
 
-VERSION		1.3
+VERSION		1.3.1
 
 EXPORTS
         adler32                                  @1
diff --git a/deflate.c b/deflate.c
index d73a73eef..012ea8148 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.3.0.1 Copyright 1995-2023 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/deflate.h b/deflate.h
index 854b156ba..300c6ada6 100644
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2018 Jean-loup Gailly
+ * Copyright (C) 1995-2024 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/gzguts.h b/gzguts.h
index adc2b34fe..eba72085b 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004-2019 Mark Adler
+ * Copyright (C) 2004-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/gzlib.c b/gzlib.c
index 9c103dbd1..983153cc8 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -1,5 +1,5 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2019 Mark Adler
+ * Copyright (C) 2004-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/inftrees.c b/inftrees.c
index 73d5a7769..98cfe1644 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2023 Mark Adler
+ * Copyright (C) 1995-2024 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.3.0.1 Copyright 1995-2023 Mark Adler ";
+   " inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -57,7 +57,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 70, 200};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 77};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 33492f273..30ed5a12c 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
-        ZLIB version 1.3.0.1 for OS/400 installation instructions
+        ZLIB version 1.3.1 for OS/400 installation instructions
 
 1) Download and unpack the zlib tarball to some IFS directory.
    (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/zlib.inc b/os400/zlib.inc
index 88b243a4d..744729ab9 100644
--- a/os400/zlib.inc
+++ b/os400/zlib.inc
@@ -1,7 +1,7 @@
       *  ZLIB.INC - Interface to the general purpose compression library
       *
       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.3.0.1
+      *  Version 1.3.1
       *
       *
       *  WARNING:
@@ -22,14 +22,14 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.3.0.1'
+     D ZLIB_VERSION    C                   '1.3.1'
      D ZLIB_VERNUM     C                   X'12a0'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   3
      D ZLIB_VER_REVISION...
-     D                 C                   0
-     D ZLIB_VER_SUBREVISION...
      D                 C                   1
+     D ZLIB_VER_SUBREVISION...
+     D                 C                   0
       *
       *  Other equates.
       *
diff --git a/qnx/package.qpg b/qnx/package.qpg
index 88343ad2a..4877e0ef0 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
       <QPG:Files>
          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.3.0.1" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.0.1"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.0.1"/>
-         <QPG:Add file="../libz.so.1.3.0.1" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.1"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.1"/>
+         <QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.3.0.1</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.3.1</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/treebuild.xml b/treebuild.xml
index 8bac3f73b..930b00be4 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.3.0.1">
-    <library name="zlib" dlversion="1.3.0.1" dlname="z">
+<package name="zlib" version="1.3.1">
+    <library name="zlib" dlversion="1.3.1" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
 
diff --git a/trees.c b/trees.c
index e816d32bb..6a523ef34 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2021 Jean-loup Gailly
+ * Copyright (C) 1995-2024 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 600fa3f52..14e6398ef 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.3.0.1 is a general purpose data compression library.  All the code is
+zlib 1.3.1 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://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ asking for help.
 
 Manifest:
 
-The package zlib-1.3.0.1-win32-x86.zip will contain the following files:
+The package zlib-1.3.1-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/zconf.h b/zconf.h
index 9baa9527f..62adc8d84 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 51558cef9..0abe3bc9d 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/zconf.h.in b/zconf.h.in
index 9baa9527f..62adc8d84 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
diff --git a/zlib.3 b/zlib.3
index ca30d078a..c716020ea 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "xx Aug 2023"
+.TH ZLIB 3 "22 Jan 2024"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -105,9 +105,9 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS AND LICENSE
-Version 1.3.0.1
+Version 1.3.1
 .LP
-Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
 .LP
 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 --git a/zlib.3.pdf b/zlib.3.pdf
index da12d37183a7371513c0991fd14a7d932fd42e84..b224532bdd8eed1939b7dd04a7a0dd46be649c00 100644
GIT binary patch
literal 25523
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
KifR~YGW{RRVaGTC

delta 16095
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
NKqOjPDHUm?{{wQa@vZ;>

diff --git a/zlib.h b/zlib.h
index 39991a418..8d4b932ea 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.3.0.1, August xxth, 2023
+  version 1.3.1, January 22nd, 2024
 
-  Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2024 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
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.3.0.1-motley"
-#define ZLIB_VERNUM 0x1301
+#define ZLIB_VERSION "1.3.1"
+#define ZLIB_VERNUM 0x1310
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 3
-#define ZLIB_VER_REVISION 0
-#define ZLIB_VER_SUBREVISION 1
+#define ZLIB_VER_REVISION 1
+#define ZLIB_VER_SUBREVISION 0
 
 /*
     The 'zlib' compression library provides in-memory compression and
diff --git a/zutil.h b/zutil.h
index bb513cb4b..48dd7feba 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

From a5416e7db33f9d34c8040dbf28d62a693fa0a35c Mon Sep 17 00:00:00 2001
From: Antonio Prcela <antonio.prcela@sartura.hr>
Date: Thu, 5 Sep 2024 15:24:00 +0200
Subject: [PATCH 33/33] add zig build files

---
 build.zig     | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
 build.zig.zon | 17 ++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 build.zig
 create mode 100644 build.zig.zon

diff --git a/build.zig b/build.zig
new file mode 100644
index 000000000..b07483b10
--- /dev/null
+++ b/build.zig
@@ -0,0 +1,63 @@
+const builtin = @import("builtin");
+const std = @import("std");
+const Path = std.Build.LazyPath;
+
+pub fn build(b: *std.Build) void {
+    const optimize = b.standardOptimizeOption(.{});
+    const target = b.standardTargetOptions(.{});
+
+    var lib = b.addStaticLibrary(.{
+        .name = "zlib",
+        .target = target,
+        .optimize = optimize,
+    });
+
+    var source_files = std.ArrayList([]const u8).init(b.allocator);
+    defer source_files.deinit();
+    var flags = std.ArrayList([]const u8).init(b.allocator);
+    defer flags.deinit();
+
+    // const config_header = b.addConfigHeader(
+    //     .{
+    //         .style = .{ .cmake = b.path("zconf.h.cmakein") }
+    //     },
+    //     .{
+    //         .GLOBAL_CLIENT_CONFIG = "KLLtestzlibclientconfig",
+    //     },
+    // );
+    // lib.addConfigHeader(config_header);
+
+    flags.appendSlice(&.{
+        "-Wall",
+        "-Wextra",
+        "-Wpedantic",
+    }) catch unreachable;
+
+    source_files.appendSlice(&.{
+        "adler32.c",
+        "compress.c",
+        "crc32.c",
+        "deflate.c",
+        "gzclose.c",
+        "gzlib.c",
+        "gzread.c",
+        "gzwrite.c",
+        "infback.c",
+        "inffast.c",
+        "inflate.c",
+        "inftrees.c",
+        "trees.c",
+        "uncompr.c",
+        "zutil.c",
+    }) catch unreachable;
+
+    lib.addCSourceFiles(.{
+        .files = source_files.items,
+        .flags = flags.items,
+    });
+
+    lib.linkLibC();
+    lib.installHeader(b.path("zlib.h"), "zlib.h");
+
+    b.installArtifact(lib);
+}
diff --git a/build.zig.zon b/build.zig.zon
new file mode 100644
index 000000000..e80b2141c
--- /dev/null
+++ b/build.zig.zon
@@ -0,0 +1,17 @@
+.{
+    .name = "zlib",
+    // This is a [Semantic Version](https://semver.org/).
+    // In a future version of Zig it will be used for package deduplication.
+    .version = "1.31.1",
+
+    // This field is optional.
+    // This is currently advisory only; Zig does not yet do anything
+    // with this value.
+    //.minimum_zig_version = "0.11.0",
+
+    .paths = .{
+        "LICENSE",
+        "README",
+        "build.zig",
+    },
+}