commit 220672b39dceb4659469bf751f808e80cfbeed67 Author: Adam Gołębiowski <ad...@pld-linux.org> Date: Thu Dec 6 16:07:06 2018 +0100
- updated to 7.1.25 bug-52078-fileinode.patch | 2 +- pcre-shared.patch | 2 +- php-link-libs.patch | 2 +- php-pear.patch | 6 +++--- php.spec | 4 ++-- spl-shared.patch | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) --- diff --git a/php.spec b/php.spec index 028e38e..3d18d92 100644 --- a/php.spec +++ b/php.spec @@ -150,7 +150,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.1.23 +Version: 7.1.25 Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except @@ -159,7 +159,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 5e5baa60cfd85dd70bed9e740dd6dbc6 +# Source0-md5: 5540e0c6cc29ed743bcca8ab6d1381c9 Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch index 0fd0163..419be68 100644 --- a/bug-52078-fileinode.patch +++ b/bug-52078-fileinode.patch @@ -72,7 +72,7 @@ @@ -30,17 +30,17 @@ echo "Done\n"; ?> - --EXPECTF-- + --EXPECTF-- +int(%i) int(%d) int(%d) diff --git a/pcre-shared.patch b/pcre-shared.patch index ae69ebd..f0b86dc 100644 --- a/pcre-shared.patch +++ b/pcre-shared.patch @@ -24,7 +24,7 @@ - PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR) + PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) - + AC_DEFINE(HAVE_PCRE, 1, [ ]) PHP_ADD_INCLUDE($PCRE_INCDIR) - PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) diff --git a/php-link-libs.patch b/php-link-libs.patch index 23a7acc..7a16953 100644 --- a/php-link-libs.patch +++ b/php-link-libs.patch @@ -17,7 +17,7 @@ - save_old_LDFLAGS=$LDFLAGS + save_old_LIBS=$LIBS ac_stuff="$5" - + save_ext_shared=$ext_shared ext_shared=yes - PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS) diff --git a/php-pear.patch b/php-pear.patch index 400359d..df48f6c 100644 --- a/php-pear.patch +++ b/php-pear.patch @@ -17,18 +17,18 @@ dnl PEAR dependancies dnl - if test "$PHP_XML" = "no"; then -- pear_error_msg="$pear_error_msg +- pear_error_msg="$pear_error_msg - PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" - fi - +dnl if test "$PHP_XML" = "no"; then -+dnl pear_error_msg="$pear_error_msg ++dnl pear_error_msg="$pear_error_msg +dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" +dnl fi +dnl dnl dnl if test "$PHP_XMLRPC" = "no"; then - dnl pear_error_msg="$pear_error_msg + dnl pear_error_msg="$pear_error_msg --- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200 +++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200 @@ -4,7 +4,7 @@ diff --git a/spl-shared.patch b/spl-shared.patch index cf0fc4e..a89096b 100644 --- a/spl-shared.patch +++ b/spl-shared.patch @@ -1,9 +1,9 @@ --- php-7.0/ext/spl/config.m4~ 2015-05-21 17:57:06.000000000 +0300 +++ php-7.0/ext/spl/config.m4 2015-05-23 11:25:19.609715006 +0300 -@@ -22,6 +22,6 @@ - CPPFLAGS=$old_CPPFLAGS - AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed]) - AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) +@@ -2,6 +2,6 @@ + dnl config.m4 for extension SPL + + AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) - PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/220672b39dceb4659469bf751f808e80cfbeed67 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit