[Pkg-php-commits] [php/debian-sid] Fix the locale name in some tests (Closes: #573511)

[Raphael Geissert]

---
 debian/patches/fix_broken_locale_tests.patch |   29 ++++++++++++++++++++++++++
 debian/patches/series                        |    1 +
 2 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/fix_broken_locale_tests.patch

diff --git a/debian/patches/fix_broken_locale_tests.patch b/debian/patches/fix_broken_locale_tests.patch
new file mode 100644
index 0000000..43c7e7a
--- /dev/null
+++ b/debian/patches/fix_broken_locale_tests.patch
@@ -0,0 +1,29 @@
+Description: Backport upstream fix for tests with incorrect locale name
+Origin: upstream
+
+Index: php/ext/standard/tests/strings/strtolower.phpt
+===================================================================
+--- php.orig/ext/standard/tests/strings/strtolower.phpt
++++ php/ext/standard/tests/strings/strtolower.phpt
+@@ -22,7 +22,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') {
+ if( substr(PHP_OS, 0, 3) == 'WIN') {
+   setlocale(LC_ALL, 'C');
+ } else {
+-  setlocale(LC_ALL, 'en-US.UTF-8');
++  setlocale(LC_ALL, 'en_US.UTF-8');
+ }
+ 
+ echo "*** Testing strtolower() with all 256 chars ***\n";
+Index: php/ext/standard/tests/strings/strtoupper1.phpt
+===================================================================
+--- php.orig/ext/standard/tests/strings/strtoupper1.phpt
++++ php/ext/standard/tests/strings/strtoupper1.phpt
+@@ -22,7 +22,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') {
+ if( substr(PHP_OS, 0, 3) == 'WIN') {
+   setlocale(LC_ALL, 'C');
+ } else {
+-  setlocale(LC_ALL, 'en-US.UTF-8');
++  setlocale(LC_ALL, 'en_US.UTF-8');
+ }
+ 
+ echo "*** Testing strtoupper() with all 256 chars ***\n";
diff --git a/debian/patches/series b/debian/patches/series
index 1f36cc1..289a670 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@ fix_var_dump_64bit.phpt.patch
 use_embedded_timezonedb_fixes.patch
 fix_broken_sha2_test.patch
 php_crypt_revamped.patch
+fix_broken_locale_tests.patch
-- 
1.6.3.3