fix hash<>phar issues

diff --git a/dep-tests.sh b/dep-tests.sh
index e2a561f56765b9b27ecd94c64da94472c0005ef2..18ea66c08896491196fea4c4516eb55fe8dc7a2e 100755 (executable)
--- a/dep-tests.sh
+++ b/dep-tests.sh
@@ -19,7 +19,7 @@ dep_pdo_dblib="$dep_pdo pdo"
 dep_pdo_mysql="$dep_pdo pdo $with_mysqlnd"
 dep_simplexml="$dep_spl spl"
 dep_imap="pcre"
-dep_phar="$dep_spl spl"
+dep_phar="$dep_spl spl hash"
 dep_sqlite="$dep_pdo pdo"
 dep_fileinfo="pcre"
 dep_wddx='xml'

diff --git a/phar-hash-shared.patch b/phar-hash-shared.patch
index 28119af9590f14c69035951e0d7bd4e34975a718..621fe6dd0927d2c5ddeaf85e580edad26177a079 100644 (file)
--- a/phar-hash-shared.patch
+++ b/phar-hash-shared.patch
@@ -20,3 +20,14 @@
    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; \

diff --git a/php.spec b/php.spec
index 25ce4696566cd516b9782591d45b8d37c6fbe798..4a19cb21540a18e5a16bc47325a4c22a3ef3a007 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -134,7 +134,7 @@
 %undefine      with_filter
 %endif
 
-%define                rel     3
+%define                rel     4
 %define                subver  RC7
 %define                orgname php
 %define                ver_suffix 70