summaryrefslogtreecommitdiff
path: root/mail/gmime
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-03-08 20:04:06 +0000
committerwiz <wiz@pkgsrc.org>2007-03-08 20:04:06 +0000
commit44d9a395b3b0a6a5e7c1d697701a347b6c0cf368 (patch)
treefa83ac4aee2e7948596393775ba156043657cad3 /mail/gmime
parent3efc9fc195423d7a55b4aa01a8a5b32000911d3c (diff)
downloadpkgsrc-44d9a395b3b0a6a5e7c1d697701a347b6c0cf368.tar.gz
Update to 2.2.4:
2007-02-08 Jeffrey Stedfast * README: Bumped version * configure.in: Bumped version to 2.2.4 2007-02-06 Jeffrey Stedfast Fix for bug #394433 * configure.in: Detect if the system has GNU's getopt implementation available for us to use. * Makefile.am: Don't build our own copy of the GNU getopt library if the system has it available. * src/uuencode.c: If the system has getopt.h, use it instead of our own getopt.h. * src/uudecode.c: If the system has getopt.h, use it instead of our own getopt.h. 2007-02-06 Jeffrey Stedfast More fixes on account of my test suite... * tests/test-cat.c (test_cat_substream): end = start + random amount... duh. Fixes a bug where sometimes the end bound was < the start bound. * gmime/gmime-stream-cat.c (stream_substream): Calculate the length of each of the source streams correctly. D'oh. (stream_substream): Fixed the calculation for s->start. (stream_substream): Fixed the s->end calculation for when end within the source stream's bounds. (stream_substream): Keep track of how long our substream is going to be for use with setting absolute bound_end on a multi-stream substream. 2007-02-05 Jeffrey Stedfast Fixes on account of the awesome test suite I wrote earlier... still need to fix ::substream() tho (or maybe it's just the test that's broke?). * gmime/gmime-stream-cat.c: Added an id member to struct _cat_node, for use with debugging... (stream_read): Seek in the source stream, don't call Cat::stream_seek() to do it. (stream_seek): Swapped the logic of the "within bounds" check, had it backwards. When seeking past a stream, set the node->position to the length of the stream (technically, it's like we read() thru all that data, right?). Instead of resetting all streams starting at n->next, reset them all starting at current->next... since 'n' technically might be before 'current'. (g_mime_stream_cat_add_source): Assign each node an id for easier debugging... 2007-02-05 Jeffrey Stedfast * tests/test-cat.c: The beginnings of a test suite for GMimeStreamCat. * gmime/gmime-stream-cat.c (stream_read): Go to the next stream if nread <= 0, not just nread == 0. 2007-02-04 Jeffrey Stedfast * gmime/gmime-stream-mem.c (stream_reset): No longer need to update stream->position. * gmime/gmime-stream-mmap.c (stream_reset): Same g_return_if_fail change. Also don't update stream->position. (stream_seek): Added similar sanity checking/eos resetting as StreamFs code. * gmime/gmime-stream-file.c (stream_read): Style changes. (stream_write): Style changes. (stream_close): Fixed compiler warning. (stream_reset): Changed g_return_if_fail to a true if-then. (stream_seek): Changed to mimic the StreamFs changes. (g_mime_stream_file_new): Similar to fs_new() change. * gmime/gmime-stream-fs.c (stream_close): Loop the close() ourselves. (stream_reset): Changed g_return_if_fail to a true if-then. Also be better about resetting eos. (stream_seek): Rewritten to be more correct/robust (at least I hope). Also properly reset eos when appropriate. (g_mime_stream_fs_new): If lseek() fails, pretend start offset is 0. * gmime/gmime-stream.c (stream_reset): No longer needs to update stream->position. (g_mime_stream_reset): Update stream->position if everything reset smoothly. This is just a convenience change to subclass implementations. * gmime/gmime-stream-cat.c (stream_read): Rewritten. Hopefully correct now? Ugh. We can hope... (stream_write): Fixed to work better. (stream_close): Rewritten. (stream_reset): Rewritten to reset the streams, don't seek. (stream_seek): Rewritten... still not correct, but should be ok assuming our bound_start is 0. (stream_length): Rewritten to not depend on a pre-calculated length value... this Does Not Work (tm) if the source streams are unbound and we've written to them. (stream_substream): Rewritten... because ::seek() is so complex for this type of stream, I've tried to eliminate a lot of the headaches by making substreams only slurp up the streams within the bounds of the start/end requested. If the entire contents within the requested bounds are contained within a single source stream, we return a substream of said source stream instead. (g_mime_stream_cat_add_source): Don't precalculate the length here anymore. * gmime/gmime-stream-buffer.c (stream_read): Fixed to never allow buflen to be negative if the read() of our source stream fails. (stream_close): Handle the case where we've already been closed. (stream_eos): Simplified. (stream_reset): Stylistic changes. (stream_seek): Don't allow seeks under our bound_start. 2007-02-03 Jeffrey Stedfast * gmime/gmime-stream-cat.c (stream_flush): Flush all streams up to and including the current stream, not just the current stream. (stream_write): break if we don't write any data to current->stream or get an error so we can try the next stream. * gmime/gmime-stream-file.c (stream_close): Same as below. * gmime/gmime-stream-fs.c (stream_close): Allow closing multiple times... makes this consistant with the other streams. (stream_write): If a system write fails with EFBIG or ENOSPC, set eos to TRUE. 2007-01-20 Jeffrey Stedfast * tests/test-streams.c (test_stream_gets): printf formatter fixes. * examples/imap-example.c: #include <glib/gstdio.h>, fixes bug #394434. 2007-01-20 Jeffrey Stedfast Fixes bug #394419 * gmime/gmime-filter-charset.c (filter_filter): Do iconv const casting. (filter_complete): Same. 2006-11-02 Jeffrey Stedfast * gmime/gmime-utils.c (g_mime_utils_header_format_date): Changed the names of the parameters to date and tz_offset to prevent warnings from -Wshadow. * gmime/gmime-filter-html.c (writeln): Fixed another possible buffer overflow condition pointed out by hpj. * gmime/gmime-filter-crlf.c (filter_filter): Fixed a possible buffer overflow condition pointed out by hpj. * gmime/gmime-gpg-context.c (gpg_ctx_op_step): Modified to use poll() rather than select() 2006-09-18 Joe Shaw * mono/Makefile.am: Use SOURCES_XML instead of XML_SOURCES to specify the sources.xml file. XML_SOURCES breaks with newer automakes. 2006-08-29 Pawel Salek * gmime/gmime-message-partial.c: set buf just before use - since the mem stream buffer may get reallocated in the meantime leading to segfaults. 2006-08-29 Jeffrey Stedfast * gmime/gmime-param.c (decode_quoted_string): Unescape escape sequences. Fixes bug #352771. * gmime/gmime-message.c (g_mime_message_set_subject): Updated the docs. (g_mime_message_get_subject): Same. 2006-08-21 Peter Bloomfield * gmime/gmime-utils.c (g_mime_utils_unquote_string): handle an arbitrary sequence of quoted and unquoted sections. 2006-08-02 Jeffrey Stedfast * README: Bumped version * configure.in: Bumped version to 2.2.3 * gmime/gmime-message.c (process_header): Decode the values for Subject, From, Reply-To so that g_mime_message_get_subject/etc all return decoded strings like they were meant to. 2006-06-23 Jeffrey Stedfast * gmime/gmime-gpg-context.c (swrite): Use g_build_filename() and g_get_tmp_dir() rather than hard-coding the tmpfile to be in /tmp. 2006-06-23 Jeffrey Stedfast * gmime/gmime-part.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-parser.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-param.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-multipart-signed.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-multipart-encrypted.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-multipart.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-message-partial.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-message-part.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-message.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-iconv.c (g_mime_iconv_open): Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-header.c (g_mime_header_new): Use g_mime_strcase_[hash,equal] rather than param_[hash,equal] to reuse code. * gmime/gmime-gpg-context.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-filter-enriched.c: Use g_ascii_* versions of str[n]casecmp. * gmime/gmime-disposition.c (g_mime_disposition_add_parameter): Use g_mime_strcase_[hash,equal] rather than param_[hash,equal] to reuse code. (g_mime_disposition_new): Same. (param_equal): Removed. (param_hash): Removed. * gmime/gmime-content-type.c: Use g_ascii_* versions of str[n]casecmp. (g_mime_content_type_new_from_string): Use g_mime_strcase_[hash,equal] rather than param_[hash,equal] to reuse code. (g_mime_content_type_set_parameter): Same. (param_equal): Removed. (param_hash): Removed. * gmime/gmime-charset.c: Use g_ascii_* versions of str[n]casecmp. 2006-06-23 Jeffrey Stedfast * gmime/gmime-stream-cat.c (stream_seek): Fixed to only seek if necessary and also to use ::reset() if seeking back to the beginning of the stream so that it works for non-seekable streams too. Fixes bug #345503 - again thanks to Charles for reporting this bug. * gmime/gmime-object.c (subtype_bucket_foreach): Fixed to also free the bucket memory. Fixes bug #345768, thanks to Charles Kerr for pointing this out. 2006-06-22 Jeffrey Stedfast * gmime/gmime-gpg-context.c: Removed #define _POSIX_SOURCE to fix bug #172179. 2006-06-15 Jeffrey Stedfast * README: Bumped version * configure.in: Bumped version to 2.2.2 2006-06-01 Jeffrey Stedfast * gmime/gmime-utils.c (parse_broken_date): Fixed to handle MM-DD-YY properly and also to fallback to DD-MM-YY if the first pair of digits isn't within range for a proper month. 2006-05-30 Jeffrey Stedfast * gmime.h.in: Removed. * gmime.h: Now static, no longer auto-generated. * gmime/gmime.c: Set the gmime_[major,minor,micro]_version variables. (g_mime_check_version): New function to check the required version. * gmime/gmime-stream-fs.c: Implement our own no-op version of fsync() for systems that don't have fsync(). 2006-05-24 Jeffrey Stedfast * examples/imap-example.c (main): Use g_mkdir() to make this example portable to Win32. 2006-05-01 Jeffrey Stedfast * gmime/gmime-gpg-context.c (gpg_ctx_parse_status): Handle prompts from GnuPG asking for the user's PIN for their SmartCard. 2006-04-21 Jeffrey Stedfast * gmime/gmime-stream.h: #include <stdio.h> for SEEK_SET/CUR/END enum values. 2006-03-16 Jeffrey Stedfast * README: Bumped version * configure.in: Bumped version to 2.2.1 * gmime/gmime-parser.c (parser_step): No-op if we are in an ERROR state. (parser_construct_message): Don't bail if we don't start in state INIT, this is valid. (parser_step_from): We need to bail even if parser_fill() returns > 0 if the line is incomplete (e.g. a forced refill was needed but no additional data could be read). 2006-03-16 Jeffrey Stedfast * README: Bumped version * configure.in: Bumped version to 2.2.0, it's about time I made a stable release. 2006-03-15 Jeffrey Stedfast * gmime/gmime-parser.c (parser_step_from): If we fail to find a From line, set an error state. Also fixed the End-Of-Data check to prevent an infinite loop if the stream ends with \n\n. (parser_construct_message): Make sure our state starts off at INIT. Also check for the ERROR state in our parser_step() loop and return NULL if we encounter an error. 2006-03-03 Jeffrey Stedfast * util/url-scanner.c (g_url_web_end): Allow urls such as "http://www.novell.com./path" (note the '.' before the path component). (g_url_addrspec_start): If the '@' is the first character in the match, then it isn't a valid email address.
Diffstat (limited to 'mail/gmime')
-rw-r--r--mail/gmime/Makefile9
-rw-r--r--mail/gmime/PLIST159
-rw-r--r--mail/gmime/distinfo11
-rw-r--r--mail/gmime/patches/patch-aa24
-rw-r--r--mail/gmime/patches/patch-ab13
5 files changed, 101 insertions, 115 deletions
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 03de5a4114f..a3fc9782dd1 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/05/07 18:22:41 recht Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/08 20:04:06 wiz Exp $
#
-DISTNAME= gmime-2.1.19
+DISTNAME= gmime-2.2.4
CATEGORIES= mail
-MASTER_SITES= http://spruce.sourceforge.net/gmime/sources/v2.1/
+MASTER_SITES= http://spruce.sourceforge.net/gmime/sources/v2.2/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://spruce.sourceforge.net/gmime/
@@ -15,10 +15,9 @@ USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --disable-mono
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
PKGCONFIG_OVERRIDE+= gmime-2.0.pc.in
+TEST_TARGET= check
-.include "../../mk/bsd.prefs.mk"
.include "options.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/gmime/PLIST b/mail/gmime/PLIST
index 483a748b396..44dd5622e04 100644
--- a/mail/gmime/PLIST
+++ b/mail/gmime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/05/07 18:22:41 recht Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/03/08 20:04:06 wiz Exp $
bin/gmime-config
bin/uudecode
bin/uuencode
@@ -52,83 +52,84 @@ include/gmime-2.0/gmime/internet-address.h
lib/gmimeConf.sh
lib/libgmime-2.0.la
lib/pkgconfig/gmime-2.0.pc
-share/doc/gmime/CipherContexts.html
-share/doc/gmime/DataWrappers.html
-share/doc/gmime/Filters.html
-share/doc/gmime/Headers.html
-share/doc/gmime/InternetAddresses.html
-share/doc/gmime/MimeParts.html
-share/doc/gmime/Parsers.html
-share/doc/gmime/Sessions.html
-share/doc/gmime/Streams.html
-share/doc/gmime/ch01.html
-share/doc/gmime/classes.html
-share/doc/gmime/core.html
-share/doc/gmime/fundamentals.html
-share/doc/gmime/gmime-building.html
-share/doc/gmime/gmime-changes-2-0.html
-share/doc/gmime/gmime-changes-2-2.html
-share/doc/gmime/gmime-compiling.html
-share/doc/gmime/gmime-data-wrappers.html
-share/doc/gmime/gmime-filters.html
-share/doc/gmime/gmime-gmime-charset.html
-share/doc/gmime/gmime-gmime-cipher-context.html
-share/doc/gmime/gmime-gmime-content-type.html
-share/doc/gmime/gmime-gmime-data-wrapper.html
-share/doc/gmime/gmime-gmime-disposition.html
-share/doc/gmime/gmime-gmime-filter-basic.html
-share/doc/gmime/gmime-gmime-filter-best.html
-share/doc/gmime/gmime-gmime-filter-charset.html
-share/doc/gmime/gmime-gmime-filter-crlf.html
-share/doc/gmime/gmime-gmime-filter-enriched.html
-share/doc/gmime/gmime-gmime-filter-from.html
-share/doc/gmime/gmime-gmime-filter-gzip.html
-share/doc/gmime/gmime-gmime-filter-html.html
-share/doc/gmime/gmime-gmime-filter-md5.html
-share/doc/gmime/gmime-gmime-filter-strip.html
-share/doc/gmime/gmime-gmime-filter-windows.html
-share/doc/gmime/gmime-gmime-filter-yenc.html
-share/doc/gmime/gmime-gmime-filter.html
-share/doc/gmime/gmime-gmime-gpg-context.html
-share/doc/gmime/gmime-gmime-header.html
-share/doc/gmime/gmime-gmime-iconv-utils.html
-share/doc/gmime/gmime-gmime-iconv.html
-share/doc/gmime/gmime-gmime-message-part.html
-share/doc/gmime/gmime-gmime-message-partial.html
-share/doc/gmime/gmime-gmime-message.html
-share/doc/gmime/gmime-gmime-multipart-encrypted.html
-share/doc/gmime/gmime-gmime-multipart-signed.html
-share/doc/gmime/gmime-gmime-multipart.html
-share/doc/gmime/gmime-gmime-object.html
-share/doc/gmime/gmime-gmime-param.html
-share/doc/gmime/gmime-gmime-parser.html
-share/doc/gmime/gmime-gmime-part.html
-share/doc/gmime/gmime-gmime-session-simple.html
-share/doc/gmime/gmime-gmime-session.html
-share/doc/gmime/gmime-gmime-stream-buffer.html
-share/doc/gmime/gmime-gmime-stream-cat.html
-share/doc/gmime/gmime-gmime-stream-file.html
-share/doc/gmime/gmime-gmime-stream-filter.html
-share/doc/gmime/gmime-gmime-stream-fs.html
-share/doc/gmime/gmime-gmime-stream-mem.html
-share/doc/gmime/gmime-gmime-stream-mmap.html
-share/doc/gmime/gmime-gmime-stream-null.html
-share/doc/gmime/gmime-gmime-stream.html
-share/doc/gmime/gmime-gmime-utils.html
-share/doc/gmime/gmime-gmime.html
-share/doc/gmime/gmime-internet-address.html
-share/doc/gmime/gmime-question-index.html
-share/doc/gmime/gmime-resources.html
-share/doc/gmime/gmime-streams.html
-share/doc/gmime/gmime.devhelp
-share/doc/gmime/gmime.html
-share/doc/gmime/home.png
-share/doc/gmime/index.html
-share/doc/gmime/index.sgml
-share/doc/gmime/left.png
-share/doc/gmime/right.png
-share/doc/gmime/style.css
-share/doc/gmime/up.png
-@dirrm share/doc/gmime
+share/gtk-doc/html/gmime/CipherContexts.html
+share/gtk-doc/html/gmime/DataWrappers.html
+share/gtk-doc/html/gmime/Filters.html
+share/gtk-doc/html/gmime/Headers.html
+share/gtk-doc/html/gmime/InternetAddresses.html
+share/gtk-doc/html/gmime/MimeParts.html
+share/gtk-doc/html/gmime/Parsers.html
+share/gtk-doc/html/gmime/Sessions.html
+share/gtk-doc/html/gmime/Streams.html
+share/gtk-doc/html/gmime/ch01.html
+share/gtk-doc/html/gmime/classes.html
+share/gtk-doc/html/gmime/core.html
+share/gtk-doc/html/gmime/fundamentals.html
+share/gtk-doc/html/gmime/gmime-building.html
+share/gtk-doc/html/gmime/gmime-changes-2-0.html
+share/gtk-doc/html/gmime/gmime-changes-2-2.html
+share/gtk-doc/html/gmime/gmime-compiling.html
+share/gtk-doc/html/gmime/gmime-data-wrappers.html
+share/gtk-doc/html/gmime/gmime-filters.html
+share/gtk-doc/html/gmime/gmime-gmime-charset.html
+share/gtk-doc/html/gmime/gmime-gmime-cipher-context.html
+share/gtk-doc/html/gmime/gmime-gmime-content-type.html
+share/gtk-doc/html/gmime/gmime-gmime-data-wrapper.html
+share/gtk-doc/html/gmime/gmime-gmime-disposition.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-basic.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-best.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-charset.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-crlf.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-enriched.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-from.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-gzip.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-html.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-md5.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-strip.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-windows.html
+share/gtk-doc/html/gmime/gmime-gmime-filter-yenc.html
+share/gtk-doc/html/gmime/gmime-gmime-filter.html
+share/gtk-doc/html/gmime/gmime-gmime-gpg-context.html
+share/gtk-doc/html/gmime/gmime-gmime-header.html
+share/gtk-doc/html/gmime/gmime-gmime-iconv-utils.html
+share/gtk-doc/html/gmime/gmime-gmime-iconv.html
+share/gtk-doc/html/gmime/gmime-gmime-message-part.html
+share/gtk-doc/html/gmime/gmime-gmime-message-partial.html
+share/gtk-doc/html/gmime/gmime-gmime-message.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart-encrypted.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart-signed.html
+share/gtk-doc/html/gmime/gmime-gmime-multipart.html
+share/gtk-doc/html/gmime/gmime-gmime-object.html
+share/gtk-doc/html/gmime/gmime-gmime-param.html
+share/gtk-doc/html/gmime/gmime-gmime-parser.html
+share/gtk-doc/html/gmime/gmime-gmime-part.html
+share/gtk-doc/html/gmime/gmime-gmime-session-simple.html
+share/gtk-doc/html/gmime/gmime-gmime-session.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-buffer.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-cat.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-file.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-filter.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-fs.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-mem.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-mmap.html
+share/gtk-doc/html/gmime/gmime-gmime-stream-null.html
+share/gtk-doc/html/gmime/gmime-gmime-stream.html
+share/gtk-doc/html/gmime/gmime-gmime-utils.html
+share/gtk-doc/html/gmime/gmime-gmime.html
+share/gtk-doc/html/gmime/gmime-internet-address.html
+share/gtk-doc/html/gmime/gmime-question-index.html
+share/gtk-doc/html/gmime/gmime-resources.html
+share/gtk-doc/html/gmime/gmime-streams.html
+share/gtk-doc/html/gmime/gmime.devhelp
+share/gtk-doc/html/gmime/gmime.devhelp2
+share/gtk-doc/html/gmime/gmime.html
+share/gtk-doc/html/gmime/home.png
+share/gtk-doc/html/gmime/index.html
+share/gtk-doc/html/gmime/index.sgml
+share/gtk-doc/html/gmime/left.png
+share/gtk-doc/html/gmime/right.png
+share/gtk-doc/html/gmime/style.css
+share/gtk-doc/html/gmime/up.png
+@dirrm share/gtk-doc/html/gmime
@dirrm include/gmime-2.0/gmime
@dirrm include/gmime-2.0
diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo
index 4a7db6cd5da..2476b252305 100644
--- a/mail/gmime/distinfo
+++ b/mail/gmime/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/05/07 18:22:41 recht Exp $
+$NetBSD: distinfo,v 1.8 2007/03/08 20:04:06 wiz Exp $
-SHA1 (gmime-2.1.19.tar.gz) = 7f39dbee03880a7b13fe77d849bdc27f1ca2d1ce
-RMD160 (gmime-2.1.19.tar.gz) = d1a7d41661abb82df81b25ae73915a68fdc50bd7
-Size (gmime-2.1.19.tar.gz) = 925637 bytes
-SHA1 (patch-aa) = f6c59f1ea0f3ab721fd254b08def3d7b4b0e5b42
-SHA1 (patch-ab) = 8ab57f5d6d9b7655c1554d5b62abd229f09689b4
+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
diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa
index 56e59d48739..35ad6dd1cbd 100644
--- a/mail/gmime/patches/patch-aa
+++ b/mail/gmime/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/05/07 18:22:41 recht Exp $
+$NetBSD: patch-aa,v 1.4 2007/03/08 20:04:06 wiz Exp $
---- docs/reference/Makefile.in.orig 2006-01-20 22:03:20.000000000 +0100
-+++ docs/reference/Makefile.in
-@@ -115,7 +115,7 @@ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
- GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
- HAVE_REGEX_FALSE = @HAVE_REGEX_FALSE@
- HAVE_REGEX_TRUE = @HAVE_REGEX_TRUE@
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = @HTML_DIR@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
+--- 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
diff --git a/mail/gmime/patches/patch-ab b/mail/gmime/patches/patch-ab
deleted file mode 100644
index ac146a24ad6..00000000000
--- a/mail/gmime/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/05/07 18:22:41 recht Exp $
-
---- gmime/gmime-gpg-context.c.orig 2005-05-03 19:34:17.000000000 +0200
-+++ gmime/gmime-gpg-context.c
-@@ -25,8 +25,6 @@
- #include <config.h>
- #endif
-
--#define _POSIX_SOURCE
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>