From dc9fc656893b53d452fc9e3ae67aa0e3171d401e Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Thu, 21 Jul 2005 17:42:50 +0000
Subject: [PATCH] - Update to fetchmail-6.2.5.1 to fix CAN-2005-2355 (#163819)
 - Fix crash on empty Message-ID

---
 .cvsignore     |  1 +
 fetchmail.spec | 22 ++++++++++++++++------
 sources        |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0cbb448..c252d61 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 fetchmail-6.2.5.tar.gz
+fetchmail-patch-6.2.5.1.gz
diff --git a/fetchmail.spec b/fetchmail.spec
index e875912..babafa2 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -2,12 +2,14 @@
 
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
-Version: 6.2.5
-Release: 10
+Version: 6.2.5.1
+Release: 1
 Requires: smtpdaemon
-Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.gz
-Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
-Source2: fetchmailconf.1
+Source0: http://download.berlios.de/fetchmail/fetchmail-6.2.5.tar.gz
+Source1: http://www.catb.org/~esr/fetchmail/fetchmail-6.2.5.tar.gz.asc
+Source2: http://download.berlios.de/fetchmail/fetchmail-patch-6.2.5.1.gz
+Source3: http://download.berlios.de/fetchmail/fetchmail-patch-6.2.5.1.gz.asc
+Source4: fetchmailconf.1
 Patch0: fetchmail-6.2.0-krb5-config.patch
 Patch1: fetchmail-6.2.0-gsspop.patch
 Patch2: fetchmail-6.2.0-crlf.patch
@@ -17,6 +19,7 @@ Patch5: fetchmail-6.2.5-recent-after-expunge.patch
 Patch6: fetchmail-6.2.5-krb5.patch
 Patch7: fetchmail-6.2.5-arpop.patch
 Patch8: fetchmail-6.2.5-port.patch
+Patch9: fetchmail-6.2.5.1-crash.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -54,7 +57,9 @@ Install fetchmailconf if you need help configuring fetchmail. You'll
 need to have Python and Tk installed in order to use fetchmailconf.
 
 %prep
-%setup -q
+%setup -q -n fetchmail-6.2.5
+zcat %SOURCE2 | patch -p1
+exit 0
 %patch0 -p1 -b .krb5-config
 %patch1 -p1 -b .gsspop
 %patch2 -p1 -b .crlf
@@ -64,6 +69,7 @@ need to have Python and Tk installed in order to use fetchmailconf.
 %patch6 -p1 -b .krb5
 %patch7 -p1 -b .arpop
 %patch8 -p1 -b .port
+%patch9 -p1 -b .crash
 
 autoheader
 autoconf
@@ -106,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 21 2005 Miloslav Trmac <mitr@redhat.com> - 6.2.5.1-1
+- Update to fetchmail-6.2.5.1 to fix CAN-2005-2355 (#163819)
+- Fix crash on empty Message-ID
+
 * Mon Jul 18 2005 Karsten Hopp <karsten@redhat.de> 6.2.5-10
 - Buildrequires gettext-devel for AM_GNU_GETTEXT macro
 
diff --git a/sources b/sources
index b15aca9..603849c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9956b30139edaa4f5f77c4d0dbd80225  fetchmail-6.2.5.tar.gz
+230bc2979a3d34e87db7004749e48a89  fetchmail-patch-6.2.5.1.gz