Update "fetchmail" package to version 6.3.11. Changes since version 6.3.8:

- Security fixes for CVE-2009-2666, CVE-2007-4565 and CVE-2008-2711.
- Fetchmail no longer drops permanently undelivered messages by default,
  to match historic documentation.  It does this by adding a new
  "softbounce" option.
- A lot bug fixes and improvements.

5 files changed, 22 insertions, 61 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index c09fd10af18..5c1b1b25fa5 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.168 2009/05/21 11:33:12 zafer Exp $
+# $NetBSD: Makefile,v 1.169 2009/08/10 08:46:30 tron Exp $
 
-DISTNAME=	fetchmail-6.3.8
-PKGREVISION=	3
+DISTNAME=	fetchmail-6.3.11
 CATEGORIES=	mail
 MASTER_SITES=	http://download.berlios.de/fetchmail/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/fetchmail/PLIST b/mail/fetchmail/PLIST
index dcabe4ba4cc..13401f6323d 100644
--- a/mail/fetchmail/PLIST
+++ b/mail/fetchmail/PLIST
@@ -1,23 +1,34 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:04:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/08/10 08:46:30 tron Exp $
 bin/fetchmail
 man/man1/fetchmail.1
-share/doc/fetchmail/README
 share/doc/fetchmail/COPYING
 share/doc/fetchmail/FAQ
-share/doc/fetchmail/NOTES
 share/doc/fetchmail/FEATURES
-share/doc/fetchmail/fetchmail-FAQ.html
+share/doc/fetchmail/NOTES
+share/doc/fetchmail/README
 share/doc/fetchmail/design-notes.html
+share/doc/fetchmail/fetchmail-FAQ.html
 share/doc/fetchmail/fetchmail-features.html
+share/examples/rc.d/fetchmail
 share/locale/ca/LC_MESSAGES/fetchmail.mo
 share/locale/cs/LC_MESSAGES/fetchmail.mo
+share/locale/da/LC_MESSAGES/fetchmail.mo
 share/locale/de/LC_MESSAGES/fetchmail.mo
+share/locale/el/LC_MESSAGES/fetchmail.mo
 share/locale/en_GB/LC_MESSAGES/fetchmail.mo
 share/locale/es/LC_MESSAGES/fetchmail.mo
+share/locale/fi/LC_MESSAGES/fetchmail.mo
 share/locale/fr/LC_MESSAGES/fetchmail.mo
+share/locale/gl/LC_MESSAGES/fetchmail.mo
+share/locale/id/LC_MESSAGES/fetchmail.mo
+share/locale/it/LC_MESSAGES/fetchmail.mo
 share/locale/ja/LC_MESSAGES/fetchmail.mo
+share/locale/nl/LC_MESSAGES/fetchmail.mo
 share/locale/pl/LC_MESSAGES/fetchmail.mo
+share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
 share/locale/ru/LC_MESSAGES/fetchmail.mo
+share/locale/sk/LC_MESSAGES/fetchmail.mo
 share/locale/sq/LC_MESSAGES/fetchmail.mo
+share/locale/tr/LC_MESSAGES/fetchmail.mo
 share/locale/vi/LC_MESSAGES/fetchmail.mo
-share/examples/rc.d/fetchmail
+share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 611def62159..4f93adbc322 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.39 2008/06/19 11:29:49 obache Exp $
+$NetBSD: distinfo,v 1.40 2009/08/10 08:46:30 tron Exp $
 
-SHA1 (fetchmail-6.3.8.tar.bz2) = b8e8c51ed6cf53fc398c821fdb29d166c6713bb0
-RMD160 (fetchmail-6.3.8.tar.bz2) = 34034f9ae9fe44ba35f0a16d3128d4a9b0001df2
-Size (fetchmail-6.3.8.tar.bz2) = 1323515 bytes
-SHA1 (patch-aa) = d8234f2bbe91003c4cb5c9896dfe33c8226a74de
-SHA1 (patch-ab) = 7439c2a09a913fa4cd3d89ff86b4618e81c1185e
+SHA1 (fetchmail-6.3.11.tar.bz2) = e769bcb81b393a55e02ec4bf7e94a52cf0c8ef8f
+RMD160 (fetchmail-6.3.11.tar.bz2) = 8d6b0e42b9ead6e836e40e8ae494a6f5b7d3a59b
+Size (fetchmail-6.3.11.tar.bz2) = 1608923 bytes
diff --git a/mail/fetchmail/patches/patch-aa b/mail/fetchmail/patches/patch-aa
deleted file mode 100644
index 4836906bd5e..00000000000
--- a/mail/fetchmail/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2007/09/23 12:48:46 tron Exp $
-
---- sink.c.orig	2007-03-29 23:45:17.000000000 +0100
-+++ sink.c	2007-09-23 13:42:40.000000000 +0100
-@@ -262,7 +262,7 @@
-     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
- 
-     /* don't bounce in reply to undeliverable bounces */
--    if (!msg->return_path[0] ||
-+    if (!msg || !msg->return_path[0] ||
- 	strcmp(msg->return_path, "<>") == 0 ||
- 	strcasecmp(msg->return_path, md1) == 0 ||
- 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
diff --git a/mail/fetchmail/patches/patch-ab b/mail/fetchmail/patches/patch-ab
deleted file mode 100644
index 26d8bd6a4d5..00000000000
--- a/mail/fetchmail/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2008/06/19 11:29:49 obache Exp $
-
-CVE-2008-2711
-http://fetchmail.berlios.de/fetchmail-SA-2008-01.txt
-
---- report.c.orig	2006-03-14 08:53:31.000000000 +0000
-+++ report.c
-@@ -238,11 +238,17 @@ report_build (FILE *errfp, message, va_a
-     rep_ensuresize();
- 
- #if defined(VA_START)
--    VA_START (args, message);
-     for ( ; ; )
-     {
-+	/*
-+	 * args has to be initialized before every call of vsnprintf(),
-+	 * because vsnprintf() invokes va_arg macro and thus args is
-+	 * undefined after the call.
-+	 */
-+	VA_START(args, message);
- 	n = vsnprintf (partial_message + partial_message_size_used, partial_message_size - partial_message_size_used,
- 		       message, args);
-+	va_end (args);
- 
- 	if (n >= 0
- 	    && (unsigned)n < partial_message_size - partial_message_size_used)
-@@ -254,7 +260,6 @@ report_build (FILE *errfp, message, va_a
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {