[Pkg-php-commits] r1110 - php5/branches/lenny/debian/patches

[Sean Finney]

Author: seanius
Date: 2008-07-01 21:38:23 +0000 (Tue, 01 Jul 2008)
New Revision: 1110

Modified:
   php5/branches/lenny/debian/patches/CVE-2008-2829.patch
Log:
refresh last quilt import

Modified: php5/branches/lenny/debian/patches/CVE-2008-2829.patch
===================================================================
--- php5/branches/lenny/debian/patches/CVE-2008-2829.patch	2008-07-01 21:35:39 UTC (rev 1109)
+++ php5/branches/lenny/debian/patches/CVE-2008-2829.patch	2008-07-01 21:38:23 UTC (rev 1110)
@@ -1,5 +1,5 @@
---- php5-5.2.6.orig/ext/imap/php_imap.c
-+++ php5-5.2.6/ext/imap/php_imap.c
+--- php5-5.2.5.orig/ext/imap/php_imap.c
++++ php5-5.2.5/ext/imap/php_imap.c
 @@ -70,6 +70,7 @@ static void _php_make_header_object(zval
  static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
  static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress, zval *paddress TSRMLS_DC);
@@ -8,7 +8,7 @@
  
  /* the gets we use */
  static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md);
-@@ -2142,7 +2143,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
+@@ -2137,7 +2138,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
  	}
  
  	string[0]='\0';
@@ -17,7 +17,7 @@
  	RETVAL_STRING(string, 1);
  }
  /* }}} */
-@@ -2911,13 +2912,13 @@ PHP_FUNCTION(imap_fetch_overview)
+@@ -2906,13 +2907,13 @@ PHP_FUNCTION(imap_fetch_overview)
  				if (env->from && _php_imap_address_size(env->from) < MAILTMPLEN) {
  					env->from->next=NULL;
  					address[0] = '\0';
@@ -33,7 +33,7 @@
  					add_property_string(myoverview, "to", address, 1);
  				}
  				if (env->date) {
-@@ -3888,6 +3889,34 @@ static int _php_imap_address_size (ADDRE
+@@ -3883,6 +3884,34 @@ static int _php_imap_address_size (ADDRE
  /* }}} */
  
  
@@ -68,7 +68,7 @@
  /* {{{ _php_imap_parse_address
   */
  static void _php_imap_parse_address (ADDRESS *addresslist, char **fulladdress, zval *paddress TSRMLS_DC)
-@@ -3902,7 +3931,7 @@ static void _php_imap_parse_address (ADD
+@@ -3897,7 +3926,7 @@ static void _php_imap_parse_address (ADD
  	if ((len = _php_imap_address_size(addresstmp))) {
  		tmpstr = (char *) pemalloc(len + 1, 1);
  		tmpstr[0] = '\0';