Skip to content

Commit a017aaf

Browse files
committed
- increasing the zlib recommended version to 1.3.1
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
1 parent f89298d commit a017aaf

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/dependencies_latest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
share/ci/scripts/multi/install_yaml-cpp.sh 0.8.0 $EXT_PATH
112112
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
113113
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
114-
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
114+
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
115115
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
116116
- name: Install latest ext package versions
117117
run: |
@@ -216,7 +216,7 @@ jobs:
216216
share/ci/scripts/multi/install_yaml-cpp.sh 0.8.0 $EXT_PATH
217217
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
218218
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
219-
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
219+
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
220220
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
221221
- name: Install latest ext package versions
222222
run: |
@@ -340,7 +340,7 @@ jobs:
340340
share/ci/scripts/multi/install_pystring.sh 1.1.3 $EXT_PATH
341341
share/ci/scripts/multi/install_pybind11.sh 2.9.2 $EXT_PATH
342342
share/ci/scripts/multi/install_expat.sh 2.6.0 $EXT_PATH
343-
share/ci/scripts/multi/install_zlib.sh 1.2.12 $EXT_PATH
343+
share/ci/scripts/multi/install_zlib.sh 1.3.1 $EXT_PATH
344344
share/ci/scripts/multi/install_minizip-ng.sh 3.0.6 $EXT_PATH
345345
shell: bash
346346
# OSL not installed due to LLVM compilation time.

share/cmake/modules/FindExtPackages.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,10 @@ ocio_handle_dependency( Imath REQUIRED ALLOW_INSTALL
9797
# ZLIB_USE_STATIC_LIBS Set to ON if static library is prefered (CMake 3.24+)
9898
#
9999
###############################################################################
100-
# ZLIB 1.2.13 is used since it fixes a critical vulnerability.
101-
# See https://nvd.nist.gov/vuln/detail/CVE-2022-37434
102-
# See https://github.com/madler/zlib/releases/tag/v1.2.13
103100
ocio_handle_dependency( ZLIB REQUIRED ALLOW_INSTALL
104101
MIN_VERSION 1.2.8
105-
RECOMMENDED_VERSION 1.2.13
106-
RECOMMENDED_VERSION_REASON "CVE fixes"
102+
RECOMMENDED_VERSION 1.3.1
103+
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO"
107104
VERSION_VARS ZLIB_VERSION_STRING ZLIB_VERSION )
108105

109106
###############################################################################

0 commit comments

Comments
 (0)