From a177842a9d8d538205d81194bba73e5d068801e0 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 18 Jun 2020 16:25:16 +0200
Subject: [PATCH] Try to fix libzip on macos

---
 azure/macos/brew.yml | 5 ++++-
 ext/zip/php_zip.c    | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/azure/macos/brew.yml b/azure/macos/brew.yml
index df4c5a532d740..02cb736d0262e 100644
--- a/azure/macos/brew.yml
+++ b/azure/macos/brew.yml
@@ -2,6 +2,8 @@ parameters:
   packages: ''
 
 steps:
+  - script: brew update
+    displayName: 'Update Homebrew'
   - script: |
       brew install pkg-config \
                    autoconf \
@@ -23,11 +25,12 @@ steps:
                    zlib \
                    t1lib \
                    gd \
-                   libzip \
                    gmp \
                    tidyp \
                    libxml2 \
                    libxslt \
                    postgresql
+      # Make sure we don't get broken libzip 1.7.0
+      brew upgrade libzip
       brew link icu4c gettext --force
     displayName: 'Install Build Dependencies'
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 883b6f6d40a12..753055216643b 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -31,6 +31,10 @@
 #include "zend_interfaces.h"
 #include "php_zip.h"
 
+#ifndef LIBZIP_VERSION_MAJOR
+# error You are likely using libzip 1.7.0, which is badly broken. Update to libzip 1.7.1
+#endif
+
 /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */
 static PHP_NAMED_FUNCTION(zif_zip_open);
 static PHP_NAMED_FUNCTION(zif_zip_read);