From 4653d29707b0d86b1704acbbbe52078110b884c9 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 19 Nov 2008 18:11:11 +0100
Subject: [PATCH] fetchmail: update to 6.3.9

---
 fetchmail/.md5sum                    |  4 +-
 fetchmail/Pkgfile                    | 10 ++---
 fetchmail/fetchmail-SA-2007-02.patch | 16 --------
 fetchmail/fetchmail-SA-2008-01.patch | 57 ----------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 fetchmail/fetchmail-SA-2007-02.patch
 delete mode 100644 fetchmail/fetchmail-SA-2008-01.patch

diff --git a/fetchmail/.md5sum b/fetchmail/.md5sum
index 958ece1ec..42bce3c7c 100644
--- a/fetchmail/.md5sum
+++ b/fetchmail/.md5sum
@@ -1,3 +1 @@
-66b97500b0a1e3c0916b3b5314f597f5  fetchmail-6.3.8.tar.bz2
-b9f0ce8114529c1305dff4c02a49043a  fetchmail-SA-2007-02.patch
-2a5a81690b9dc68d476f390631d22909  fetchmail-SA-2008-01.patch
+72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
diff --git a/fetchmail/Pkgfile b/fetchmail/Pkgfile
index 014eeec7f..ff3b0ca09 100644
--- a/fetchmail/Pkgfile
+++ b/fetchmail/Pkgfile
@@ -4,17 +4,13 @@
 # Depends on:  openssl
 
 name=fetchmail
-version=6.3.8
-release=4
-source=(http://download.berlios.de/$name/$name-$version.tar.bz2 
-        $name-SA-2007-02.patch $name-SA-2008-01.patch)
+version=6.3.9
+release=1
+source=(http://download.berlios.de/$name/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
 
-    patch -p0 -i $SRC/$name-SA-2007-02.patch
-    patch -p1 -i $SRC/$name-SA-2008-01.patch
-
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --with-ssl=/usr \
diff --git a/fetchmail/fetchmail-SA-2007-02.patch b/fetchmail/fetchmail-SA-2007-02.patch
deleted file mode 100644
index 520cb0551..000000000
--- a/fetchmail/fetchmail-SA-2007-02.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# http://www.fetchmail.info/fetchmail-SA-2007-02.txt
-
-Index: sink.c
-===================================================================
-- --- sink.c	(revision 5118)
-+++ sink.c	(revision 5119)
-@@ -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/fetchmail/fetchmail-SA-2008-01.patch b/fetchmail/fetchmail-SA-2008-01.patch
deleted file mode 100644
index b8e1bc11e..000000000
--- a/fetchmail/fetchmail-SA-2008-01.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# http://www.fetchmail.info/fetchmail-SA-2008-01.txt
-
-diff --git a/report.c b/report.c
-index 31d4e48..320e60b 100644
-- --- a/report.c
-+++ b/report.c
-@@ -238,11 +238,17 @@ report_build (FILE *errfp, message, va_alist)
-     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_alist)
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
-- -    va_end (args);
- #else
-     for ( ; ; )
-     {
-@@ -304,12 +309,13 @@ report_complete (FILE *errfp, message, va_alist)
-     rep_ensuresize();
- 
- #if defined(VA_START)
-- -    VA_START (args, message);
-     for ( ; ; )
-     {
-+	VA_START(args, message);
- 	n = vsnprintf (partial_message + partial_message_size_used,
- 		       partial_message_size - partial_message_size_used,
- 		       message, args);
-+	va_end(args);
- 
- 	/* old glibc versions return -1 for truncation */
- 	if (n >= 0
-@@ -322,7 +328,6 @@ report_complete (FILE *errfp, message, va_alist)
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
-- -    va_end (args);
- #else
-     for ( ; ; )
-     {
-