Bug#34711762 Upgrade zlib to 1.2.13 [cmake changes]

Bump MIN_ZLIB_VERSION_REQUIRED to "1.2.13"
and adjust paths to bundled zlib sources.

In extra/zlib/zlib-1.2.13/CMakeLists.txt:
 - apply cumulative patches from previous zlib upgrade
 - apply fix to MacOS build (bug #34776172)

Change-Id: I1a0aeff115a96a0993f2f396c643eda1c1b4900b

Author: Andrzej Jarzabek

CMakeLists.txt

@@ -1677,7 +1677,6 @@ SET(SYSTEM_LIBRARIES
   LZ4       # Homebrew  lz4
   PROTOBUF  # Homebrew  protobuf
   SSL       # Homebrew  [email protected]
-# ZLIB      # Xcode                  Min required version is now 1.2.12
   ZSTD      # Homebrew  zstd
   FIDO      # Homebrew  libfido2
   )

cmake/zlib.cmake

@@ -28,11 +28,9 @@
 # but we need at least version 1.2.11, and that's not available on
 # all the platforms we need to support.
 
-# With earier versions, several compression tests fail.
-# SET(MIN_ZLIB_VERSION_REQUIRED "1.2.11")
-
 # Security bug fixes required from:
-SET(MIN_ZLIB_VERSION_REQUIRED "1.2.12")
+SET(MIN_ZLIB_VERSION_REQUIRED "1.2.13")
+
 
 MACRO(FIND_ZLIB_VERSION)
   FOREACH(version_part
@@ -86,7 +84,7 @@ MACRO (RESET_ZLIB_VARIABLES)
   UNSET(FIND_PACKAGE_MESSAGE_DETAILS_ZLIB CACHE)
 ENDMACRO()
 
-SET(ZLIB_VERSION_DIR "zlib-1.2.12")
+SET(ZLIB_VERSION_DIR "zlib-1.2.13")
 SET(BUNDLED_ZLIB_PATH ${CMAKE_SOURCE_DIR}/extra/zlib/${ZLIB_VERSION_DIR})
 
 MACRO (MYSQL_USE_BUNDLED_ZLIB)

extra/zlib/zlib-1.2.13/CMakeLists.txt

@@ -1,21 +1,28 @@
-cmake_minimum_required(VERSION 2.4.4)
+#cmake_minimum_required(VERSION 2.4.4)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-project(zlib C)
-
 set(VERSION "1.2.13")
 
+IF(POLICY CMP0048)
+  CMAKE_POLICY(SET CMP0048 NEW)
+  project(zlib VERSION ${VERSION} LANGUAGES C)
+ELSE()
+  project(zlib C)
+ENDIF()
+
+IF(DISABLE_THESE_LINES)
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
 set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
 set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+ENDIF(DISABLE_THESE_LINES)
 
 include(CheckTypeSize)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 include(CheckCSourceCompiles)
-enable_testing()
+# enable_testing()
 
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(stdint.h    HAVE_STDINT_H)
@@ -56,6 +63,7 @@ endif()
 #
 check_include_file(unistd.h Z_HAVE_UNISTD_H)
 
+IF(DISABLE_THESE_LINES)
 if(MSVC)
     set(CMAKE_DEBUG_POSTFIX "d")
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
@@ -81,6 +89,15 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
 configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
 		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+ENDIF(DISABLE_THESE_LINES)
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+  ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY
+  )
+INCLUDE_DIRECTORIES(
+  BEFORE SYSTEM ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+  )
 
 
 #============================================================================
@@ -131,6 +148,36 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
 string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
 
+ADD_CONVENIENCE_LIBRARY(zlib
+  ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+
+MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
+IF(HAS_MISSING_PROFILE)
+  ADD_COMPILE_FLAGS(${ZLIB_SRCS} COMPILE_FLAGS ${HAS_MISSING_PROFILE})
+ENDIF()
+
+MY_CHECK_CXX_COMPILER_WARNING("-Wdeprecated-non-prototype"
+  HAS_DEPRECATED_NON_PROTOTYPE)
+IF(HAS_DEPRECATED_NON_PROTOTYPE)
+  ADD_COMPILE_FLAGS(${ZLIB_SRCS} COMPILE_FLAGS ${HAS_DEPRECATED_NON_PROTOTYPE})
+ENDIF()
+
+IF(NOT WIN32)
+  ADD_COMPILE_FLAGS(${ZLIB_SRCS} COMPILE_FLAGS "-fvisibility=hidden")
+ENDIF()
+
+# Xcode >= 14 makes noise about sprintf, and loss of precision
+# when assigning integers from 64 bits to 32 bits, so silence:
+IF(APPLE)
+  ADD_COMPILE_FLAGS(${ZLIB_SRCS} COMPILE_FLAGS " -Wno-deprecated-declarations")
+  ADD_COMPILE_FLAGS(${ZLIB_SRCS} COMPILE_FLAGS " -Wno-shorten-64-to-32")
+ENDIF()
+
+RETURN()
+
+# Skip anything below.
+################################################################
+
 if(MINGW)
     # This gets us DLL resource information when compiling on MinGW.
     if(NOT CMAKE_RC_COMPILER)