rpms/fetchmail/FC-4 .cvsignore, 1.7, 1.8 fetchmail-6.2.5-recent-after-expunge.patch, 1.1, 1.2 fetchmail.spec, 1.25, 1.26 sources, 1.7, 1.8 fetchmail-6.2.5-CAN-2005-2335.patch, 1.1, NONE fetchmail-6.2.5.tar.gz.asc, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: mitr

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

Modified Files:
	.cvsignore fetchmail-6.2.5-recent-after-expunge.patch 
	fetchmail.spec sources 
Removed Files:
	fetchmail-6.2.5-CAN-2005-2335.patch fetchmail-6.2.5.tar.gz.asc 
Log Message:
* Wed Nov 30 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5.4-1.fc4
- Update to fetchmail-6.2.5.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-4/.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	30 Nov 2005 00:43:36 -0000	1.8
@@ -1 +1,2 @@
-fetchmail-6.2.5.tar.gz
+fetchmail-6.2.5.4.tar.bz2
+fetchmail-6.2.5.4.tar.bz2.asc

fetchmail-6.2.5-recent-after-expunge.patch:
 imap.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

Index: fetchmail-6.2.5-recent-after-expunge.patch
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-4/fetchmail-6.2.5-recent-after-expunge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.2.5-recent-after-expunge.patch	30 Sep 2004 21:15:45 -0000	1.1
+++ fetchmail-6.2.5-recent-after-expunge.patch	30 Nov 2005 00:43:36 -0000	1.2
@@ -1,5 +1,5 @@
---- fetchmail-6.2.5/imap.c.expunge	2004-05-28 12:53:22.000000000 +0200
-+++ fetchmail-6.2.5/imap.c	2004-06-02 13:18:55.406090840 +0200
+--- fetchmail-6.2.5.4/imap.c.recent-after-expunge	2005-11-30 01:22:05.000000000 +0100
++++ fetchmail-6.2.5.4/imap.c	2005-11-30 01:24:52.000000000 +0100
 @@ -32,6 +32,7 @@
  #define IMAP4rev1	1	/* IMAP4 rev 1, RFC2060 */
  
@@ -8,23 +8,15 @@
  static unsigned int startcount = 1;
  static int expunged, expunge_period, saved_timeout = 0;
  static int imap_version, preauth;
-@@ -103,8 +104,15 @@
- 	/* a space is required to avoid confusion with the \Recent flag */
- 	else if (strstr(buf, " RECENT"))
- 	{
-+            recentcount_ok = 1;
- 	    recentcount = atoi(buf+2);
- 	}
-+        else if (strstr(buf, "EXPUNGE") && !strstr(buf, "OK"))
-+        {
-+            count -= atoi(buf+2);
-+            if (count < 0)
-+                count = 0;
-+        }
- 	else if (strstr(buf, "PREAUTH"))
- 	    preauth = TRUE;
- 	/*
-@@ -546,9 +554,16 @@
+@@ -104,6 +105,7 @@
+ 	    /* a space is required to avoid confusion with the \Recent flag */
+ 	    else if (strstr(buf, " RECENT"))
+ 	    {
++		recentcount_ok = 1;
+ 		recentcount = atoi(buf+2);
+ 	    }
+ 	    /* servers are not required to update the EXISTS counts,
+@@ -559,9 +561,16 @@
  {
      int	ok;
  
@@ -41,7 +33,7 @@
      expunged += deletions;
      deletions = 0;
  
-@@ -649,10 +664,6 @@
+@@ -662,10 +671,6 @@
  	 * for new mail.
  	 */
  


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-4/fetchmail.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fetchmail.spec	22 Jul 2005 22:42:10 -0000	1.25
+++ fetchmail.spec	30 Nov 2005 00:43:36 -0000	1.26
@@ -2,11 +2,11 @@
 
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
-Version: 6.2.5
-Release: 7.fc4.1
+Version: 6.2.5.4
+Release: 1.fc4
 Requires: smtpdaemon
-Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.gz
-Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
+Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
+Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Source2: fetchmailconf.1
 Patch0: fetchmail-6.2.0-krb5-config.patch
 Patch1: fetchmail-6.2.0-gsspop.patch
@@ -15,7 +15,6 @@
 Patch4: fetchmail-6.2.5-addrconf.patch
 Patch5: fetchmail-6.2.5-recent-after-expunge.patch
 Patch6: fetchmail-6.2.5-krb5.patch
-Patch7: fetchmail-6.2.5-CAN-2005-2335.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -61,9 +60,7 @@
 %patch4 -p1 -b .addrconf
 %patch5 -p1 -b .recent-after-expunge
 %patch6 -p1 -b .krb5
-%patch7 -p1 -b .can-2005-2335
-autoheader
-autoconf
+autoreconf -i
 
 %build
 LIBS=-ldl; export LIBS
@@ -104,6 +101,9 @@
 %endif
 
 %changelog
+* Wed Nov 30 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5.4-1.fc4
+- Update to fetchmail-6.2.5.4
+
 * Thu Jul 21 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-7.fc4.1
 - Fix CAN-2005-2335 (#163819, patch by Ludwig Nussel)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-4/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	30 Nov 2005 00:43:36 -0000	1.8
@@ -1 +1,2 @@
-9956b30139edaa4f5f77c4d0dbd80225  fetchmail-6.2.5.tar.gz
+e67e8b00a165805d63d9ffdbe2e43655  fetchmail-6.2.5.4.tar.bz2
+5ab0c52e49c6afca8d56bef374c099d5  fetchmail-6.2.5.4.tar.bz2.asc


--- fetchmail-6.2.5-CAN-2005-2335.patch DELETED ---


--- fetchmail-6.2.5.tar.gz.asc DELETED ---