From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Mon, 11 Jan 2021 20:38:18 +0000 (+0100)
Subject: Version 2.0.0 Release Candidate 1
X-Git-Tag: v2.0.0-RC1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9734bd8752584e2d48ad10a8c9cb978e2e1fc3;p=thirdparty%2Fzlib-ng.git

Version 2.0.0 Release Candidate 1
---

diff --git a/Makefile.in b/Makefile.in
index 18d9baac..ad8794bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,8 +29,8 @@ TEST_LIBS=$(LIBNAME1).a
 LDSHARED=$(CC)
 LDSHAREDFLAGS=-shared
 
-VER=1.9.9
-VER1=1
+VER=2.0.0-RC1
+VER1=2
 
 STATICLIB=$(LIBNAME1).a
 SHAREDLIB=$(LIBNAME1).so
diff --git a/configure b/configure
index 945f6ba9..b8c7e933 100755
--- a/configure
+++ b/configure
@@ -366,10 +366,10 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
   case "$uname" in
   Linux* | linux* | GNU | GNU/* | solaris*)
         LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.1,--version-script,${SRCDIR}/${MAPNAME}" ;;
+        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.2,--version-script,${SRCDIR}/${MAPNAME}" ;;
   *BSD | *bsd* | DragonFly)
         LDSHARED=${LDSHARED-"$cc"}
-        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.1,--version-script,${SRCDIR}/${MAPNAME}"
+        LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.2,--version-script,${SRCDIR}/${MAPNAME}"
         LDCONFIG="ldconfig -m" ;;
   CYGWIN* | Cygwin* | cygwin*)
         ARFLAGS="rcs"
@@ -445,7 +445,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
   QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
          # (alain.bonnefoy@icbt.com)
                  LDSHARED=${LDSHARED-"$cc"}
-                 LDSHAREDFLAGS="-shared -Wl,-h${LIBNAME}.so.1" ;;
+                 LDSHAREDFLAGS="-shared -Wl,-h${LIBNAME}.so.2" ;;
   HP-UX*)
          LDSHARED=${LDSHARED-"$cc"}
          LDSHAREDFLAGS="-shared"
@@ -473,7 +473,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
              ARFLAGS="-o" ;;
   aarch64)
              LDSHARED=${LDSHARED-"$cc"}
-             LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.1 -Wl,--version-script,${SRCDIR}/${MAPNAME}"
+             LDSHAREDFLAGS="-shared -Wl,-soname,${LIBNAME}.so.2 -Wl,--version-script,${SRCDIR}/${MAPNAME}"
              LDSHAREDLIBC="-Wl,--start-group -lc -lrdimon -Wl,--end-group" ;;
   *)
              LDSHARED=${LDSHARED-"$cc"}
diff --git a/zlib-ng.h b/zlib-ng.h
index d7a409da..63f7d386 100644
--- a/zlib-ng.h
+++ b/zlib-ng.h
@@ -36,11 +36,11 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "1.9.9"
-#define ZLIBNG_VERNUM 0x1990
-#define ZLIBNG_VER_MAJOR 1
-#define ZLIBNG_VER_MINOR 9
-#define ZLIBNG_VER_REVISION 9
+#define ZLIBNG_VERSION "2.0.0-RC1"
+#define ZLIBNG_VERNUM 0x2000
+#define ZLIBNG_VER_MAJOR 2
+#define ZLIBNG_VER_MINOR 0
+#define ZLIBNG_VER_REVISION 0
 #define ZLIBNG_VER_SUBREVISION 0
 
 /*
diff --git a/zlib-ng.map b/zlib-ng.map
index cda2122d..b0046034 100644
--- a/zlib-ng.map
+++ b/zlib-ng.map
@@ -1,4 +1,4 @@
-ZLIB_NG_1.9.9 {
+ZLIB_NG_2.0.0 {
   global:
     zng_adler32;
     zng_adler32_c;
@@ -70,7 +70,7 @@ ZLIB_NG_1.9.9 {
     _*;
 };
 
-ZLIB_NG_GZ_1.9.9 {
+ZLIB_NG_GZ_2.0.0 {
   global:
     zng_gzbuffer;
     zng_gzclearerr;
diff --git a/zlib.h b/zlib.h
index c43447d4..56d080f4 100644
--- a/zlib.h
+++ b/zlib.h
@@ -38,11 +38,11 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "1.9.9"
-#define ZLIBNG_VERNUM 0x1990
-#define ZLIBNG_VER_MAJOR 1
-#define ZLIBNG_VER_MINOR 9
-#define ZLIBNG_VER_REVISION 9
+#define ZLIBNG_VERSION "2.0.0-RC1"
+#define ZLIBNG_VERNUM 0x2000
+#define ZLIBNG_VER_MAJOR 2
+#define ZLIBNG_VER_MINOR 0
+#define ZLIBNG_VER_REVISION 0
 #define ZLIBNG_VER_SUBREVISION 0
 
 #define ZLIB_VERSION "1.2.11.zlib-ng"
diff --git a/zutil.c b/zutil.c
index a2411fbb..558dfb22 100644
--- a/zutil.c
+++ b/zutil.c
@@ -21,7 +21,7 @@ z_const char * const PREFIX(z_errmsg)[10] = {
 };
 
 const char zlibng_string[] =
-    " zlib-ng 1.9.9 forked from zlib";
+    " zlib-ng 2.0.0-RC1 forked from zlib";
 
 #ifdef ZLIB_COMPAT
 const char * Z_EXPORT zlibVersion(void) {