commit c30618678e66b2e7cb482eb5ff3ddd58f17cc7ba
Merge: 6fcd6c0 59665b6
Author: Elan Ruusamäe <[email protected]>
Date: Thu Aug 28 17:06:05 2014 +0300
Merge branch 'PHP_5_5' into PHP_5_6
Conflicts:
php.spec
bug-52448.patch | 8 --
mysqlnd-shared.patch | 23 ------
php-curl-limit-speed.patch | 30 -------
php-gd_imagerotate_enable.patch | 173 ----------------------------------------
php-krb5-ac.patch | 11 ---
php-m4-divert.patch | 79 ------------------
php-m4.patch | 11 ---
php-mod_php.conf | 10 +++
php-zlib.patch | 15 ----
php.spec | 165 ++++++++++++++++++++++++++++++--------
suhosin.patch | 16 ++--
11 files changed, 150 insertions(+), 391 deletions(-)
---
diff --cc php.spec
index 84f3a68,73d2fb8..cebc18b
--- a/php.spec
+++ b/php.spec
@@@ -319,9 -294,10 +303,10 @@@ BuildRoot: %{tmpdir}/%{name}-%{version}
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in
%%build
-%define php_api_version 20121113
-%define zend_module_api 20121212
-%define zend_extension_api 220121212
+%define php_api_version 20131106
+%define zend_module_api 20131226
+%define zend_extension_api 220131226
+ %define php_pdo_api_version 20080721
# Extension versions
%define bz2ver 1.0
@@@ -333,10 -309,9 +318,10 @@@
%define opcachever 7.0.4-dev
%define pharver 2.0.2
%define sqlite3ver 0.7-dev
-%define zipver 1.11.0
+%define zipver 1.12.4
+%define phpdbgver 0.4.0
- %define zend_zts %{!?with_zts:0}%{?with_zts:1}
+ %define _zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
%if %{with gcov}
@@@ -2118,12 -2170,6 +2196,12 @@@ if test "$ver" != "%{opcachever}"; the
: 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}.
- : Update the opcachever macro and rebuild.
++ : Update the phpdbgver macro and rebuild.
+ exit 1
+fi
ver=$(sed -rne 's,.*<version>(.+)</version>,\1,p' ext/bz2/package.xml)
if test "$ver" != "%{bz2ver}"; then
: Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a050c8c0fd75bff5783956763ff7984896bfa8f8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
