[Pkg-php-commits] [php/debian-sid] one more quilt refresh on the updated patches

[Sean Finney]

---
 .../gentoo/006_ext-curl-set_opt-crash.patch        |    9 ++++-----
 debian/patches/gentoo/009_ob-memory-leaks.patch    |   17 ++++++++---------
 debian/patches/libtool2.2.patch                    |    4 +---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
index eb38dcc..d3d5850 100644
--- a/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
+++ b/debian/patches/gentoo/006_ext-curl-set_opt-crash.patch
@@ -3,12 +3,11 @@ PHP_5_2
 http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.42&r2=1.62.2.14.2.43&diff_format=u
 http://bugs.php.net/bug.php?id=47616
 Fixed bug #47616 (curl keeps crashing)
-diff -r 9db107056020 -r 85ef4c1844f0 ext/curl/interface.c
---- a/ext/curl/interface.c	Fri Apr 10 11:25:01 2009 +0200
-+++ b/ext/curl/interface.c	Fri Apr 10 11:29:41 2009 +0200
-@@ -1550,6 +1550,7 @@
- 			} else {
+--- php.orig/ext/curl/interface.c
++++ php/ext/curl/interface.c
+@@ -1850,6 +1850,7 @@ static int _php_curl_setopt(php_curl *ch
  #if LIBCURL_VERSION_NUM >= 0x071101
+ 				convert_to_string_ex(zvalue);
  				/* with curl 7.17.0 and later, we can use COPYPOSTFIELDS, but we have to provide size before */
 +				convert_to_string_ex(zvalue);
  				error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, Z_STRLEN_PP(zvalue));
diff --git a/debian/patches/gentoo/009_ob-memory-leaks.patch b/debian/patches/gentoo/009_ob-memory-leaks.patch
index d8338ab..2792ef0 100644
--- a/debian/patches/gentoo/009_ob-memory-leaks.patch
+++ b/debian/patches/gentoo/009_ob-memory-leaks.patch
@@ -3,11 +3,10 @@ PHP_5_2
 http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.8&r2=1.167.2.3.2.9&diff_format=u
 Fixed memory leak in ob_get_clean/ob_get_flush.
 
-diff -r f5a102df944d -r e2602e8d2936 main/output.c
---- a/main/output.c	Fri Apr 10 11:35:06 2009 +0200
-+++ b/main/output.c	Fri Apr 10 11:37:31 2009 +0200
-@@ -855,10 +855,12 @@
- 	/* error checks */
+--- php.orig/main/output.c
++++ php/main/output.c
+@@ -818,10 +818,12 @@ PHP_FUNCTION(ob_end_flush)
+ 	
  	if (!OG(ob_nesting_level)) {
  		php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush.");
 +		zval_dtor(return_value);
@@ -18,9 +17,9 @@ diff -r f5a102df944d -r e2602e8d2936 main/output.c
 +		zval_dtor(return_value);
  		RETURN_FALSE;
  	}
- 	/* flush */
-@@ -880,10 +882,12 @@
- 	/* error checks */
+ 	
+@@ -840,10 +842,12 @@ PHP_FUNCTION(ob_end_clean)
+ 		
  	if (!OG(ob_nesting_level)) {
  		php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete.");
 +		zval_dtor(return_value);
@@ -31,4 +30,4 @@ diff -r f5a102df944d -r e2602e8d2936 main/output.c
 +		zval_dtor(return_value);
  		RETURN_FALSE;
  	}
- 	/* delete buffer */
+ 	
diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
index 7c5d6bb..8a7b938 100644
--- a/debian/patches/libtool2.2.patch
+++ b/debian/patches/libtool2.2.patch
@@ -1,5 +1,3 @@
-Index: php/scripts/phpize.in
-===================================================================
 --- php.orig/scripts/phpize.in
 +++ php/scripts/phpize.in
 @@ -5,10 +5,16 @@ prefix='@prefix@'
@@ -20,7 +18,7 @@ Index: php/scripts/phpize.in
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
  CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
  	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
-@@ -126,8 +132,9 @@ phpize_copy_files()
+@@ -144,8 +150,9 @@ phpize_copy_files()
    test -d build || mkdir build
   
    (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
-- 
1.6.3.3