]>
Commit | Line | Data |
---|---|---|
791b59e4 JR |
1 | diff -urNp -x '*.orig' php-5.6.40.org/ext/phar/Makefile.frag php-5.6.40/ext/phar/Makefile.frag |
2 | --- php-5.6.40.org/ext/phar/Makefile.frag 2021-08-23 23:20:33.969055218 +0200 | |
3 | +++ php-5.6.40/ext/phar/Makefile.frag 2021-08-23 23:20:34.982387483 +0200 | |
4 | @@ -9,7 +9,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ | |
5 | $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ | |
6 | if test "x$(PHP_MODULES)" != "x"; then \ | |
7 | $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ | |
8 | - for i in pcre spl bz2 zlib phar; do \ | |
9 | + for i in pcre spl bz2 zlib hash phar; do \ | |
10 | if test -f "$(top_builddir)/modules/$$i.la"; then \ | |
11 | . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ | |
12 | fi; \ | |
13 | diff -urNp -x '*.orig' php-5.6.40.org/ext/phar/config.m4 php-5.6.40/ext/phar/config.m4 | |
14 | --- php-5.6.40.org/ext/phar/config.m4 2019-01-09 10:54:13.000000000 +0100 | |
15 | +++ php-5.6.40/ext/phar/config.m4 2021-08-23 23:20:34.982387483 +0200 | |
16 | @@ -7,13 +7,13 @@ PHP_ARG_ENABLE(phar, for phar archive su | |
97b0b310 | 17 | if test "$PHP_PHAR" != "no"; then |
791b59e4 | 18 | 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) |
97b0b310 ER |
19 | AC_MSG_CHECKING([for phar openssl support]) |
20 | - if test "$PHP_HASH_SHARED" != "yes"; then | |
21 | - if test "$PHP_HASH" != "no"; then | |
22 | +dnl if test "$PHP_HASH_SHARED" != "yes"; then | |
23 | +dnl if test "$PHP_HASH" != "no"; then | |
24 | AC_DEFINE(PHAR_HASH_OK,1,[ ]) | |
25 | - fi | |
26 | - else | |
66181086 ER |
27 | - AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) |
28 | - fi | |
97b0b310 ER |
29 | +dnl fi |
30 | +dnl else | |
66181086 | 31 | +dnl AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) |
97b0b310 ER |
32 | +dnl fi |
33 | if test "$PHP_OPENSSL_SHARED" = "yes"; then | |
34 | AC_MSG_RESULT([no (shared openssl)]) | |
35 | else |