Update to 2.2.6:

2007-03-28  Jeffrey Stedfast

	* README: Bumped version

	* configure.in: Bumped version to 2.2.6 - critical release for the
	gmime-stream-fs and gmime-stream-file fixes below.

	* gmime/gmime-stream-filter.c (stream_reset): Try resetting source
	stream first, this way if that fails we don't reset our state
	either.

	* gmime/gmime-stream-fs.c (stream_reset): Same as below.

	* gmime/gmime-stream-file.c (stream_reset): Make sure to always
	return 0 or -1, not the value from fseek()ing back to the
	beginning of the stream (which might not be position 0).

2007-03-27  Jeffrey Stedfast

	* gmime/gmime-gpg-context.c (gpg_ctx_parse_status): If we aren't
	in a UTF-8 locale, convert status messages into UTF-8 when using
	the status line in the GError.

2007-03-26  Jeffrey Stedfast

	* gmime/gmime-utils.c (g_mime_utils_8bit_header_decode)
	(g_mime_utils_8bit_header_encode)
	(g_mime_utils_8bit_header_encode_phrase): Changed all of these
	functions to take `const unsigned char *' like they used to. Fixes
	bug #423147.

	* gmime/gmime-gpg-context.c (gpg_ctx_new): Initialize flushed and
	nodata state variables. Thanks to valgrind for finding these...

	* gmime/gmime-content-type.c
	(g_mime_content_type_new_from_string): Shouldn't need to
	g_strstrip() the type, is_ttoken() won't match against lwsp
	chars. Also, instead of simply scanning past lwsp between some
	tokens, use decode_lwsp() between *all* tokens so that we handle
	comments as well (not that there should be any...).

	* gmime-2.0.pc.in: Got rid of the redundant @LIBS@ which contained
	the same value as @GMIME_LIBS@.

	* configure.in: Added configure checks for large file support.

2007-03-26  Jeffrey Stedfast

	* gmime-param.c: #include "gmime-parse-utils.h" and got rid of
	this file's own decode_lwsp() implementation.

	* internet-address.c: #include "gmime-parse-utils.h" which is
	where a bunch of the parser functions have been moved from here.

	* gmime-utils.c: #include "gmime-parse-utils.h" for decode_lwsp()
	and decode_domain()
	(decode_addrspec): Moved here from internet-address.c which had
	been exporting the symbol previously (so that decode_domain didn't
	have to be copy/pasted). Now this function can be made static -
	yay! No more exporting un-namespaced symbols!

	* gmime/gmime-message.c: #include "gmime-parse-utils.h" for
	decode_lwsp()

	* gmime/gmime-parse-utils.[c,h]: New source files containing some
	parse utility functions that had been copy/pasted between several
	source files previously.

2007-03-25  Jeffrey Stedfast

	* README: Bumped version

	* configure.in: Bumped version to 2.2.5

2007-03-25  Jeffrey Stedfast

	* tests/Makefile.am (local-check): Simplified.

	* tests/test-streams.c: Generate our own test data if we aren't
	given any.

	* tests/test-cat.c: Updated for the new Makefile.am rule.

	* gmime/gmime-stream-mmap.c (stream_length): Fixed to return the
	correct length when bound_end == -1 but bound_start != 0.
	Discovered this thanks to my new testsuite.

	* gmime/internet-address.c (decode_mailbox): If we can't find a
	local-part and inptr is ',', set *in = inptr; rather than *in =
	inptr + 1; Discovered this bug thanks to my new testsuite.

	* tests/test-mime.c: Rewritten to use testsuite library.

2007-03-24  Jeffrey Stedfast

	* tests/Makefile.am (check-local): Rewritten to actually run the
	automated tests.

	* tests/test-mbox.c: Rewritten to use testsuite library.

	* tests/test-pgp.c: Rewritten to use testsuite library.

	* tests/test-pgpmime.c: Rewritten to use testsuite library.

	* tests/test-cat.c: Rewritten to use testsuite library.

	* tests/test-streams.c: Rewritten to use testsuite library.

	* tests/test-iconv.c: Rewritten to use testsuite library.

	* tests/testsuite.[c,h]: New automated test-suite helper library.

2007-03-20  Jeffrey Stedfast

	* configure.in: Check for the existance of _timezone and nfds_t.

	* gmime/gmime-utils.c (mktime_utc): Use _timezone if
	HAVE__TIMEZONE is set.

	* gmime/gmime.c (g_mime_init): If HAVE_TIMEZONE or HAVE__TIMEZONE
	is set, call tzset() to initialise the timezone variable.

2007-03-12  Jeffrey Stedfast

	* gmime/gmime-param.c (decode_param): Instead of only checking
	that the param value begins with "=?", check if that sequence
	exists anywhere in the value. Fixes bug #407522.

	* src/uudecode.c (uudecode): Use a strcmp instead of comparing
	against a string literal (which was technically correct in this
	case, but the prettyification would be nice if "-" was specified
	in argv too). Fixes bug #408613.

2007-03-10  Jeffrey Stedfast

	* gmime/gmime-message.c (g_mime_message_get_all_recipients): New
	convenience function to get To, Cc, and Bcc recipients all in a
	single list.

2007-02-19  Jeffrey Stedfast

	* gmime/gmime-message.h: Moved g_mime_message_get_body() into the
	deprecated block.

2007-02-11  Jeffrey Stedfast

	* gmime/gmime-utils.c: Removed the need for the ctype isblank()
	function.

	* gmime/gmime-param.c (decode_int): Need to use (unsigned char *)
	when passing indexes to ctype functions.

2007-02-10  Jeffrey Stedfast

	* gmime/gmime-charset.c: Changed the names of the charset format
	macros to coincide with the new names output by iconv-charset.c.
	(g_mime_charset_iconv_name): Use the new macro names.

	* iconv-detect.c: Use %u instead of %d, also changed the names of
	the format #defines that we print out.

	* gmime/gmime-utils.c (g_mime_utils_quote_string): Optimise a
	smidgen.
	(g_mime_utils_unquote_string): Fixed, this wasn't working right...

2007-02-09  Jeffrey Stedfast

	* gmime/gmime-stream-filter.c (stream_write): Instead of comparing
	the return value of the source stream write() to our input length
	to write, compare to -1. We can't assume the the value the source
	stream will return will be what we expected, all we can do is
	check for error.

	* gmime/gmime-part.c: Same as below.

	* gmime/gmime-filter-basic.c: Fixes to signedness compile warnings
	and updated to reflect gmime-utils.h changes.

	* gmime/gmime-multipart.c (multipart_set_boundary): Updated to
	reflect gmime-utils.h changes.

	* gmime/gmime-stream.c (g_mime_stream_writev): If any of the
	writes fail, return -1.

	* gmime/gmime-utils.c: header_encode_*() and header_decode_*() now
	take const char * rather than const unsigned char *
	arguments. This has been done in an effort to fix compile warnings
	about signed vs unsigned char * pointers. The 'save' argument to
	all of the stream encoders/decoders have been changed to a
	guint32, again for signed vs unsigned warning fixes.

4 files changed, 8 insertions, 21 deletions

diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index a3fc9782dd1..f32617b4b17 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/03/08 20:04:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/15 13:11:40 wiz Exp $
 #
 
-DISTNAME=	gmime-2.2.4
+DISTNAME=	gmime-2.2.6
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.2/
 
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 44dd5622e04..c4353dcfad8 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/03/08 20:04:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/04/15 13:11:40 wiz Exp $
 bin/gmime-config
 bin/uudecode
 bin/uuencode
@@ -33,6 +33,7 @@ include/gmime-2.0/gmime/gmime-multipart-signed.h
 include/gmime-2.0/gmime/gmime-multipart.h
 include/gmime-2.0/gmime/gmime-object.h
 include/gmime-2.0/gmime/gmime-param.h
+include/gmime-2.0/gmime/gmime-parse-utils.h
 include/gmime-2.0/gmime/gmime-parser.h
 include/gmime-2.0/gmime/gmime-part.h
 include/gmime-2.0/gmime/gmime-session-simple.h
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 93cb180c223..f307510c15c 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 14:39:58 joerg Exp $
+$NetBSD: distinfo,v 1.10 2007/04/15 13:11:40 wiz Exp $
 
-SHA1 (gmime-2.2.4.tar.gz) = 1cf5de2e9e594b136c37b7627f7676be6a977704
-RMD160 (gmime-2.2.4.tar.gz) = c28793597d33397ff17b2b8f54b0c6a87f00604f
-Size (gmime-2.2.4.tar.gz) = 933842 bytes
-SHA1 (patch-aa) = 03a3a2e91926d3ae24a2f7e93029dcaae8ede453
+SHA1 (gmime-2.2.6.tar.gz) = e3a87324efb336a0c8e4b8b648c88b099e59f321
+RMD160 (gmime-2.2.6.tar.gz) = d18b95408cee2f1969824d14cc290f4eb187bc8f
+Size (gmime-2.2.6.tar.gz) = 946044 bytes
 SHA1 (patch-ab) = f6b63e3516c941fb044fc42d931a7b4e5d717f86
diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa
deleted file mode 100644
index 35ad6dd1cbd..00000000000
--- a/mail/gmime/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/03/08 20:04:06 wiz Exp $
-
---- zentimer.h.orig	2007-02-08 05:12:08.000000000 +0000
-+++ zentimer.h
-@@ -23,6 +23,8 @@
- 
- #ifdef ENABLE_ZENTIMER
- 
-+#include "config.h"
-+
- #include <stdio.h>
- 
- #ifdef HAVE_STDINT_H