From ee68fc338f8a2175fc03bcf3095bc9f384698c29 Mon Sep 17 00:00:00 2001
From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 16 May 2023 13:40:27 +0200
Subject: [PATCH] 2.1.1-Beta2

Changes since 2.1.0-Beta1:
- Fix missing exported z_size_t type in zlib.h (zlib-compat mode).
- Fix two Coverity warnings
- Fix CMake GNUInstallDirs usage
- Configure/CMake improvements for compilers with early AVX512-VNNI support (GCC8.0 etc)
- Microptimalization for AVX512 implementation of CRC32
- Optimized deflate_rle compression, also added related test and benchmark.
- Add testing of file_compress/file_uncompress in minigzip/minideflate
- Add emulated RISC-V to CI test workflow
- Add deflate_fast to switchlevels test
- Fix abicheck CI test was not ignoring version string
- Fix MinGW CI test, broken by Github Actions VM image updates
---
 Makefile.in  | 2 +-
 zlib-ng.h.in | 8 ++++----
 zlib.h.in    | 8 ++++----
 zutil.c      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8ca8c81d..902613e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@ TEST_LIBS=$(LIBNAME1).a
 LDSHARED=$(CC)
 LDSHAREDFLAGS=-shared
 
-VER=2.1.0.beta1
+VER=2.1.1.beta2
 VER1=2
 
 STATICLIB=$(LIBNAME1).a
diff --git a/zlib-ng.h.in b/zlib-ng.h.in
index 36967182..3c2c60a5 100644
--- a/zlib-ng.h.in
+++ b/zlib-ng.h.in
@@ -48,12 +48,12 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.1.0.beta1"
-#define ZLIBNG_VERNUM 0x02010010L   /* MMNNRRSM: major minor revision status modified */
+#define ZLIBNG_VERSION "2.1.1.beta2"
+#define ZLIBNG_VERNUM 0x02010120L   /* MMNNRRSM: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
 #define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 0
-#define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
+#define ZLIBNG_VER_REVISION 1
+#define ZLIBNG_VER_STATUS 2         /* 0=devel, 1-E=beta, F=Release */
 #define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
 
 /*
diff --git a/zlib.h.in b/zlib.h.in
index 6da533c4..3fd25adf 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -49,12 +49,12 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.1.0.beta1"
-#define ZLIBNG_VERNUM 0x02010010L   /* MMNNRRSM: major minor revision status modified */
+#define ZLIBNG_VERSION "2.1.1.beta2"
+#define ZLIBNG_VERNUM 0x02010120L   /* MMNNRRSM: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
 #define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 0
-#define ZLIBNG_VER_STATUS 1         /* 0=devel, 1-E=beta, F=Release */
+#define ZLIBNG_VER_REVISION 1
+#define ZLIBNG_VER_STATUS 2         /* 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.13.zlib-ng"
diff --git a/zutil.c b/zutil.c
index 0fd14f4e..2d753b4a 100644
--- a/zutil.c
+++ b/zutil.c
@@ -21,7 +21,7 @@ z_const char * const PREFIX(z_errmsg)[10] = {
 };
 
 const char PREFIX3(vstring)[] =
-    " zlib-ng 2.1.0.beta1";
+    " zlib-ng 2.1.1.beta2";
 
 #ifdef ZLIB_COMPAT
 const char * Z_EXPORT zlibVersion(void) {
-- 
2.47.3