summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Moinvaziri <nathan@nathanm.com>2022-06-07 14:21:48 -0700
committerHans Kristian Rosbach <hk-github@circlestorm.org>2022-06-13 15:58:03 +0200
commitd43822b9a7491681c54bcf31e2f0e99a0293fe0c (patch)
treea6a017187de56c4dc4ba99f0fb4aa29b8f3d5f5a
parent201188691a990468ae1c6ebba4e12bd1a62166b0 (diff)
downloadProject-Tick-d43822b9a7491681c54bcf31e2f0e99a0293fe0c.tar.gz
Project-Tick-d43822b9a7491681c54bcf31e2f0e99a0293fe0c.zip
zlib 1.2.12
-rw-r--r--README.md2
-rw-r--r--crc32_braid.c2
-rw-r--r--crc32_braid_comb.c2
-rw-r--r--deflate.c4
-rw-r--r--gzguts.h2
-rw-r--r--gzlib.c2
-rw-r--r--gzread.c.in2
-rw-r--r--gzwrite.c2
-rw-r--r--infback.c2
-rw-r--r--inflate.c2
-rw-r--r--inflate.h2
-rw-r--r--inftrees.c4
-rw-r--r--inftrees.h2
-rw-r--r--tools/makecrct.c2
-rw-r--r--trees.c2
-rw-r--r--zlib.h.in10
-rw-r--r--zutil.h2
17 files changed, 23 insertions, 23 deletions
diff --git a/README.md b/README.md
index 0dd1b1c37e..1efe7f2f47 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ with zlib, then zlib-ng will temporarily be used instead by the program,
without risking system-wide instability.
```
-LD_PRELOAD=/opt/zlib-ng/libz.so.1.2.11.zlib-ng /usr/bin/program
+LD_PRELOAD=/opt/zlib-ng/libz.so.1.2.12.zlib-ng /usr/bin/program
```
### Cmake
diff --git a/crc32_braid.c b/crc32_braid.c
index fee7992bb5..f5b223eeab 100644
--- a/crc32_braid.c
+++ b/crc32_braid.c
@@ -1,5 +1,5 @@
/* crc32_braid.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*
* This interleaved implementation of a CRC makes use of pipelined multiple
diff --git a/crc32_braid_comb.c b/crc32_braid_comb.c
index e33fccfd6d..75fb474258 100644
--- a/crc32_braid_comb.c
+++ b/crc32_braid_comb.c
@@ -1,5 +1,5 @@
/* crc32_braid_comb.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*
* This interleaved implementation of a CRC makes use of pipelined multiple
diff --git a/deflate.c b/deflate.c
index 878033355c..986c5fddf6 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -59,7 +59,7 @@
# undef deflateInit2
#endif
-const char PREFIX(deflate_copyright)[] = " deflate 1.2.11.f Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
+const char PREFIX(deflate_copyright)[] = " deflate 1.2.12.f Copyright 1995-2022 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/gzguts.h b/gzguts.h
index 7db7099088..fe09270639 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,7 +1,7 @@
#ifndef GZGUTS_H_
#define GZGUTS_H_
/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/gzlib.c b/gzlib.c
index c19284035c..e1290fc611 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-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/gzread.c.in b/gzread.c.in
index f17a5f8880..c421f9f56f 100644
--- a/gzread.c.in
+++ b/gzread.c.in
@@ -1,5 +1,5 @@
/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/gzwrite.c b/gzwrite.c
index b3e93e8d08..ba716bc20b 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -1,5 +1,5 @@
/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2019 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/infback.c b/infback.c
index dd549a89fb..95798511f7 100644
--- a/infback.c
+++ b/infback.c
@@ -1,5 +1,5 @@
/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/inflate.c b/inflate.c
index 6192148233..5f52dd140a 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/inflate.h b/inflate.h
index 941e8b0a28..f9a7edd597 100644
--- a/inflate.h
+++ b/inflate.h
@@ -1,5 +1,5 @@
/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2019 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/inftrees.c b/inftrees.c
index eb82ff4427..369fd09dfe 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,7 +9,7 @@
#define MAXBITS 15
-const char PREFIX(inflate_copyright)[] = " inflate 1.2.11.f Copyright 1995-2016 Mark Adler ";
+const char PREFIX(inflate_copyright)[] = " inflate 1.2.12.f Copyright 1995-2022 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/inftrees.h b/inftrees.h
index 031c2a1b94..bb6274a128 100644
--- a/inftrees.h
+++ b/inftrees.h
@@ -2,7 +2,7 @@
#define INFTREES_H_
/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/tools/makecrct.c b/tools/makecrct.c
index bfc2b96551..8ed0cf5cfd 100644
--- a/tools/makecrct.c
+++ b/tools/makecrct.c
@@ -1,5 +1,5 @@
/* makecrct.c -- output crc32 tables
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016, 2018 Mark Adler
+ * Copyright (C) 1995-2022 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/trees.c b/trees.c
index 7bc70075b5..111ead01ff 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
+ * Copyright (C) 1995-2021 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/zlib.h.in b/zlib.h.in
index 9de5e91b16..7e77a5bb78 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -1,9 +1,9 @@
#ifndef ZLIB_H_
#define ZLIB_H_
/* zlib.h -- interface of the 'zlib-ng' compression library
- Forked from and compatible with zlib 1.2.11
+ Forked from and compatible with zlib 1.2.12
- Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -57,11 +57,11 @@ extern "C" {
#define ZLIBNG_VER_STATUS 0 /* 0=devel, 1-E=beta, F=Release */
#define ZLIBNG_VER_MODIFIED 0 /* non-zero if modified externally from zlib-ng */
-#define ZLIB_VERSION "1.2.11.zlib-ng"
-#define ZLIB_VERNUM 0x12bf
+#define ZLIB_VERSION "1.2.12.zlib-ng"
+#define ZLIB_VERNUM 0x12cf
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
+#define ZLIB_VER_REVISION 12
#define ZLIB_VER_SUBREVISION 0
/*
diff --git a/zutil.h b/zutil.h
index 53c7cdf148..25716c5711 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,7 +1,7 @@
#ifndef ZUTIL_H_
#define ZUTIL_H_
/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/