- updated to 7.4.0, partial PLD merge, release 0.1 (not tested yet)

[packages/php.git] / phar-hash-shared.patch

diff --git a/phar-hash-shared.patch b/phar-hash-shared.patch
deleted file mode 100644 (file)
index 621fe6d..0000000
--- a/phar-hash-shared.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- php-7.0.0RC6/ext/phar/config.m4    2015-11-17 19:13:50.877662712 +0200
-+++ php-7.0.0RC6/ext/phar/config.m4    2015-11-20 12:51:24.088185045 +0200
-@@ -7,13 +7,13 @@
- if test "$PHP_PHAR" != "no"; then
-   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-   AC_MSG_CHECKING([for phar openssl support])
--  if test "$PHP_HASH_SHARED" != "yes"; then
--    if test "$PHP_HASH" != "no"; then
-+dnl  if test "$PHP_HASH_SHARED" != "yes"; then
-+dnl    if test "$PHP_HASH" != "no"; then
-       AC_DEFINE(PHAR_HASH_OK,1,[ ])
--    fi
--  else
--    AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared])
--  fi
-+dnl    fi
-+dnl  else
-+dnl    AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared])
-+dnl  fi
-   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-     AC_MSG_RESULT([no (shared openssl)])
-   else
---- php-7.0.0RC7/ext/phar/Makefile.frag~       2015-11-23 11:06:31.000000000 +0200
-+++ php-7.0.0RC7/ext/phar/Makefile.frag        2015-11-23 11:15:36.452443959 +0200
-@@ -9,7 +9,7 @@
-               $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
-               if test "x$(PHP_MODULES)" != "x"; then \
-               $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
--              for i in pcre spl bz2 zlib phar; do \
-+              for i in pcre spl bz2 zlib hash phar; do \
-                       if test -f "$(top_builddir)/modules/$$i.la"; then \
-                               . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-                       fi; \