Merge pull request ClickHouse#78917 from ClickHouse/bump-minizip

Bump `minizip-ng`

Author: thevar1able

contrib/minizip-ng

@@ -120,7 +120,7 @@ if(MZ_WZAES)
 
     list(APPEND MINIZIP_SRC
          ${_MINIZIP_SOURCE_DIR}/mz_strm_wzaes.c)
-    
+
     list(APPEND MINIZIP_HDR
          ${_MINIZIP_SOURCE_DIR}/mz_strm_wzaes.h)
 endif()
@@ -129,10 +129,10 @@ endif()
 set(MZ_PKCRYPT ON)
 if(MZ_PKCRYPT)
     list(APPEND MINIZIP_DEF -DHAVE_PKCRYPT)
-    
+
     list(APPEND MINIZIP_SRC
          ${_MINIZIP_SOURCE_DIR}/mz_strm_pkcrypt.c)
-    
+
     list(APPEND MINIZIP_HDR
          ${_MINIZIP_SOURCE_DIR}/mz_strm_pkcrypt.h)
 endif()
@@ -148,14 +148,16 @@ endif()
 set(MZ_COMPAT ON)
 if(MZ_COMPAT)
     list(APPEND MINIZIP_SRC
-         ${_MINIZIP_SOURCE_DIR}/mz_compat.c)
-    
+         ${_MINIZIP_SOURCE_DIR}/compat/zip.c
+         ${_MINIZIP_SOURCE_DIR}/compat/unzip.c
+         ${_MINIZIP_SOURCE_DIR}/compat/ioapi.c)
+
     list(APPEND MINIZIP_HDR
-         ${_MINIZIP_SOURCE_DIR}/mz_compat.h
-         zip.h
-         unzip.h)
+         ${_MINIZIP_SOURCE_DIR}/compat/zip.h
+         ${_MINIZIP_SOURCE_DIR}/compat/unzip.h
+         ${_MINIZIP_SOURCE_DIR}/compat/ioapi.h)
 
-    list(APPEND MINIZIP_INC "${CMAKE_CURRENT_SOURCE_DIR}")
+    list(APPEND MINIZIP_INC "${_MINIZIP_SOURCE_DIR}/compat")
     list(APPEND MINIZIP_PUBLIC_DEF "-DMZ_COMPAT_VERSION=110")
 endif()
 

contrib/minizip-ng-cmake/CMakeLists.txt

@@ -5,7 +5,10 @@
 #include <IO/ReadBufferFromFileBase.h>
 #include <Common/quoteString.h>
 #include <base/errnoToString.h>
+
 #include <unzip.h>
+#include <zip.h>
+#include <mz.h>
 
 
 namespace DB

contrib/minizip-ng-cmake/unzip.h

@@ -1,14 +1,18 @@
 #include <IO/Archives/ZipArchiveWriter.h>
 
 #if USE_MINIZIP
-#include <IO/WriteBufferFromFileBase.h>
+#include <Common/logger_useful.h>
 #include <Common/quoteString.h>
+#include <IO/WriteBufferFromFileBase.h>
 #include <base/errnoToString.h>
-#include <zip.h>
-#include <boost/algorithm/string/predicate.hpp>
-#include <Common/logger_useful.h>
+
 #include <Poco/Logger.h>
 
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <zip.h>
+#include <mz.h>
+
 
 namespace DB
 {