rpms/fetchmail/devel fetchmail-6.2.5.1-crash.patch, NONE, 1.1 fetchmail-patch-6.2.5.1.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 fetchmail.spec, 1.26, 1.27 sources, 1.7, 1.8

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18080

Modified Files:
	.cvsignore fetchmail.spec sources 
Added Files:
	fetchmail-6.2.5.1-crash.patch fetchmail-patch-6.2.5.1.gz.asc 
Log Message:
* Thu Jul 21 2005 Miloslav Trmac <mitr at 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


fetchmail-6.2.5.1-crash.patch:
 pop3.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE fetchmail-6.2.5.1-crash.patch ---
--- fetchmail-6.2.5/pop3.c.crash	2005-07-21 18:09:01.000000000 +0200
+++ fetchmail-6.2.5/pop3.c	2005-07-21 18:09:31.000000000 +0200
@@ -609,6 +609,8 @@
 	    char *p = buf + 11;
 	    p += strspn(p, POSIX_space);
 	    p = strtok(p, POSIX_space);
+	    if (p == NULL)
+	        p = "";
 	    strlcpy(id, p, idsize);
 	}
     }


--- NEW FILE fetchmail-patch-6.2.5.1.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQBC3oRUvmGDOQUufZURAlK/AKDuIgYsVTYSLHL3sJLA5/lJgUgh1QCgnljI
B13y91n9K0n61ydWXYWWT+M=
=Hs9Q
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2004 04:46:48 -0000	1.7
+++ .cvsignore	21 Jul 2005 17:42:50 -0000	1.8
@@ -1 +1,2 @@
 fetchmail-6.2.5.tar.gz
+fetchmail-patch-6.2.5.1.gz


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fetchmail.spec	18 Jul 2005 14:15:46 -0000	1.26
+++ fetchmail.spec	21 Jul 2005 17:42:50 -0000	1.27
@@ -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 @@
 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 @@
 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 @@
 %patch6 -p1 -b .krb5
 %patch7 -p1 -b .arpop
 %patch8 -p1 -b .port
+%patch9 -p1 -b .crash
 
 autoheader
 autoconf
@@ -106,6 +112,10 @@
 %endif
 
 %changelog
+* Thu Jul 21 2005 Miloslav Trmac <mitr at 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 at redhat.de> 6.2.5-10
 - Buildrequires gettext-devel for AM_GNU_GETTEXT macro
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2004 04:46:48 -0000	1.7
+++ sources	21 Jul 2005 17:42:50 -0000	1.8
@@ -1 +1,2 @@
 9956b30139edaa4f5f77c4d0dbd80225  fetchmail-6.2.5.tar.gz
+230bc2979a3d34e87db7004749e48a89  fetchmail-patch-6.2.5.1.gz