nuke unused patches

(Portage version: 2.1.4_rc7)

4 files changed, 6 insertions, 204 deletions

diff --git a/dev-php5/pecl-mailparse/ChangeLog b/dev-php5/pecl-mailparse/ChangeLog
index efcbd866a216..4a6ea29be0fc 100644
--- a/dev-php5/pecl-mailparse/ChangeLog
+++ b/dev-php5/pecl-mailparse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php5/pecl-mailparse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.14 2007/12/06 01:12:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.15 2007/12/06 01:14:30 jokey Exp $
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/mailparse-c-64bit-segfault.diff, -files/cvs-mailparse.c-fix.diff,
+  -files/mailparse_mime-rfc2231.diff, pecl-mailparse-2.1.2.ebuild:
+  nuke unused patches
 
   06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
   -pecl-mailparse-2.1.1-r1.ebuild, pecl-mailparse-2.1.2.ebuild:
diff --git a/dev-php5/pecl-mailparse/files/cvs-mailparse.c-fix.diff b/dev-php5/pecl-mailparse/files/cvs-mailparse.c-fix.diff
deleted file mode 100644
index 349853a29902..000000000000
--- a/dev-php5/pecl-mailparse/files/cvs-mailparse.c-fix.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- mailparse.c	2005-02-28 07:21:45.000000000 +0100
-+++ mailparse.c	2005-08-28 13:38:08.000000000 +0200
-@@ -15,7 +15,7 @@
-    | Author: Wez Furlong <wez@thebrainroom.com>                           |
-    +----------------------------------------------------------------------+
-  */
--/* $Id: mailparse.c,v 1.48 2005/02/28 05:51:40 wez Exp $ */
-+/* $Id: mailparse.c,v 1.49 2005/05/12 13:02:41 wez Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -70,7 +70,7 @@
- 	{NULL, NULL, NULL}
- };
- 
--static zend_class_entry mimemsg_class_entry;
-+static zend_class_entry *mimemsg_class_entry;
- 
- function_entry mailparse_functions[] = {
- 	PHP_FE(mailparse_msg_parse_file,			NULL)
-@@ -138,6 +138,8 @@
- 
- PHP_MINIT_FUNCTION(mailparse)
- {
-+	zend_class_entry mmce;
-+
- #ifdef ZTS
- 	zend_mailparse_globals *mailparse_globals;
- 
-@@ -145,8 +147,8 @@
- 	mailparse_globals = ts_resource(mailparse_globals_id);
- #endif
- 
--	INIT_CLASS_ENTRY(mimemsg_class_entry, "mimemessage", mimemessage_methods);
--	zend_register_internal_class(&mimemsg_class_entry TSRMLS_CC);
-+	INIT_CLASS_ENTRY(mmce, "mimemessage", mimemessage_methods);
-+	mimemsg_class_entry = zend_register_internal_class(&mmce TSRMLS_CC);
- 	
- 	
- 	le_mime_part = zend_register_list_destructors_ex(mimepart_dtor, NULL, mailparse_msg_name, module_number);
-@@ -211,7 +213,7 @@
- 	MAKE_STD_ZVAL(zpart);
- 	php_mimepart_to_zval(zpart, part);
- 
--	object_init_ex(object, &mimemsg_class_entry);
-+	object_init_ex(object, mimemsg_class_entry);
- 	PZVAL_IS_REF(object) = 1;
- 	ZVAL_REFCOUNT(object) = 1;
- 
-@@ -654,7 +656,7 @@
- 	php_info_print_table_start();
- 	php_info_print_table_header(2, "mailparse support", "enabled");
- 	php_info_print_table_row(2, "Extension Version", mailparse_module_entry.version);
--	php_info_print_table_row(2, "Revision", "$Revision: 1.48 $");
-+	php_info_print_table_row(2, "Revision", "$Revision: 1.49 $");
- 	php_info_print_table_end();
- 
- 	DISPLAY_INI_ENTRIES();
diff --git a/dev-php5/pecl-mailparse/files/mailparse-c-64bit-segfault.diff b/dev-php5/pecl-mailparse/files/mailparse-c-64bit-segfault.diff
deleted file mode 100644
index f150a0dbbbf8..000000000000
--- a/dev-php5/pecl-mailparse/files/mailparse-c-64bit-segfault.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- mailparse-1.49.c	2006-09-30 18:42:45.000000000 +0400
-+++ mailparse.c	2006-09-30 22:03:37.000000000 +0400
-@@ -231,7 +231,7 @@
- 	php_mimepart *part;
- 	zval *zpart;
- 	char *mode;
--	long mode_len;
-+	int mode_len;
- 	zval *source = NULL;
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz!", &mode,&mode_len, &source) == FAILURE)
-@@ -839,7 +839,7 @@
- PHP_FUNCTION(mailparse_rfc822_parse_addresses)
- {
- 	char *addresses;
--	long addresses_len;
-+	int addresses_len;
- 	php_rfc822_tokenized_t *toks = NULL;
- 	php_rfc822_addresses_t *addrs = NULL;
- 	int i;
-@@ -1031,7 +1031,7 @@
- PHP_FUNCTION(mailparse_msg_parse)
- {
- 	char *data;
--	long data_len;
-+	int data_len;
- 	zval *arg;
- 	php_mimepart *part;
- 
-@@ -1053,7 +1053,7 @@
- PHP_FUNCTION(mailparse_msg_parse_file)
- {
- 	char *filename;
--	long filename_len;
-+	int filename_len;
- 	php_mimepart *part;
- 	char *filebuf;
- 	php_stream *stream;
-@@ -1501,7 +1501,7 @@
- 	zval *arg;
- 	php_mimepart *part, *foundpart;
- 	char *mimesection;
--	long mimesection_len;
-+	int mimesection_len;
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &arg,&mimesection, &mimesection_len) == FAILURE)	{
- 		RETURN_FALSE; 
-
diff --git a/dev-php5/pecl-mailparse/files/mailparse_mime-rfc2231.diff b/dev-php5/pecl-mailparse/files/mailparse_mime-rfc2231.diff
deleted file mode 100644
index 068dc5be3807..000000000000
--- a/dev-php5/pecl-mailparse/files/mailparse_mime-rfc2231.diff
+++ /dev/null
@@ -1,97 +0,0 @@
---- php_mailparse_mime.c.orig	Mon Feb 28 14:21:45 2005
-+++ php_mailparse_mime.c	Fri Dec 15 10:57:16 2006
-@@ -54,7 +54,11 @@
- {
- 	struct php_mimeheader_with_attributes *attr;
- 	int i, first_semi, next_semi, comments_before_semi, netscape_bug = 0;
--	
-+    char *name_buf = NULL;
-+    smart_str value_buf = {0};
-+    int is_rfc2231_name = 0;
-+    char *check_name;
-+
- 	attr = ecalloc(1, sizeof(struct php_mimeheader_with_attributes));
- 
- 	MAKE_STD_ZVAL(attr->attributes);
-@@ -106,7 +110,7 @@
- 
- 				/* count those tokens; we expect "token = token" (3 tokens); if there are
- 				 * more than that, then something is quite possibly wrong - Netscape Bug! */
--				if (next_semi <= toks->ntokens
-+				if (next_semi < toks->ntokens
- 						&& toks->tokens[next_semi].token != ';'
- 						&& next_semi - first_semi - comments_before_semi > 3) {
- 					next_semi = i + 1;
-@@ -117,9 +121,56 @@
- 						PHP_RFC822_RECOMBINE_STRTOLOWER|PHP_RFC822_RECOMBINE_IGNORE_COMMENTS);
- 				value = php_rfc822_recombine_tokens(toks, i, next_semi - i,
- 						PHP_RFC822_RECOMBINE_IGNORE_COMMENTS);
--			
--				add_assoc_string(attr->attributes, name, value, 0);
--				efree(name);
-+	
-+                /* support rfc2231 mime parameter value 
-+                 *
-+                 * Parameter Value Continuations:
-+                 *
-+                 * Content-Type: message/external-body; access-type=URL;
-+                 * URL*0="ftp://";
-+                 * URL*1="cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
-+                 * 
-+                 * is semantically identical to
-+                 *
-+                 * Content-Type: message/external-body; access-type=URL;
-+                 * URL="ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
-+                 * 
-+                 * Parameter Value Character Set and Language Information: 
-+                 *
-+                 * Content-Type: application/x-stuff;
-+                 * title*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A
-+                 *
-+                 * Modify by Zhao Wei
-+                 * E-mail: zhaowei@eyou.net
-+                 */
-+                check_name = name;
-+                while (*check_name) {
-+                    if (*check_name == '*')
-+                        break;
-+                    check_name++;
-+                }
-+                if (*check_name == '*') {
-+                    *check_name = 0;
-+                    if (NULL == name_buf)
-+                        name_buf = name;
-+                    else
-+                        efree(name);
-+                    smart_str_appends(&value_buf, value);
-+                    efree(value);
-+                    is_rfc2231_name = 1;
-+                }
-+                
-+                if (1 == is_rfc2231_name) {
-+                    if (*name != 0 && strcmp(name_buf, name) != 0) {
-+                        add_assoc_string(attr->attributes, name_buf, estrndup(value_buf.c, value_buf.len), 0);
-+                        efree(name_buf);
-+                        smart_str_free(&value_buf);
-+                        is_rfc2231_name = 0;
-+                    }
-+                } else {
-+                    add_assoc_string(attr->attributes, name, value, 0);
-+                    efree(name);
-+                }
- 			}
- 		}
- 		if (next_semi < toks->ntokens && !netscape_bug)
-@@ -128,6 +179,13 @@
- 		first_semi = next_semi;
- 		netscape_bug = 0;
- 	}
-+    if (1 == is_rfc2231_name) {
-+        add_assoc_string(attr->attributes, name_buf, estrndup(value_buf.c, value_buf.len), 0);
-+        efree(name_buf);
-+        smart_str_free(&value_buf);
-+    }
-+
-+
- 	return attr;
- }