From b1dc4792f5abc0b42c72b9a5d579abe3246cb4d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Mar 2014 14:35:08 +0100 Subject: php-5.6.0-0.4.201403261230 (test build) --- opcache.ini | 2 +- php-5.5.10-pcre834.patch | 55 ------------------------------------------------ php-5.6.0-oldpcre.patch | 39 ++++++++++++++++++++++++++++++++++ php.ini | 30 ++++++++++++++++++++------ php56.spec | 17 +++++++++------ 5 files changed, 75 insertions(+), 68 deletions(-) delete mode 100644 php-5.5.10-pcre834.patch create mode 100644 php-5.6.0-oldpcre.patch diff --git a/opcache.ini b/opcache.ini index 0b85b67..fb3e9a9 100644 --- a/opcache.ini +++ b/opcache.ini @@ -39,7 +39,7 @@ opcache.max_accelerated_files=4000 ;opcache.revalidate_path=0 ; If disabled, all PHPDoc comments are dropped from the code to reduce the - ;size of the optimized code. +; size of the optimized code. ;opcache.save_comments=1 ; If disabled, PHPDoc comments are not loaded from SHM, so "Doc Comments" diff --git a/php-5.5.10-pcre834.patch b/php-5.5.10-pcre834.patch deleted file mode 100644 index 636d60b..0000000 --- a/php-5.5.10-pcre834.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ab32d36ec65c17b3f890d488d30eb3a8ba012812 Mon Sep 17 00:00:00 2001 -From: Anatol Belski -Date: Tue, 4 Feb 2014 10:34:11 +0100 -Subject: [PATCH] pcre tests go with 8.34 upgrade - ---- - ext/pcre/tests/bug37911.phpt | 2 +- - ext/pcre/tests/grep2.phpt | 10 ++++++++-- - ext/pcre/tests/match_flags3.phpt | 2 +- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/ext/pcre/tests/bug37911.phpt b/ext/pcre/tests/bug37911.phpt -index f788119..2b7481a 100644 ---- a/ext/pcre/tests/bug37911.phpt -+++ b/ext/pcre/tests/bug37911.phpt -@@ -37,5 +37,5 @@ array(3) { - string(4) "blub" - } - --Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line 14 -+Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d - NULL -diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt -index 0cf8d4a..1a8476c 100644 ---- a/ext/pcre/tests/grep2.phpt -+++ b/ext/pcre/tests/grep2.phpt -@@ -40,6 +40,12 @@ array(1) { - string(1) "1" - } - bool(true) --array(0) { -+array(3) { -+ [5]=> -+ string(1) "a" -+ ["xyz"]=> -+ string(2) "q6" -+ [6]=> -+ string(3) "h20" - } --bool(true) -+bool(false) -diff --git a/ext/pcre/tests/match_flags3.phpt b/ext/pcre/tests/match_flags3.phpt -index f22205e..84deb0b 100644 ---- a/ext/pcre/tests/match_flags3.phpt -+++ b/ext/pcre/tests/match_flags3.phpt -@@ -42,5 +42,5 @@ array(1) { - } - } - --Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line 14 -+Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d - bool(false) --- -1.8.4.3 - diff --git a/php-5.6.0-oldpcre.patch b/php-5.6.0-oldpcre.patch new file mode 100644 index 0000000..df6edb2 --- /dev/null +++ b/php-5.6.0-oldpcre.patch @@ -0,0 +1,39 @@ +diff -up ./ext/pcre/tests/bug37911.phpt.pcre834 ./ext/pcre/tests/bug37911.phpt +--- ./ext/pcre/tests/bug37911.phpt.pcre834 2014-03-26 14:10:18.285452752 +0100 ++++ ./ext/pcre/tests/bug37911.phpt 2014-03-26 14:10:40.028526763 +0100 +@@ -37,5 +37,5 @@ array(3) { + string(4) "blub" + } + +-Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d ++Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line %d + NULL +diff -up ./ext/pcre/tests/grep2.phpt.pcre834 ./ext/pcre/tests/grep2.phpt +--- ./ext/pcre/tests/grep2.phpt.pcre834 2014-03-26 14:08:26.583072531 +0100 ++++ ./ext/pcre/tests/grep2.phpt 2014-03-26 14:09:09.345218089 +0100 +@@ -40,12 +40,6 @@ array(1) { + string(1) "1" + } + bool(true) +-array(3) { +- [5]=> +- string(1) "a" +- ["xyz"]=> +- string(2) "q6" +- [6]=> +- string(3) "h20" ++array(0) { + } +-bool(false) ++bool(true) +diff -up ./ext/pcre/tests/match_flags3.phpt.pcre834 ./ext/pcre/tests/match_flags3.phpt +--- ./ext/pcre/tests/match_flags3.phpt.pcre834 2014-03-26 14:06:48.792739665 +0100 ++++ ./ext/pcre/tests/match_flags3.phpt 2014-03-26 14:07:31.820886128 +0100 +@@ -42,5 +42,5 @@ array(1) { + } + } + +-Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d ++Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line %d + bool(false) +diff -up ./ext/standard/tests/strings/setlocale_variation2.phpt.pcre834 ./ext/standard/tests/strings/setlocale_variation2.phpt diff --git a/php.ini b/php.ini index bc53066..ec66ee5 100644 --- a/php.ini +++ b/php.ini @@ -908,15 +908,15 @@ cli_server.color = On ;filter.default_flags = [iconv] -; Use of this INI entory is deprecated, use global input_encoding instead. +; Use of this INI entry is deprecated, use global input_encoding instead. ; If empty, input_encoding is used. ;iconv.input_encoding = -; Use of this INI entory is deprecated, use global internal_encoding instead. +; Use of this INI entry is deprecated, use global internal_encoding instead. ; If empty, internal_encoding is used. ;iconv.internal_encoding = -; Use of this INI entory is deprecated, use global output_encoding instead. +; Use of this INI entry is deprecated, use global output_encoding instead. ; If empty, output_encoding is used. ;iconv.output_encoding = @@ -1654,21 +1654,21 @@ mssql.secure_connection = Off ; http://php.net/mbstring.language ;mbstring.language = Japanese -; Use of this INI entory is deprecated, use global internal_encoding instead. +; Use of this INI entry is deprecated, use global internal_encoding instead. ; internal/script encoding. ; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*) ; If empty, default_charset or internal_encoding is used in order. ; http://php.net/mbstring.internal-encoding ;mbstring.internal_encoding = -; Use of this INI entory is deprecated, use global input_encoding instead. +; Use of this INI entry is deprecated, use global input_encoding instead. ; http input encoding. ; If empty, input_encoding is used. ; mbstring.encoding_traslation = On is needed to use this setting. ; http://php.net/mbstring.http-input ;mbstring.http_input = -; Use of this INI entory is deprecated, use global output_encoding instead. +; Use of this INI entry is deprecated, use global output_encoding instead. ; http output encoding. ; mb_output_handler must be registered as output buffer to function. ; If empty, output_encoding is used. @@ -1803,6 +1803,24 @@ ldap.max_links = -1 ; absolute path. ;curl.cainfo = +[openssl] +; The location of a Certificate Authority (CA) file on the local filesystem +; to use when verifying the identity of SSL/TLS peers. Most users should +; not specify a value for this directive as PHP will attempt to use the +; OS-managed cert stores in its absence. If specified, this value may still +; be overridden on a per-stream basis via the "cafile" SSL stream context +; option. +;openssl.cafile= + +; If openssl.cafile is not specified or if the CA file is not found, the +; directory pointed to by openssl.capath is searched for a suitable +; certificate. This value must be a correctly hashed certificate directory. +; Most users should not specify a value for this directive as PHP will +; attempt to use the OS-managed cert stores in its absence. If specified, +; this value may still be overridden on a per-stream basis via the "capath" +; SSL stream context option. +;openssl.capath= + ; Local Variables: ; tab-width: 4 ; End: diff --git a/php56.spec b/php56.spec index 4b529fe..9a581b2 100644 --- a/php56.spec +++ b/php56.spec @@ -4,7 +4,7 @@ %global pdover 20080721 # Extension version %global opcachever 7.0.4-dev -%global oci8ver 2.0.8 +%global oci8ver 2.0.9 # Use for first build of PHP (before pecl/zip and pecl/jsonc) %global php_bootstrap 0 @@ -113,14 +113,14 @@ %global db_devel libdb-devel %endif -%global snapdate 201403170630 +%global snapdate 201403261230 #global rcver alpha3 Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.6.0 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.3.%{?snapdate}%{?rcver}%{?dist} +Release: 0.4.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -185,8 +185,8 @@ Patch91: php-5.3.7-oci8conf.patch # Security fixes (200+) # Fixes for tests (300+) -# Revert change for pcre 8.34 -Patch301: php-5.5.10-pcre834.patch +# Revert changes for pcre < 8.34 +Patch301: php-5.6.0-oldpcre.patch # WIP @@ -910,7 +910,7 @@ rm -rf ext/json %if %{with_libpcre} %if 0%{?fedora} < 21 # Only apply when system libpcre < 8.34 -#patch301 -p1 -R -b .pcre84 +%patch301 -p1 -b .pcre834 %endif %endif @@ -1898,6 +1898,11 @@ fi %changelog +* Wed Mar 26 2014 Remi Collet 5.6.0-0.4.201403261230 +- new snapshot php5.6-201403261230 +- oci8 version 2.0.9 +- opcache version 7.0.4-dev + * Mon Mar 17 2014 Remi Collet 5.6.0-0.4.201403170630 - new snapshot php5.6-201403170630 -- cgit