aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Rosenquist <eric@rosenquist.com>2019-01-16 13:52:33 -0500
committerPhil Christensen <philc@microsoft.com>2019-01-16 10:52:33 -0800
commit672ea9a1b3222673342b37ea26dacad0a1c38288 (patch)
tree8fea4efb24c5a490e26ee7d3d9f8494b88dfd91e
parent2011b8512b1c16fc1f8cf07689591854d531abee (diff)
downloadvcpkg-672ea9a1b3222673342b37ea26dacad0a1c38288.tar.gz
vcpkg-672ea9a1b3222673342b37ea26dacad0a1c38288.zip
[minizip] Enable decrypt support for password-encrypted ZIP files. (#5010)
* Enable support for password-encrypted ZIP files. * [minizip] combine patch with in vcpkg_from_github
-rw-r--r--ports/minizip/minizip.patch16
-rw-r--r--ports/minizip/portfile.cmake1
2 files changed, 17 insertions, 0 deletions
diff --git a/ports/minizip/minizip.patch b/ports/minizip/minizip.patch
new file mode 100644
index 000000000..04ef8fa2f
--- /dev/null
+++ b/ports/minizip/minizip.patch
@@ -0,0 +1,16 @@
+diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
+index f12e3329..bfc05f77 100644
+--- a/contrib/minizip/unzip.c
++++ b/contrib/minizip/unzip.c
+@@ -68,10 +68,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#ifndef NOUNCRYPT
+- #define NOUNCRYPT
+-#endif
+-
+ #include "zlib.h"
+ #include "unzip.h"
+
+
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake
index f12e3329b..927951d70 100644
--- a/ports/minizip/portfile.cmake
+++ b/ports/minizip/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
REF v1.2.11
SHA512 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf
HEAD_REF master
+ PATCHES minizip.patch # enable decrypt support for password-encrypted ZIP files
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})