summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore9
-rw-r--r--failed.txt50
-rw-r--r--php-5.6.13-systzdata-v12.patch3
-rw-r--r--php-5.6.31-oci.patch73
-rw-r--r--php-upstream.patch24
-rw-r--r--php56.spec14
6 files changed, 117 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore
index 744ca7b..1ab5c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
-build*log
-tembed*
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/failed.txt b/failed.txt
index 402eedf..5568cb4 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,32 +1,32 @@
-===== 5.6.30 (2017-01-19)
+===== 5.6.31 (2017-07-06)
$ grep -r 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/el5i/build.log:Tests failed : 7
-/var/lib/mock/el5x/build.log:Tests failed : 2
-/var/lib/mock/el6i/build.log:Tests failed : 5
-/var/lib/mock/el6x/build.log:Tests failed : 0
-/var/lib/mock/el7x/build.log:Tests failed : 0
-/var/lib/mock/fc22i/build.log:Tests failed : 2
-/var/lib/mock/fc22x/build.log:Tests failed : 0
-/var/lib/mock/fc23i/build.log:Tests failed : 2
-/var/lib/mock/fc23x/build.log:Tests failed : 0
-/var/lib/mock/fc24i/build.log:Tests failed : 2
-/var/lib/mock/fc24x/build.log:Tests failed : 0
+/var/lib/mock/el6i/build.log:Tests failed : 6
+/var/lib/mock/el6x/build.log:Tests failed : 2
+/var/lib/mock/el7x/build.log:Tests failed : 2
+/var/lib/mock/fc23i/build.log:Tests failed : 6
+/var/lib/mock/fc23x/build.log:Tests failed : 6
+/var/lib/mock/fc24i/build.log:Tests failed : 1
+/var/lib/mock/fc24x/build.log:Tests failed : 1
-el5i, el5x
- openssl_error_string() tests [ext/openssl/tests/openssl_error_string_basic.phpt]
- sni_server [ext/openssl/tests/sni_server.phpt]
-el5i, el6i, fc22i, fc23i, fc24i
- Bug #53437 DateInterval unserialize bad data, 32 bit [ext/date/tests/bug53437_var3.phpt]
- ** Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt]
-el5i, el6i
- Test date_sunrise() function : usage variation - Passing high positive and negative float values to time argument. [ext/date/tests/date_sunrise_variation9.phpt]
- Test date_sunset() function : usage variation - Passing high positive and negative float values to time argument. [ext/date/tests/date_sunset_variation9.phpt]
- Test getdate() function : usage variation - Passing high positive and negative float values to timestamp. [ext/date/tests/getdate_variation7.phpt]
+el6i, el6x, el7x, fc23i, fc23x:
+ 4 Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-2.phpt]
+el6i, el6x, el7x, fc23i, fc23x, fc24i, fc24x:
+ 4 Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt]
+el6i:
+ 4 Test date_sunrise() function : usage variation - Passing high positive and negative float values to time argument. [ext/date/tests/date_sunrise_variation9.phpt]
+ 4 Test date_sunset() function : usage variation - Passing high positive and negative float values to time argument. [ext/date/tests/date_sunset_variation9.phpt]
+ 4 Test getdate() function : usage variation - Passing high positive and negative float values to timestamp. [ext/date/tests/getdate_variation7.phpt]
+ 1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
+fc23i, fc23x
+ 4 Bug #32086 (strtotime don't work in DST) [ext/date/tests/bug32086.phpt]
+ 4 Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-1.phpt]
+ 4 Bug #33415 [1] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-1.phpt]
+ 4 date_modify() function [1] [ext/date/tests/date_modify-1.phpt]
-* proc_open have erratic results... :(
-** #64146 known issue, no fix found
-*** test fixed upstream
+1 proc_open have erratic results... :(
+3 online test
+4 tzdata are no more updated upstream in security branch
diff --git a/php-5.6.13-systzdata-v12.patch b/php-5.6.13-systzdata-v12.patch
index 8981212..3ff2b0b 100644
--- a/php-5.6.13-systzdata-v12.patch
+++ b/php-5.6.13-systzdata-v12.patch
@@ -1,3 +1,6 @@
+# License: MIT
+# http://opensource.org/licenses/MIT
+
Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired.
diff --git a/php-5.6.31-oci.patch b/php-5.6.31-oci.patch
new file mode 100644
index 0000000..4c67b13
--- /dev/null
+++ b/php-5.6.31-oci.patch
@@ -0,0 +1,73 @@
+From 27d681435174433c3a9b0b8325361dfa383be0a6 Mon Sep 17 00:00:00 2001
+From: Christopher Jones <sixd@php.net>
+Date: Tue, 20 Jun 2017 16:00:22 +1000
+Subject: [PATCH] PDO_OCI: support IC 12.2 in configure option
+
+---
+ NEWS | 4 ++++
+ ext/pdo_oci/config.m4 | 38 ++++++++++++++++++++++++++------------
+ 2 files changed, 30 insertions(+), 12 deletions(-)
+
+diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
+index 34cfb13..7132a40 100755
+--- a/ext/pdo_oci/config.m4
++++ b/ext/pdo_oci/config.m4
+@@ -2,16 +2,31 @@ dnl $Id$
+ dnl config.m4 for extension pdo_oci
+ dnl vim:et:sw=2:ts=2:
+
+-SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped
++if test -z "$SED"; then
++ PHP_PDO_OCI_SED="sed";
++else
++ PHP_PDO_OCI_SED="$SED";
++fi
++
++PHP_PDO_OCI_TAIL1=`echo a | tail -n1 2>/dev/null`
++if test "$PHP_PDO_OCI_TAIL1" = "a"; then
++ PHP_PDO_OCI_TAIL1="tail -n1"
++else
++ PHP_PDO_OCI_TAIL1="tail -1"
++fi
++
+ AC_DEFUN([AC_PDO_OCI_VERSION],[
+ AC_MSG_CHECKING([Oracle version])
+- for OCI_VER in $SUPPORTED_LIB_VERS; do
+- if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
+- PDO_OCI_VERSION="$OCI_VER"
+- fi
+- done
+- if test -z "$PDO_OCI_VERSION"; then
+- AC_MSG_ERROR([Oracle required OCI8 libraries not found under $PDO_OCI_DIR])
++ PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
++ PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1` # Oracle 10g, 11g, 12c etc
++ if test -f "$PDO_OCI_LCS"; then
++ dnl Oracle 10g, 11g 12c etc. The x.2 version libraries are named x.1 for drop in compatibility
++ PDO_OCI_VERSION=`echo $PDO_OCI_LCS | $PHP_PDO_OCI_SED -e 's/.*\.\(.*\)\.1$/\1.1/'`
++ elif test -f $PDO_OCI_LCS_BASE.9.0; then
++ dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0 suffix for drop-in compatibility with Oracle 9.0
++ PDO_OCI_VERSION=9.0
++ else
++ AC_MSG_ERROR(Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9)
+ fi
+ AC_MSG_RESULT($PDO_OCI_VERSION)
+ ])
+@@ -147,12 +162,11 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
+ fi
+
+ case $PDO_OCI_VERSION in
+- 9.0|10.1|10.2|11.1|11.2|12.1)
+- PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
++ 7.3|8.0|8.1)
++ AC_MSG_ERROR(Unsupported Oracle version $PDO_OCI_VERSION)
+ ;;
+-
+ *)
+- AC_MSG_ERROR(Unsupported Oracle version $PDO_OCI_VERSION)
++ PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
+ ;;
+ esac
+
+--
+2.1.4
+
diff --git a/php-upstream.patch b/php-upstream.patch
deleted file mode 100644
index 16f00e6..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fb935fdaca0b1b65248c69315b1c21bd6857988c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 19 Jan 2017 07:37:28 +0100
-Subject: [PATCH] fix test for 32bits (int -> float)
-
----
- ext/standard/tests/serialize/bug72731.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/standard/tests/serialize/bug72731.phpt b/ext/standard/tests/serialize/bug72731.phpt
-index 3d7d1e7..020fb32 100644
---- a/ext/standard/tests/serialize/bug72731.phpt
-+++ b/ext/standard/tests/serialize/bug72731.phpt
-@@ -14,5 +14,5 @@ $poc = 'O:8:"stdClass":1:{i:0;O:3:"obj":1:{s:4:"ryat";R:1;}}';
- var_dump(unserialize($poc));
-
- ?>
----EXPECT--
--int(73588229205)
-+--EXPECTF--
-+%s(73588229205)
---
-2.9.3
-
diff --git a/php56.spec b/php56.spec
index 36d46b7..92930b6 100644
--- a/php56.spec
+++ b/php56.spec
@@ -31,7 +31,7 @@
%ifarch ppc ppc64
%global oraclever 10.2.0.2
%else
-%global oraclever 12.1
+%global oraclever 12.2
%endif
# Build for LiteSpeed Web Server (LSAPI)
@@ -144,11 +144,11 @@
%endif
#global rcver RC1
-%global rpmrel 3
+%global rpmrel 1
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.6.30
+Version: 5.6.31
%if 0%{?rcver:1}
Release: 0.%{rpmrel}.%{rcver}%{?dist}
%else
@@ -210,7 +210,7 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-5.6.3-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-upstream.patch
+Patch100: php-5.6.31-oci.patch
# Security fixes (200+)
@@ -969,7 +969,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .upstream
+%patch100 -p1 -b .pdo_oci
# security patches
@@ -2000,6 +2000,10 @@ fi
%changelog
+* Thu Jul 6 2017 Remi Collet <remi@fedoraproject.org> 5.6.31-1
+- Update to 5.6.31 - http://www.php.net/releases/5_6_31.php
+- use oracle instant client version 12.2
+
* Tue Mar 21 2017 Remi Collet <remi@remirepo.net> - 5.6.30-3
- add patch for tests with tzdata 2017.1
generated by cgit (git 2.34.1) at 2025-11-04 07:52:57 +0000