Skip to content

Commit

Permalink
PHP 7.0.7RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
@remicollet
remicollet committed May 12, 2016
1 parent 120dc15 commit 87954ef
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 46 deletions.
10 changes: 5 additions & 5 deletions php/php70/failed.txt
View file
@@ -1,4 +1,4 @@
===== 7.0.6 (2016-04-28)
===== 7.0.7RC1 (2016-05-12)

$ grep -r 'Tests failed' /var/lib/mock/*/build.log

Expand All @@ -10,17 +10,17 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/fc22i/build.log:Tests failed : 0
/var/lib/mock/fc22x/build.log:Tests failed : 0
/var/lib/mock/fc23i/build.log:Tests failed : 0
/var/lib/mock/fc23x/build.log:Tests failed : 0
/var/lib/mock/fc24i/build.log:Tests failed : 1
/var/lib/mock/fc23x/build.log:Tests failed : 1
/var/lib/mock/fc24i/build.log:Tests failed : 0
/var/lib/mock/fc24x/build.log:Tests failed : 0


el6i, el6x, el7x
Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-2.phpt]
el6x, el7x
strtotime() function (64 bit) [ext/date/tests/strtotime3-64bit.phpt]
fc24i
* Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
fc23x
* Test session_set_save_handler() function : basic functionality [ext/session/tests/session_set_save_handler_basic.phpt]



Expand Down
14 changes: 0 additions & 14 deletions php/php70/php-5.5.30-curl.patch
View file

This file was deleted.

15 changes: 15 additions & 0 deletions php/php70/php-7.0.7-curl.patch
View file
@@ -0,0 +1,15 @@
diff -up php-7.0.7RC1/ext/curl/interface.c.curltls php-7.0.7RC1/ext/curl/interface.c
--- php-7.0.7RC1/ext/curl/interface.c.curltls 2016-05-10 17:28:33.000000000 +0200
+++ php-7.0.7RC1/ext/curl/interface.c 2016-05-12 07:43:00.900419946 +0200
@@ -1257,7 +1257,11 @@ PHP_MINIT_FUNCTION(curl)

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
REGISTER_CURL_CONSTANT(CURLOPT_LOGIN_OPTIONS);
+#endif

+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 (in upstream curl 7.34)
+ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136
+ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0);
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1);
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2);
14 changes: 9 additions & 5 deletions php/php70/php70.spec
View file
Expand Up @@ -15,7 +15,7 @@
# Extension version
%global fileinfover 1.0.5
%global opcachever 7.0.6-dev
%global oci8ver 2.1.0
%global oci8ver 2.1.1
%global zipver 1.13.0
%global jsonver 1.4.0

Expand Down Expand Up @@ -121,12 +121,12 @@
%global db_devel libdb-devel
%endif

#global rcver RC1
%global rpmrel 3
%global rcver RC1
%global rpmrel 1

Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 7.0.6
Version: 7.0.7
Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
Expand Down Expand Up @@ -160,7 +160,7 @@ Patch5: php-7.0.0-includedir.patch
Patch6: php-5.6.3-embed.patch
Patch7: php-5.3.0-recode.patch
Patch8: php-7.0.2-libdb.patch
Patch9: php-5.5.30-curl.patch
Patch9: php-7.0.7-curl.patch

# Functional changes
Patch40: php-7.0.0-dlopen.patch
Expand Down Expand Up @@ -1997,6 +1997,10 @@ fi


%changelog
* Thu May 12 2016 Remi Collet <remi@fedoraproject.org> 7.0.7-0.1.RC1
- Update to 7.0.7RC1
- oci8 version is now 2.1.1

* Thu Apr 28 2016 Remi Collet <remi@fedoraproject.org> 7.0.6-3
- Update to 7.0.6 - http://www.php.net/releases/7_0_6.php
- rebuild for new sources
Expand Down
8 changes: 5 additions & 3 deletions scl-php70/php/failed.txt
View file
@@ -1,17 +1,19 @@
===== 7.0.6 (2016-04-28)
===== 7.0.7RC1 (2016-05-12)

$ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log

/var/lib/mock/scl70el6x/build.log:Tests failed : 2
/var/lib/mock/scl70el7x/build.log:Tests failed : 2
/var/lib/mock/scl70el7x/build.log:Tests failed : 3
/var/lib/mock/scl70fc21x/build.log:Tests failed : 0
/var/lib/mock/scl70fc22x/build.log:Tests failed : 0
/var/lib/mock/scl70fc23x/build.log:Tests failed : 0
/var/lib/mock/scl70fc24x/build.log:Tests failed : 0

el6x, el7x, fc20x
el6x, el7x
Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-2.phpt]
strtotime() function (64 bit) [ext/date/tests/strtotime3-64bit.phpt]
el7x:
* Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]


* proc_open give erratic test results :(
Expand Down
14 changes: 0 additions & 14 deletions scl-php70/php/php-5.5.30-curl.patch
View file

This file was deleted.

15 changes: 15 additions & 0 deletions scl-php70/php/php-7.0.7-curl.patch
View file
@@ -0,0 +1,15 @@
diff -up php-7.0.7RC1/ext/curl/interface.c.curltls php-7.0.7RC1/ext/curl/interface.c
--- php-7.0.7RC1/ext/curl/interface.c.curltls 2016-05-10 17:28:33.000000000 +0200
+++ php-7.0.7RC1/ext/curl/interface.c 2016-05-12 07:43:00.900419946 +0200
@@ -1257,7 +1257,11 @@ PHP_MINIT_FUNCTION(curl)

#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
REGISTER_CURL_CONSTANT(CURLOPT_LOGIN_OPTIONS);
+#endif

+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 (in upstream curl 7.34)
+ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136
+ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0);
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1);
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2);
14 changes: 9 additions & 5 deletions scl-php70/php/php.spec
View file
Expand Up @@ -27,7 +27,7 @@
%global pdover 20150127
# Extension version
%global opcachever 7.0.6-dev
%global oci8ver 2.1.0
%global oci8ver 2.1.1

# Adds -z now to the linker flags
%global _hardened_build 1
Expand Down Expand Up @@ -125,13 +125,13 @@
%global db_devel libdb-devel
%endif

#global rcver RC1
%global rpmrel 3
%global rcver RC1
%global rpmrel 1


Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: 7.0.6
Version: 7.0.7
Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
Expand Down Expand Up @@ -166,7 +166,7 @@ Patch5: php-7.0.0-includedir.patch
Patch6: php-5.6.3-embed.patch
Patch7: php-5.3.0-recode.patch
Patch8: php-7.0.2-libdb.patch
Patch9: php-5.5.30-curl.patch
Patch9: php-7.0.7-curl.patch

# Functional changes
Patch40: php-7.0.0-dlopen.patch
Expand Down Expand Up @@ -1827,6 +1827,10 @@ fi


%changelog
* Thu May 12 2016 Remi Collet <remi@fedoraproject.org> 7.0.7-0.1.RC1
- Update to 7.0.7RC1
- oci8 version is now 2.1.1

* Thu Apr 28 2016 Remi Collet <remi@fedoraproject.org> 7.0.6-3
- Update to 7.0.6 - http://www.php.net/releases/7_0_6.php
- rebuild for new sources
Expand Down

0 comments on commit 87954ef

Please sign in to comment.