Skip to content

Commit 4b8ec0a

Browse files
vector-of-boolkevinAlbs
vector-of-bool
authored and
kevinAlbs
committed
Update bundled zlib to 1.2.12 (#981)
* Update bundled zlib to 1.2.12 [Close CDRIVER-4377]
1 parent 332bce6 commit 4b8ec0a

File tree

214 files changed

+13993
-46480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+13993
-46480
lines changed

Diff for: ‎.evergreen/.codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ignore:
2-
- "src/zlib-1.2.11"
2+
- "src/zlib-1.2.12"
33
- "src/libmongoc/tests/mock_server"

Diff for: ‎.evergreen/check-files.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,13 @@
3636
cmake_produced = [
3737
"libbson/src/bson/bson-version.h",
3838
"libmongoc/src/mongoc/mongoc-version.h",
39-
"zlib-1.2.11/zconf.h"
39+
"zlib-1.2.12/zconf.h",
4040
]
4141

4242
for root, dirs, files in os.walk(repo_src_dir):
4343
for file in files:
4444
relpath = os.path.relpath(os.path.join(root, file), repo_src_dir)
4545

46-
# Files in bundled zlib that aren't needed to compile zlib are not included
47-
# in the tarball.
48-
if (relpath.startswith("zlib-1.2.11/contrib") or
49-
relpath.startswith("zlib-1.2.11/example") or
50-
relpath.startswith("zlib-1.2.11/test")):
51-
continue
5246
if pattern.match(relpath):
5347
repo_src_files.add(relpath)
5448

Diff for: ‎CMakeLists.txt

+15-15
Original file line numberDiff line numberDiff line change
@@ -274,21 +274,21 @@ if (ENABLE_MONGOC)
274274
set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
275275

276276
set (ZLIB_SOURCES
277-
${SOURCE_DIR}/src/zlib-1.2.11/adler32.c
278-
${SOURCE_DIR}/src/zlib-1.2.11/crc32.c
279-
${SOURCE_DIR}/src/zlib-1.2.11/deflate.c
280-
${SOURCE_DIR}/src/zlib-1.2.11/infback.c
281-
${SOURCE_DIR}/src/zlib-1.2.11/inffast.c
282-
${SOURCE_DIR}/src/zlib-1.2.11/inflate.c
283-
${SOURCE_DIR}/src/zlib-1.2.11/inftrees.c
284-
${SOURCE_DIR}/src/zlib-1.2.11/trees.c
285-
${SOURCE_DIR}/src/zlib-1.2.11/zutil.c
286-
${SOURCE_DIR}/src/zlib-1.2.11/compress.c
287-
${SOURCE_DIR}/src/zlib-1.2.11/uncompr.c
288-
${SOURCE_DIR}/src/zlib-1.2.11/gzclose.c
289-
${SOURCE_DIR}/src/zlib-1.2.11/gzlib.c
290-
${SOURCE_DIR}/src/zlib-1.2.11/gzread.c
291-
${SOURCE_DIR}/src/zlib-1.2.11/gzwrite.c
277+
${SOURCE_DIR}/src/zlib-1.2.12/adler32.c
278+
${SOURCE_DIR}/src/zlib-1.2.12/crc32.c
279+
${SOURCE_DIR}/src/zlib-1.2.12/deflate.c
280+
${SOURCE_DIR}/src/zlib-1.2.12/infback.c
281+
${SOURCE_DIR}/src/zlib-1.2.12/inffast.c
282+
${SOURCE_DIR}/src/zlib-1.2.12/inflate.c
283+
${SOURCE_DIR}/src/zlib-1.2.12/inftrees.c
284+
${SOURCE_DIR}/src/zlib-1.2.12/trees.c
285+
${SOURCE_DIR}/src/zlib-1.2.12/zutil.c
286+
${SOURCE_DIR}/src/zlib-1.2.12/compress.c
287+
${SOURCE_DIR}/src/zlib-1.2.12/uncompr.c
288+
${SOURCE_DIR}/src/zlib-1.2.12/gzclose.c
289+
${SOURCE_DIR}/src/zlib-1.2.12/gzlib.c
290+
${SOURCE_DIR}/src/zlib-1.2.12/gzread.c
291+
${SOURCE_DIR}/src/zlib-1.2.12/gzwrite.c
292292
)
293293

294294
set (MONGOC_ENABLE_ICU 0)

Diff for: ‎src/CMakeLists.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
add_subdirectory (tools)
55

66
# zconf.h is generated by configure_file() in the parent CMakeLists.txt
7-
extra_dist_generated (zlib-1.2.11/zconf.h)
7+
extra_dist_generated (zlib-1.2.12/zconf.h)
88
set (src_zlib_DIST
9-
src/zlib-1.2.11/crc32.h
10-
src/zlib-1.2.11/deflate.h
11-
src/zlib-1.2.11/gzguts.h
12-
src/zlib-1.2.11/inffast.h
13-
src/zlib-1.2.11/inffixed.h
14-
src/zlib-1.2.11/inflate.h
15-
src/zlib-1.2.11/inftrees.h
16-
src/zlib-1.2.11/trees.h
17-
src/zlib-1.2.11/zconf.h.in
18-
src/zlib-1.2.11/zlib.h
19-
src/zlib-1.2.11/zutil.h
9+
src/zlib-1.2.12/crc32.h
10+
src/zlib-1.2.12/deflate.h
11+
src/zlib-1.2.12/gzguts.h
12+
src/zlib-1.2.12/inffast.h
13+
src/zlib-1.2.12/inffixed.h
14+
src/zlib-1.2.12/inflate.h
15+
src/zlib-1.2.12/inftrees.h
16+
src/zlib-1.2.12/trees.h
17+
src/zlib-1.2.12/zconf.h.in
18+
src/zlib-1.2.12/zlib.h
19+
src/zlib-1.2.12/zutil.h
2020
)
2121
# Strip leading directory components to make the paths relative for MakeDist.
2222
# The ZLIB_SOURCES list is set in the top-level CMakeLists.txt.

Diff for: ‎src/libmongoc/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ endif ()
4848
# Copy zconf.h.in to zconf.h; even when using system zlib, the 'dist' target
4949
# will look for zconf.h in that location.
5050
configure_file (
51-
"${SOURCE_DIR}/src/zlib-1.2.11/zconf.h.in"
52-
"${CMAKE_BINARY_DIR}/src/zlib-1.2.11/zconf.h"
51+
"${SOURCE_DIR}/src/zlib-1.2.12/zconf.h.in"
52+
"${CMAKE_BINARY_DIR}/src/zlib-1.2.12/zconf.h"
5353
COPYONLY
5454
)
5555
set (ZLIB_INCLUDE_DIRS "")
@@ -80,17 +80,17 @@ if ( (ENABLE_ZLIB STREQUAL "BUNDLED")
8080
# This tells the bundled zlib where to find its generated headers
8181
target_include_directories (zlib_obj
8282
BEFORE PUBLIC
83-
"${SOURCE_DIR}/src/zlib-1.2.11"
84-
"${CMAKE_BINARY_DIR}/src/zlib-1.2.11"
83+
"${SOURCE_DIR}/src/zlib-1.2.12"
84+
"${CMAKE_BINARY_DIR}/src/zlib-1.2.12"
8585
)
8686
# Disable all warnings for compiling Zlib
8787
target_compile_options (zlib_obj PRIVATE -w)
8888
set (SOURCES ${SOURCES} $<TARGET_OBJECTS:zlib_obj>)
8989
# This tells mongoc_shared/mongoc_static where to find generated zlib headers
9090
set (
9191
ZLIB_INCLUDE_DIRS
92-
"${SOURCE_DIR}/src/zlib-1.2.11"
93-
"${CMAKE_BINARY_DIR}/src/zlib-1.2.11"
92+
"${SOURCE_DIR}/src/zlib-1.2.12"
93+
"${CMAKE_BINARY_DIR}/src/zlib-1.2.12"
9494
)
9595
endif ()
9696

Diff for: ‎src/zlib-1.2.11/.gitignore

-1
This file was deleted.

Diff for: ‎src/zlib-1.2.11/Makefile.am

-31
This file was deleted.

Diff for: ‎src/zlib-1.2.11/amiga/Makefile.pup

-69
This file was deleted.

Diff for: ‎src/zlib-1.2.11/amiga/Makefile.sas

-68
This file was deleted.

Diff for: ‎src/zlib-1.2.11/contrib/README.contrib

-78
This file was deleted.

0 commit comments

Comments
 (0)