From d2a00cb8d3d3e645fbce4d056515efc3ebd08a8b Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 14 Nov 2018 08:54:09 +0000 Subject: [PATCH] - updated to 7.1.24 --- bug-52078-fileinode.patch | 2 +- pcre-shared.patch | 4 ++-- php-link-libs.patch | 4 ++-- php-pear.patch | 12 ++++++------ php.spec | 4 ++-- spl-shared.patch | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) 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..21a2172 100644 --- a/pcre-shared.patch +++ b/pcre-shared.patch @@ -17,14 +17,14 @@ + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR /usr/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done - + @@ -43,12 +43,13 @@ AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6]) fi - 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..8938d7d 100644 --- a/php-link-libs.patch +++ b/php-link-libs.patch @@ -10,14 +10,14 @@ if test "$ac_cv_func_dlopen" = "yes"; then --- php-5.2.0/acinclude.m4.orig 2006-12-22 21:52:13.766461055 +0100 +++ php-5.2.0/acinclude.m4 2006-12-22 21:52:37.159794165 +0100 -@@ -1740,18 +1740,18 @@ +@@ -1845,18 +1845,18 @@ dnl Wrapper for AC_CHECK_LIB dnl AC_DEFUN([PHP_CHECK_LIBRARY], [ - 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..f8f05a7 100644 --- a/php-pear.patch +++ b/php-pear.patch @@ -1,6 +1,6 @@ --- php-5.3.1/configure.in~ 2010-02-19 23:26:13.000000000 +0200 +++ php-5.3.1/configure.in 2010-02-19 23:27:58.273207305 +0200 -@@ -934,11 +934,6 @@ +@@ -1091,11 +1091,6 @@ with_pear=no fi @@ -10,25 +10,25 @@ -fi - PHP_ARG_WITH(pear, [whether to install PEAR], - [ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] + [ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@ --without-pear Do not install PEAR], DEFAULT, yes) -@@ -1023,11 +1023,11 @@ +@@ -1105,11 +1100,11 @@ dnl 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/php.spec b/php.spec index 10afe15..8c55568 100644 --- a/php.spec +++ b/php.spec @@ -142,7 +142,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.24 Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except @@ -151,7 +151,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 5e5baa60cfd85dd70bed9e740dd6dbc6 +# Source0-md5: dafc475872cb182d504d98771fecbeb2 Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini 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]) -- 2.44.0