From: Remi Collet <remi@php.net>
Date: Wed, 31 May 2017 07:56:01 +0000 (+0200)
Subject: Use of bundled libzip is deprecated
X-Git-Tag: php-7.2.0alpha1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77cca632dad2b7a4720fb2aa92950789c5485f2c;p=php

Use of bundled libzip is deprecated
---

diff --git a/NEWS b/NEWS
index a5c034b51d..f8b8bf7d82 100644
--- a/NEWS
+++ b/NEWS
@@ -220,6 +220,7 @@ PHP                                                                        NEWS
 
 - ZIP:
   . Add support for encrypted archives. (Remi)
+  . Use of bundled libzip is deprecated, --with-libzip option is recommended. (Remi)
   . Fixed Bug #73803 (Reflection of ZipArchive does not show public properties). (Remi)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index 83798ee792..a8f028957e 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -104,6 +104,7 @@ if test "$PHP_ZIP" != "no"; then
       PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
       AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
     ], [
+      AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
     ], [
       -L$LIBZIP_LIBDIR
     ])
@@ -112,6 +113,11 @@ if test "$PHP_ZIP" != "no"; then
     PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS)
     PHP_SUBST(ZIP_SHARED_LIBADD)
   else
+    AC_MSG_WARN(========================================================);
+    AC_MSG_WARN(Use of bundled libzip is deprecated and will be removed.);
+    AC_MSG_WARN(Some features such as encryption are not available.);
+    AC_MSG_WARN(Use system library and --with-libzip is recommended.);
+    AC_MSG_WARN(========================================================);
 
 
   PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_add_dir.c lib/zip_add_entry.c\