- updated to 7.0.25

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index dbd931a1f28d53df5e2c35c644487508a0d38c1f..1c30571b92d8d3de454077826323a03c7bc7a054 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -72,16 +72,16 @@
                        for (var i=0; i<ths.length; i++) {
 --- php7.0-7.0/sapi/fpm/Makefile.frag~ 2015-05-21 17:57:06.000000000 +0300
 +++ php7.0-7.0/sapi/fpm/Makefile.frag  2015-05-23 11:01:51.383332821 +0300
-@@ -11,9 +11,9 @@
-       @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
- 
-       @echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
--      $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
--      @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
--      @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
-+      $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
-+      @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+      @$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
- 
+@@ -14,9 +14,9 @@
+               echo "Installing PHP FPM defconfig:     skipping"; \
+       else \
+               echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+-              $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-              $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-              $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++              $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++              $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++              $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+       fi
+       
        @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
-       @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8

diff --git a/php-libtool.patch b/php-libtool.patch
index c95f37f08747c8b09733f99a31de3141244da0eb..5f2cf6ea5d6e9920de96f3f39ea6e4f320d29de2 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -8,12 +8,12 @@
  builddir="`pwd`"
  SED="@SED@"
  
--FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
 +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
 +if [ -f "$aclocaldir/ltsugar.m4" ]; then
-+    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
 +else
-+    LIBTOOL_FILES="libtool.m4"
++    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4"
 +fi
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
  CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \

diff --git a/php.spec b/php.spec
index 5e71a8c38d804583980484195b33e237f47a6611..72b05fdfa877fee532a9f90681a28eafa1ec8f8b 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -142,8 +142,8 @@ 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.0.15
-Release:       1.1
+Version:       7.0.25
+Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -151,7 +151,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: dca23412f3e3b3987e582091b751925d
+# Source0-md5: 93e84a3997a411edd27abd3f148f6794
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -1964,7 +1964,7 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-%patch60 -p1
+#%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
@@ -2112,8 +2112,8 @@ if test "$ver" != "%{pharver}"; then
        : Update the pharver macro and rebuild.
        exit 1
 fi
-ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
-if test "$ver" != "%{sqlite3ver}"; then
+ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
        : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
        : Update the sqlite3ver macro and rebuild.
        exit 1