From 7786e777eef88d6214443bdd2054aead50a05562 Mon Sep 17 00:00:00 2001
From: Marek Habersack <grendel@twistedcode.net>
Date: Sat, 16 Sep 2017 20:15:35 +0200
Subject: [PATCH] Bump to lipzip/rel-1-3-0/51ff59da (#863)

The new version fixes CVE-2017-12858 and CVE-2017-14107.
---
 .gitmodules                                         | 2 +-
 build-tools/libzip-windows/libzip-windows.projitems | 4 ++--
 build-tools/libzip/libzip.projitems                 | 4 ++--
 external/libzip                                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1751d129dcc..2ed7943d272 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,7 +20,7 @@
 [submodule "external/libzip"]
 	path = external/libzip
 	url = https://github.com/nih-at/libzip.git
-	branch = master
+	branch = rel-1-3-0
 [submodule "external/LibZipSharp"]
 	path = external/LibZipSharp
 	url = https://github.com/grendello/LibZipSharp.git
diff --git a/build-tools/libzip-windows/libzip-windows.projitems b/build-tools/libzip-windows/libzip-windows.projitems
index f77d1cab3f1..54eb9146798 100644
--- a/build-tools/libzip-windows/libzip-windows.projitems
+++ b/build-tools/libzip-windows/libzip-windows.projitems
@@ -3,13 +3,13 @@
   <ItemGroup>
     <_LibZipTarget Include="host-mxe-Win64" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))">
       <CMake>$(AndroidMxeFullPath)\bin\x86_64-w64-mingw32.static-cmake</CMake>
-      <CMakeFlags></CMakeFlags>
+      <CMakeFlags>-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE</CMakeFlags>
       <OutputLibrary>x64/libzip.dll</OutputLibrary>
       <OutputLibraryPath>lib/libzip.dll</OutputLibraryPath>
     </_LibZipTarget>
     <_LibZipTarget Include="host-mxe-Win32" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win32:'))">
       <CMake>$(AndroidMxeFullPath)\bin\i686-w64-mingw32.static-cmake</CMake>
-      <CMakeFlags></CMakeFlags>
+      <CMakeFlags>-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE</CMakeFlags>
       <OutputLibrary>libzip.dll</OutputLibrary>
       <OutputLibraryPath>lib/libzip.dll</OutputLibraryPath>
     </_LibZipTarget>
diff --git a/build-tools/libzip/libzip.projitems b/build-tools/libzip/libzip.projitems
index 7582776ebd8..9c85ac8c027 100644
--- a/build-tools/libzip/libzip.projitems
+++ b/build-tools/libzip/libzip.projitems
@@ -3,13 +3,13 @@
   <ItemGroup>
     <_LibZipTarget Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
       <CMake>cmake</CMake>
-      <CMakeFlags>-DCMAKE_OSX_ARCHITECTURES=&quot;i386;x86_64&quot;</CMakeFlags>
+      <CMakeFlags>-DCMAKE_OSX_ARCHITECTURES=&quot;i386;x86_64&quot; -DBUILD_SHARED_LIBS=ON</CMakeFlags>
       <OutputLibrary>libzip.3.0.dylib</OutputLibrary>
       <OutputLibraryPath>lib/libzip.3.0.dylib</OutputLibraryPath>
     </_LibZipTarget>
     <_LibZipTarget Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:')) AND '$(_LinuxBuildLibZip)' == 'true' ">
       <CMake>cmake</CMake>
-      <CMakeFlags></CMakeFlags>
+      <CMakeFlags>-DBUILD_SHARED_LIBS=ON</CMakeFlags>
       <OutputLibrary>libzip.so</OutputLibrary>
       <OutputLibraryPath>lib/libzip.so</OutputLibraryPath>
     </_LibZipTarget>
diff --git a/external/libzip b/external/libzip
index 1d8b1ac4d20..51ff59da3a8 160000
--- a/external/libzip
+++ b/external/libzip
@@ -1 +1 @@
-Subproject commit 1d8b1ac4d20b8ef8d3f5d496dabebaa0ff9019ff
+Subproject commit 51ff59da3a8c7d3934e23aed70eb0347234a14c9