diff --git a/.gitignore b/.gitignore index ca1ad14..4ea081d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ php-5.5.*.xz /php-5.6.8-strip.tar.xz /php-5.6.9RC1-strip.tar.xz /php-5.6.9-strip.tar.xz +/php-5.6.10RC1-strip.tar.xz diff --git a/php-5.6.8-openssltests.patch b/php-5.6.8-openssltests.patch deleted file mode 100644 index a989ac7..0000000 --- a/php-5.6.8-openssltests.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 32484e3f5fc04f127199399a0ee52594912fa66a Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf -Date: Wed, 8 Apr 2015 09:55:55 -0700 -Subject: [PATCH] Remove SSLv3 test dependencies SSLv3 is going away. Debian8 - already ships with an openssl with no SSLv3 support which was causing these - tests to fail. - ---- - ext/openssl/tests/session_meta_capture.phpt | 6 ------ - ext/openssl/tests/stream_crypto_flags_001.phpt | 4 ---- - ext/openssl/tests/stream_crypto_flags_003.phpt | 6 +----- - ext/openssl/tests/streams_crypto_method.phpt | 3 ++- - 4 files changed, 3 insertions(+), 16 deletions(-) - -diff --git a/ext/openssl/tests/session_meta_capture.phpt b/ext/openssl/tests/session_meta_capture.phpt -index f1f9610..a09d7e8 100644 ---- a/ext/openssl/tests/session_meta_capture.phpt -+++ b/ext/openssl/tests/session_meta_capture.phpt -@@ -35,11 +35,6 @@ - - phpt_wait(); - -- stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); -- stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); -- $meta = stream_context_get_options($clientCtx)['ssl']['session_meta']; -- var_dump($meta['protocol']); -- - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); - stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx); - $meta = stream_context_get_options($clientCtx)['ssl']['session_meta']; -@@ -59,7 +54,6 @@ CODE; - include 'ServerClientTestCase.inc'; - ServerClientTestCase::getInstance()->run($clientCode, $serverCode); - --EXPECTF-- --string(5) "SSLv3" - string(5) "TLSv1" - string(7) "TLSv1.1" - string(7) "TLSv1.2" -diff --git a/ext/openssl/tests/stream_crypto_flags_001.phpt b/ext/openssl/tests/stream_crypto_flags_001.phpt -index f988886..1ba9309 100644 ---- a/ext/openssl/tests/stream_crypto_flags_001.phpt -+++ b/ext/openssl/tests/stream_crypto_flags_001.phpt -@@ -32,9 +32,6 @@ $clientCode = <<<'CODE' - - phpt_wait(); - -- stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); -- var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); -- - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - -@@ -47,4 +44,3 @@ ServerClientTestCase::getInstance()->run($clientCode, $serverCode); - --EXPECTF-- - resource(%d) of type (stream) - resource(%d) of type (stream) --resource(%d) of type (stream) -diff --git a/ext/openssl/tests/stream_crypto_flags_003.phpt b/ext/openssl/tests/stream_crypto_flags_003.phpt -index 30ca7a7..28cb640 100644 ---- a/ext/openssl/tests/stream_crypto_flags_003.phpt -+++ b/ext/openssl/tests/stream_crypto_flags_003.phpt -@@ -13,7 +13,7 @@ $serverCode = <<<'CODE' - $serverCtx = stream_context_create(['ssl' => [ - 'local_cert' => __DIR__ . '/bug54992.pem', - -- // Only accept SSLv3 and TLSv1.2 connections -+ // Only accept TLSv1.2 connections - 'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_SERVER | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER, - ]]); - -@@ -40,9 +40,6 @@ $clientCode = <<<'CODE' - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT); - var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - -- stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_SSLv3_CLIENT); -- var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); -- - stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT); - var_dump(@stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx)); - -@@ -54,7 +51,6 @@ include 'ServerClientTestCase.inc'; - ServerClientTestCase::getInstance()->run($clientCode, $serverCode); - --EXPECTF-- - resource(%d) of type (stream) --resource(%d) of type (stream) - bool(false) - bool(false) - -diff --git a/ext/openssl/tests/streams_crypto_method.phpt b/ext/openssl/tests/streams_crypto_method.phpt -index 84f7934..f8ec864 100644 ---- a/ext/openssl/tests/streams_crypto_method.phpt -+++ b/ext/openssl/tests/streams_crypto_method.phpt -@@ -4,6 +4,7 @@ Specific crypto method for ssl:// transports. - [ -- 'crypto_method' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT, -+ 'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT, - 'verify_peer' => false, - 'verify_peer_name' => false - ]]); --- -2.1.4 - diff --git a/php.spec b/php.spec index 26b17ba..1355064 100644 --- a/php.spec +++ b/php.spec @@ -3,7 +3,7 @@ %global zendver 20131226 %global pdover 20080721 # Extension version -%global opcachever 7.0.4-dev +%global opcachever 7.0.6-dev # Use for first build of PHP (before pecl/zip and pecl/jsonc) %global php_bootstrap 0 @@ -57,12 +57,12 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 5.6.9 +Version: 5.6.10 %if 0%{?rcver:1} Release: 0.%{rpmrel}.%{rcver}%{?dist} %else @@ -124,8 +124,6 @@ Patch47: php-5.6.3-phpinfo.patch # Fixes for tests (300+) # Factory is droped from system tzdata Patch300: php-5.6.3-datetests.patch -# Backported from 7.0 -Patch302: php-5.6.8-openssltests.patch BuildRequires: bzip2-devel, curl-devel >= 7.9 @@ -728,7 +726,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 # Fixes for tests %patch300 -p1 -b .datetests -%patch302 -p1 -b .sslv3 # Prevent %%doc confusion over LICENSE files @@ -1483,6 +1480,10 @@ rm -f README.{Zeus,QNX,CVS-RULES} %changelog +* Thu May 28 2015 Remi Collet 5.6.10-0.1.RC1 +- update to 5.6.10RC1 +- opcache is now 7.0.6-dev + * Fri May 15 2015 Remi Collet 5.6.9-1 - Update to 5.6.9 http://www.php.net/releases/5_6_9.php diff --git a/sources b/sources index b8e7ec7..8c0125a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dbf034685ce856f2aa3c70a9a707f9f5 php-5.6.9-strip.tar.xz +fa9c702cfedb76c5d235fe44e5ba047e php-5.6.10RC1-strip.tar.xz