Update patches for 5.6.3+dfsg release

5 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/fpm-config.patch b/debian/patches/fpm-config.patch
index e64c60a7a..129df4969 100644
--- a/debian/patches/fpm-config.patch
+++ b/debian/patches/fpm-config.patch
@@ -43,7 +43,7 @@ Last-Update: 2010-07-30
  ; Start a new pool named 'www'.
  ; the variable $pool can we used in any directive and will be replaced by the
  ; pool name ('www' here)
-@@ -466,7 +470,7 @@ pm.max_spare_servers = 3
+@@ -468,7 +472,7 @@ pm.max_spare_servers = 3
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/debian/patches/lp564920-fix-big-files.patch b/debian/patches/lp564920-fix-big-files.patch
index 2487db488..3a3d3ef4f 100644
--- a/debian/patches/lp564920-fix-big-files.patch
+++ b/debian/patches/lp564920-fix-big-files.patch
@@ -5,7 +5,7 @@ Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/php5/+bug/564920
 
 --- php5.orig/main/streams/plain_wrapper.c
 +++ php5/main/streams/plain_wrapper.c
-@@ -627,7 +627,13 @@ static int php_stdiop_set_option(php_str
+@@ -655,7 +655,13 @@ static int php_stdiop_set_option(php_str
  				
  				switch (value) {
  					case PHP_STREAM_MMAP_SUPPORTED:
diff --git a/debian/patches/php-5.6.0-noNO.patch b/debian/patches/php-5.6.0-noNO.patch
index c32dd1bc4..7285b2558 100644
--- a/debian/patches/php-5.6.0-noNO.patch
+++ b/debian/patches/php-5.6.0-noNO.patch
@@ -1,6 +1,6 @@
 --- php5.orig/ext/standard/tests/strings/setlocale_variation2.phpt
 +++ php5/ext/standard/tests/strings/setlocale_variation2.phpt
-@@ -52,6 +52,7 @@ $all_system_locales = list_system_locale
+@@ -55,6 +55,7 @@ $all_system_locales = list_system_locale
  //try different locale names	
  $failure_locale = array();
  $success_count = 0;
@@ -8,7 +8,7 @@
  
  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 @@ foreach($all_system_locales as $value){
+@@ -64,6 +65,10 @@ foreach($all_system_locales as $value){
    if(setlocale(LC_ALL,$value )){
     $success_count++;
    }
@@ -19,7 +19,7 @@
    else{
     //failure values are put in to an array $failure_locale
     $failure_locale[] = $value;
-@@ -69,11 +74,11 @@ foreach($all_system_locales as $value){
+@@ -72,11 +77,11 @@ foreach($all_system_locales as $value){
  
  echo "No of locales found on the machine = ".count($all_system_locales)."\n";
  echo "No of setlocale() success = ".$success_count."\n";
@@ -33,7 +33,7 @@
    echo "FAILED\n";
    echo "Names of locale() for which setlocale() failed ...\n";
    var_dump($failure_locale);
-@@ -89,6 +94,6 @@ echo "Done\n";
+@@ -92,6 +97,6 @@ echo "Done\n";
  -- Test setlocale() with all available locale in the system --
  No of locales found on the machine = %d
  No of setlocale() success = %d
diff --git a/debian/patches/php-fpm-getallheaders.patch b/debian/patches/php-fpm-getallheaders.patch
index de938153b..7e6a69897 100644
--- a/debian/patches/php-fpm-getallheaders.patch
+++ b/debian/patches/php-fpm-getallheaders.patch
@@ -18,7 +18,7 @@ Subject: [PATCH 1/2] getallheaders for php-fpm #62596
  #ifndef PHP_WIN32
  /* these globals used for forking children on unix systems */
  
-@@ -1535,8 +1537,89 @@ PHP_FUNCTION(fastcgi_finish_request) /*
+@@ -1546,8 +1548,89 @@ PHP_FUNCTION(fastcgi_finish_request) /*
  }
  /* }}} */
  
diff --git a/debian/patches/php-fpm-listen-on-unix-socket.patch b/debian/patches/php-fpm-listen-on-unix-socket.patch
index 045608ed9..ab5afe8b8 100644
--- a/debian/patches/php-fpm-listen-on-unix-socket.patch
+++ b/debian/patches/php-fpm-listen-on-unix-socket.patch
@@ -1,6 +1,6 @@
 --- php5.orig/sapi/fpm/php-fpm.conf.in
 +++ php5/sapi/fpm/php-fpm.conf.in
-@@ -160,7 +160,7 @@ group = @php_fpm_group@
+@@ -162,7 +162,7 @@ group = @php_fpm_group@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.