[php/f20] add upstream patch for #67605

[Remi Collet]

commit bd156d288ed98a9ebb209bb925e8dbbd9675ec0e
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jul 16 13:28:56 2014 +0200

    add upstream patch for #67605

 .gitignore     |    1 +
 php-intl.patch |   20 ++++++++++++++++++++
 php.spec       |    7 ++++++-
 3 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85ef6fc..5b116fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ clog
 php.spec~
 php-5.3.*.bz2
 php-5.4.*.bz2
+php-5.6.*.xz
 /php-5.5.0beta1.tar.xz
 /php-5.5.0beta2.tar.xz
 /php-5.5.0beta3.tar.xz
diff --git a/php-intl.patch b/php-intl.patch
new file mode 100644
index 0000000..182e2ef
--- /dev/null
+++ b/php-intl.patch
@@ -0,0 +1,20 @@
+--- php-5.5.14/ext/intl/locale/locale_methods.c	2014-06-25 15:06:23.000000000 +0200
++++ php-5.5.15RC1/ext/intl/locale/locale_methods.c	2014-07-08 23:55:31.000000000 +0200
+@@ -279,7 +279,7 @@
+ 	if( fromParseLocale==1 ){
+ 		/* Handle singletons */
+ 		if( strcmp(tag_name , LOC_LANG_TAG)==0 ){
+-			if( strlen(loc_name)>1 && isIDPrefix(loc_name) ){
++			if( strlen(loc_name)>1 && (isIDPrefix(loc_name) == 1) ){
+ 				return estrdup(loc_name);
+ 			}
+ 		}
+@@ -506,7 +506,7 @@
+     }
+ 
+ 	if(loc_name_len == 0) {
+-		loc_name = INTL_G(default_locale);
++		loc_name = intl_locale_get_default(TSRMLS_C);
+ 	}
+ 
+ 	if( strcmp(tag_name, DISP_NAME) != 0 ){
diff --git a/php.spec b/php.spec
index ee912cd..af00c86 100644
--- a/php.spec
+++ b/php.spec
@@ -69,7 +69,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.5.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -121,6 +121,7 @@ Patch46: php-5.4.9-fixheader.patch
 Patch47: php-5.4.9-phpinfo.patch
 
 # Upstream fixes (100+)
+Patch100: php-intl.patch
 
 # Security fixes (200+)
 
@@ -731,6 +732,7 @@ support for using the enchant library to PHP.
 %patch47 -p1 -b .phpinfo
 
 # upstream patches
+%patch100 -p1 -b .intl
 
 # security patches
 
@@ -1552,6 +1554,9 @@ exit 0
 
 
 %changelog
+* Wed Jul 16 2014 Remi Collet <remi at fedoraproject.org> 5.5.14-2
+- add upstream patch for #67605
+
 * 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