Update bundled zlib to 1.2.12 (#981)

* Update bundled zlib to 1.2.12 [Close CDRIVER-4377]

Author: vector-of-bool

.evergreen/.codecov.yml

@@ -1,3 +1,3 @@
 ignore:
-  - "src/zlib-1.2.11"
+  - "src/zlib-1.2.12"
   - "src/libmongoc/tests/mock_server"

.evergreen/check-files.py

@@ -36,19 +36,13 @@
 cmake_produced = [
     "libbson/src/bson/bson-version.h",
     "libmongoc/src/mongoc/mongoc-version.h",
-    "zlib-1.2.11/zconf.h"
+    "zlib-1.2.12/zconf.h",
 ]
 
 for root, dirs, files in os.walk(repo_src_dir):
     for file in files:
         relpath = os.path.relpath(os.path.join(root, file), repo_src_dir)
 
-        # Files in bundled zlib that aren't needed to compile zlib are not included
-        # in the tarball.
-        if (relpath.startswith("zlib-1.2.11/contrib") or
-            relpath.startswith("zlib-1.2.11/example") or
-            relpath.startswith("zlib-1.2.11/test")):
-            continue
         if pattern.match(relpath):
             repo_src_files.add(relpath)
 

CMakeLists.txt

@@ -278,21 +278,21 @@ if (ENABLE_MONGOC)
    set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
    set (ZLIB_SOURCES
-      ${SOURCE_DIR}/src/zlib-1.2.11/adler32.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/crc32.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/deflate.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/infback.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/inffast.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/inflate.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/inftrees.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/trees.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/zutil.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/compress.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/uncompr.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/gzclose.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/gzlib.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/gzread.c
-      ${SOURCE_DIR}/src/zlib-1.2.11/gzwrite.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/adler32.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/crc32.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/deflate.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/infback.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/inffast.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/inflate.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/inftrees.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/trees.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/zutil.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/compress.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/uncompr.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/gzclose.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/gzlib.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/gzread.c
+      ${SOURCE_DIR}/src/zlib-1.2.12/gzwrite.c
    )
 
    set (MONGOC_ENABLE_ICU 0)

src/CMakeLists.txt

@@ -4,19 +4,19 @@
 add_subdirectory (tools)
 
 # zconf.h is generated by configure_file() in the parent CMakeLists.txt
-extra_dist_generated (zlib-1.2.11/zconf.h)
+extra_dist_generated (zlib-1.2.12/zconf.h)
 set (src_zlib_DIST
-   src/zlib-1.2.11/crc32.h
-   src/zlib-1.2.11/deflate.h
-   src/zlib-1.2.11/gzguts.h
-   src/zlib-1.2.11/inffast.h
-   src/zlib-1.2.11/inffixed.h
-   src/zlib-1.2.11/inflate.h
-   src/zlib-1.2.11/inftrees.h
-   src/zlib-1.2.11/trees.h
-   src/zlib-1.2.11/zconf.h.in
-   src/zlib-1.2.11/zlib.h
-   src/zlib-1.2.11/zutil.h
+   src/zlib-1.2.12/crc32.h
+   src/zlib-1.2.12/deflate.h
+   src/zlib-1.2.12/gzguts.h
+   src/zlib-1.2.12/inffast.h
+   src/zlib-1.2.12/inffixed.h
+   src/zlib-1.2.12/inflate.h
+   src/zlib-1.2.12/inftrees.h
+   src/zlib-1.2.12/trees.h
+   src/zlib-1.2.12/zconf.h.in
+   src/zlib-1.2.12/zlib.h
+   src/zlib-1.2.12/zutil.h
 )
 # Strip leading directory components to make the paths relative for MakeDist.
 # The ZLIB_SOURCES list is set in the top-level CMakeLists.txt.

src/libmongoc/CMakeLists.txt

@@ -48,8 +48,8 @@ endif ()
 # Copy zconf.h.in to zconf.h; even when using system zlib, the 'dist' target
 # will look for zconf.h in that location.
 configure_file (
-   "${SOURCE_DIR}/src/zlib-1.2.11/zconf.h.in"
-   "${CMAKE_BINARY_DIR}/src/zlib-1.2.11/zconf.h"
+   "${SOURCE_DIR}/src/zlib-1.2.12/zconf.h.in"
+   "${CMAKE_BINARY_DIR}/src/zlib-1.2.12/zconf.h"
    COPYONLY
 )
 set (ZLIB_INCLUDE_DIRS "")
@@ -80,17 +80,17 @@ if ( (ENABLE_ZLIB STREQUAL "BUNDLED")
    # This tells the bundled zlib where to find its generated headers
    target_include_directories (zlib_obj
       BEFORE PUBLIC
-      "${SOURCE_DIR}/src/zlib-1.2.11"
-      "${CMAKE_BINARY_DIR}/src/zlib-1.2.11"
+      "${SOURCE_DIR}/src/zlib-1.2.12"
+      "${CMAKE_BINARY_DIR}/src/zlib-1.2.12"
    )
    # Disable all warnings for compiling Zlib
    target_compile_options (zlib_obj PRIVATE -w)
    set (SOURCES ${SOURCES} $<TARGET_OBJECTS:zlib_obj>)
    # This tells mongoc_shared/mongoc_static where to find generated zlib headers
    set (
       ZLIB_INCLUDE_DIRS
-      "${SOURCE_DIR}/src/zlib-1.2.11"
-      "${CMAKE_BINARY_DIR}/src/zlib-1.2.11"
+      "${SOURCE_DIR}/src/zlib-1.2.12"
+      "${CMAKE_BINARY_DIR}/src/zlib-1.2.12"
    )
 endif ()