From 9c01a96b14655ae043888564cf12e6c6bc41edbd Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Thu, 22 Aug 2013 18:06:07 +0400
Subject: [PATCH] Set minimal zlib version to 1.2.3.

Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
---
 cmake/OpenCVFindLibsGrfmt.cmake  | 2 +-
 cmake/OpenCVMinDepVersions.cmake | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index ea970edcc7..7d885f7a7a 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -6,7 +6,7 @@
 if(BUILD_ZLIB)
   ocv_clear_vars(ZLIB_FOUND)
 else()
-  include(FindZLIB)
+  find_package(ZLIB "${MIN_VER_ZLIB}")
   if(ZLIB_FOUND AND ANDROID)
     if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so")
       set(ZLIB_LIBRARIES z)
diff --git a/cmake/OpenCVMinDepVersions.cmake b/cmake/OpenCVMinDepVersions.cmake
index 93ae5ebf6c..9ec40d963a 100644
--- a/cmake/OpenCVMinDepVersions.cmake
+++ b/cmake/OpenCVMinDepVersions.cmake
@@ -1 +1,2 @@
 set(MIN_VER_CMAKE 2.8.7)
+set(MIN_VER_ZLIB 1.2.3)