up to 7.0.10, fixes to: CVE-2016-7124; CVE-2016-7125, CVE-2016-7133, CVE-2016-7134...

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 59b8b4afac9a60759d1cc3895a5b48a98e8dd978..56b886f8c3e6b6f3542be2d8ad3d9de66c0ea47a 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,7 +1,6 @@
 # TODO 5.6:
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
 # - build with system libgd 2.1, see 73c5128
-# - ext/intl poison libs in php-common: https://github.com/pld-linux/php/commit/5b279587c5f1dec19027944644902d6e993d5446
 # TODO 5.4:
 # - update imap annotations patch (needs api porting)
 # - update imap myrights patch (needs api porting)
@@ -144,8 +143,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.6
-Release:       2
+Version:       7.0.10
+Release:       1
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -153,7 +152,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 5f0c5d999a6b5c700b31fd9618d5651d
+# Source0-md5: 6f087f16514b6c442e8009a5828827b7
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -167,7 +166,7 @@ Patch0:             %{orgname}-shared.patch
 Patch1:                %{orgname}-pldlogo.patch
 Patch2:                %{orgname}-mail.patch
 Patch3:                %{orgname}-link-libs.patch
-
+Patch4:                intl-stdc++.patch
 Patch5:                %{orgname}-filter-shared.patch
 Patch6:                %{orgname}-build_modules.patch
 Patch7:                %{orgname}-sapi-ini-file.patch
@@ -311,10 +310,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                hashver         1.0
 %define                intlver         1.1.0
 %define                jsonver         1.4.0
-%define                opcachever      7.0.6-dev
 %define                pharver         2.0.2
 %define                sqlite3ver      0.7-dev
-%define                zipver          1.13.2
+%define                zipver          1.13.4
 %define                phpdbgver       0.5.0
 
 %define                _zend_zts               %{!?with_zts:0}%{?with_zts:1}
@@ -484,6 +482,7 @@ Requires(postun):   /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      php-dirs >= 1.4-2
 Requires:      rc-scripts
 Provides:      php(fcgi)
 Provides:      php(fpm)
@@ -1209,7 +1208,7 @@ Group:            Libraries
 URL:           https://wiki.php.net/rfc/optimizerplus
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
-Provides:      php(opcache) = %{opcachever}
+Provides:      php(opcache) = %{version}
 
 %description opcache
 The Zend OPcache provides faster PHP execution through opcode caching
@@ -1942,7 +1941,7 @@ cp -p php.ini-production php.ini
 %patch1 -p1
 #%patch2 -p1 NEEDS PORTING
 %patch3 -p1
-
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -2167,12 +2166,6 @@ if test "$ver" != "%{jsonver}"; then
        : Update the jsonver macro and rebuild.
        exit 1
 fi
-ver=$(awk '/#define PHP_ZENDOPCACHE_VERSION/ {print $3}' ext/opcache/ZendAccelerator.h | xargs)
-if test "$ver" != "%{opcachever}"; then
-       : Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}.
-       : Update the opcachever macro and rebuild.
-       exit 1
-fi
 ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
 if test "$ver" != "%{phpdbgver}"; then
        : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
@@ -2326,7 +2319,7 @@ for sapi in $sapis; do
        %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
        %{?with_pgsql:--with-pdo-pgsql=shared} \
        %{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
-       %{?with_webp:--with-vpx-dir=/usr} \
+       %{?with_webp:--with-webp-dir=/usr} \
        --without-libexpat-dir \
        %{__enable_disable posix posix shared} \
        --enable-shared \
@@ -2564,7 +2557,12 @@ libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/
 
 %if %{with phpdbg}
 %{__make} -f Makefile.phpdbg install-phpdbg \
+       INSTALL="libtool --mode=install install -p" \
        INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# version the phpdbg files
+mv $RPM_BUILD_ROOT%{_bindir}/phpdbg{,%{ver_suffix}}
+mv $RPM_BUILD_ROOT%{_mandir}/man1/phpdbg{,%{ver_suffix}}.1
 %endif
 
 %if %{with milter}
@@ -2924,8 +2922,8 @@ fi
 %if %{with phpdbg}
 %files phpdbg
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/phpdbg
-%{_mandir}/man1/phpdbg.1*
+%attr(755,root,root) %{_bindir}/phpdbg%{ver_suffix}
+%{_mandir}/man1/phpdbg%{ver_suffix}.1*
 %endif
 
 %if %{with milter}