[php/f19] update to 5.5.14

[Remi Collet]

commit c3a79f94c67e11b7aa440085027b17001b8fcad8
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Jun 26 07:29:05 2014 +0200

    update to 5.5.14
    
    (cherry picked from commit eef3a7cd1183347b17f0a0580d2656cc5e7bb841)

 .gitignore            |    1 +
 php-5.5.14-noNO.patch |   43 +++++++++++++
 php-bug67326.patch    |   32 ----------
 php-reg67072.patch    |   68 --------------------
 php-reg67118.patch    |  166 -------------------------------------------------
 php.spec              |   22 ++++---
 sources               |    2 +-
 7 files changed, 59 insertions(+), 275 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index adfef4c..85ef6fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ php-5.4.*.bz2
 /php-5.5.11-strip.tar.xz
 /php-5.5.12-strip.tar.xz
 /php-5.5.13-strip.tar.xz
+/php-5.5.14-strip.tar.xz
diff --git a/php-5.5.14-noNO.patch b/php-5.5.14-noNO.patch
new file mode 100644
index 0000000..52f54ab
--- /dev/null
+++ b/php-5.5.14-noNO.patch
@@ -0,0 +1,43 @@
+--- ext/standard/tests/strings/setlocale_variation2.phpt.orig	2014-06-11 16:10:00.259326468 +0200
++++ ext/standard/tests/strings/setlocale_variation2.phpt	2014-06-11 16:16:14.396138997 +0200
+@@ -52,6 +52,7 @@
+ //try different locale names	
+ $failure_locale = array();
+ $success_count = 0;
++$expected = 0;
+ 
+ echo "-- Test setlocale() with all available locale in the system --\n";
+ // gather all locales installed in the system(stored $all_system_locales),
+@@ -61,6 +62,10 @@
+   if(setlocale(LC_ALL,$value )){
+    $success_count++;
+   }
++  else if ($value == 'no_NO.ISO-8859-1') {
++    // ignore this one, see rhbz #971416
++   $expected++;
++  }
+   else{
+    //failure values are put in to an array $failure_locale
+    $failure_locale[] = $value;
+@@ -69,11 +74,11 @@
+ 
+ echo "No of locales found on the machine = ".count($all_system_locales)."\n";
+ echo "No of setlocale() success = ".$success_count."\n";
+-echo "Expected no of failures = 0\n";
++echo "Expected no of failures = $expected\n";
+ echo "Test ";
+ // check if there were any failure of setlocale() function earlier, if any 
+ // failure then dump the list of failing locales
+-if($success_count != count($all_system_locales)){
++if(($success_count + $expected) != count($all_system_locales)){
+   echo "FAILED\n";
+   echo "Names of locale() for which setlocale() failed ...\n";
+   var_dump($failure_locale);
+@@ -89,6 +94,6 @@
+ -- Test setlocale() with all available locale in the system --
+ No of locales found on the machine = %d
+ No of setlocale() success = %d
+-Expected no of failures = 0
++Expected no of failures = %d
+ Test PASSED
+ Done
diff --git a/php.spec b/php.spec
index 84e3108..94cfad4 100644
--- a/php.spec
+++ b/php.spec
@@ -68,8 +68,8 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.5.13
-Release: 3%{?dist}
+Version: 5.5.14
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -121,15 +121,14 @@ Patch46: php-5.4.9-fixheader.patch
 Patch47: php-5.4.9-phpinfo.patch
 
 # Upstream fixes (100+)
-Patch100: php-reg67072.patch
-Patch101: php-bug67326.patch
-Patch102: php-reg67118.patch
 
 # Security fixes (200+)
 
 # Fixes for tests (300+)
 # Revert changes for pcre 8.34
 Patch301: php-5.5.10-pcre834.patch
+# see https://bugzilla.redhat.com/971416
+Patch302: php-5.5.14-noNO.patch
 
 
 BuildRequires: bzip2-devel, curl-devel >= 7.9
@@ -731,14 +730,16 @@ support for using the enchant library to PHP.
 %patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 
-%patch100 -p1 -b .reg67072
-%patch101 -p1 -b .bug67326
-%patch102 -p1 -b .reg67118
+# upstream patches
 
+# security patches
+
+# Fixes for tests
 %if 0%{?fedora} < 21
 # Only revert when system libpcre < 8.34
 %patch301 -p1 -R -b .pcre84
 %endif
+%patch302 -p0 -b .971416
 
 
 # Prevent %%doc confusion over LICENSE files
@@ -1549,6 +1550,11 @@ exit 0
 
 
 %changelog
+* Thu Jun 26 2014 Remi Collet <rcollet at redhat.com> 5.5.14-1
+- Update to 5.5.14
+  http://www.php.net/releases/5_5_14.php
+- fix test for rhbz #971416
+
 * Thu Jun  5 2014 Remi Collet <rcollet at redhat.com> 5.5.13-3
 - fix regression introduce in fix for #67118
 
diff --git a/sources b/sources
index 5e1b4e4..e04b5e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76f198cf4f9a601141e995e8d7596583  php-5.5.13-strip.tar.xz
+894476ae960b15f58b4c7482aafe84ad  php-5.5.14-strip.tar.xz