summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-5.3.7-oci8conf.patch2
-rw-r--r--php-bug67873.patch (renamed from php-wddx.patch)0
-rw-r--r--php54.spec11
3 files changed, 6 insertions, 7 deletions
diff --git a/php-5.3.7-oci8conf.patch b/php-5.3.7-oci8conf.patch
index 4a5c44f..66dc0b0 100644
--- a/php-5.3.7-oci8conf.patch
+++ b/php-5.3.7-oci8conf.patch
@@ -13,7 +13,7 @@ diff -up php5.3-201104170830/ext/ldap/php_ldap.h.remi-oci8 php5.3-201104170830/e
diff -up php5.3-201104170830/ext/oci8/config.m4.remi-oci8 php5.3-201104170830/ext/oci8/config.m4
--- php5.3-201104170830/ext/oci8/config.m4.remi-oci8 2011-03-30 00:35:22.000000000 +0200
+++ php5.3-201104170830/ext/oci8/config.m4 2011-04-17 11:55:25.628871315 +0200
-@@ -291,6 +291,7 @@ if test "$PHP_OCI8" != "no"; then
+@@ -298,6 +298,7 @@ if test "$PHP_OCI8" != "no"; then
dnl Header directory for Instant Client SDK RPM install
OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
diff --git a/php-wddx.patch b/php-bug67873.patch
index c3b0eb6..c3b0eb6 100644
--- a/php-wddx.patch
+++ b/php-bug67873.patch
diff --git a/php54.spec b/php54.spec
index 6966586..a3287a1 100644
--- a/php54.spec
+++ b/php54.spec
@@ -88,7 +88,7 @@ Version: 5.4.32
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.2.%{?snapdate}%{?rcver}%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -139,7 +139,7 @@ Patch46: php-5.4.9-fixheader.patch
Patch47: php-5.4.9-phpinfo.patch
# Upstream fixes
-Patch100: php-wddx.patch
+Patch100: php-bug67873.patch
# Security fixes
@@ -1699,13 +1699,12 @@ fi
%changelog
-* Wed Aug 20 2014 Remi Collet <remi@fedoraproject.org> 5.4.32-2
-- test build for php bug #67873
-
-* Wed Aug 20 2014 Remi Collet <remi@fedoraproject.org> 5.4.32-1
+* Thu Aug 21 2014 Remi Collet <remi@fedoraproject.org> 5.4.32-1
- Update to 5.4.32
http://www.php.net/releases/5_4_32.php
- fix zts-php-config --php-binary output #1124605
+- fix segfault in php_wddx_serialize_var
+ upstream patch for https://bugs.php.net/67873
* Thu Jul 24 2014 Remi Collet <remi@fedoraproject.org> 5.4.31-1
- Update to 5.4.31