patch cleanup/removal

mutt-1.5.21-certscomp.patch

@@ -1,22 +0,0 @@
-Upstream fix:
-http://dev.mutt.org/trac/ticket/3547
-
---- a/mutt_ssl_gnutls.c
-+++ b/mutt_ssl_gnutls.c
-@@ -440,6 +440,14 @@
-     }
- 
--    ptr = (unsigned char *)strstr((char*)b64_data.data, CERT_SEP) + 1;
--    ptr = (unsigned char *)strstr((char*)ptr, CERT_SEP);
-+    /* find start of cert, skipping junk */
-+    ptr = (unsigned char *)strstr((char*)b64_data.data, CERT_SEP);
-+    if (!ptr)
-+    {
-+      gnutls_free(cert.data);
-+      FREE (&b64_data_data);
-+      return 0;
-+    }
-+    /* find start of next cert */
-+    ptr = (unsigned char *)strstr((char*)ptr + 1, CERT_SEP);
- 
-     b64_data.size = b64_data.size - (ptr - b64_data.data);

mutt-1.5.21-updating.patch

@@ -1,24 +0,0 @@
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1284573211 25200
-# Branch HEAD
-# Node ID bd0afbb35c65a9e80c55636e214ca85890554ce1
-# Parent  b42be44bb41a2bca21289aa10a490f58e6bbf044
-Belatedly update UPDATING
-
-diff -r b42be44bb41a -r bd0afbb35c65 UPDATING
---- a/UPDATING	Wed Sep 15 10:21:04 2010 -0700
-+++ b/UPDATING	Wed Sep 15 10:53:31 2010 -0700
-@@ -4,8 +4,11 @@
- The keys used are:
-   !: modified feature, -: deleted feature, +: new feature
- 
--hg tip:
-+1.5.21 (2010-09-15):
- 
-+  + $mail_check_recent controls whether all unread mail or only new mail
-+    since the last mailbox visit will be reported as new
-+  + %D format expando for $folder_format
-   ! $thorough_search defaults to yes
-   + imap-logout-all closes all open IMAP connections
-   ! header/body cache paths are always UTF-8

mutt.spec

@@ -28,14 +28,11 @@ Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch5: mutt-1.5.21-updating.patch
 Patch6: mutt-1.5.21-hdrcnt.patch
 Patch7: mutt-1.5.21-testcert.patch
 Patch8: mutt-1.5.21-cabundle.patch
 Patch9: mutt-1.5.21-gpgme-1.2.0.patch
 Patch10: mutt-1.5.21-pophash.patch
-#FIXME fixed in upstream
-#Patch11: mutt-1.5.21-certscomp.patch
 Patch12: mutt-1.5.21-notation.patch
 Patch13: mutt-1.5.21-syncdebug.patch
 Patch14: mutt-1.5.21-writehead.patch
@@ -76,18 +73,14 @@ for selecting groups of messages.
 
 %prep
 %setup -q
-#FIXME
+#FIXME ./prepare -V
-#./prepare -V
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p1 -b .updating
 %patch6 -p1 -b .hdrcnt
 %patch7 -p1 -b .testcert
 %patch8 -p1 -b .cabundle
 %patch9 -p1 -b .gpgme-1.2.0
 %patch10 -p1 -b .pophash
-#FIXME
-#%patch11 -p1 -b .certscomp
 %patch12 -p1 -b .notation
 %patch13 -p1 -b .syncdebug
 %patch14 -p1 -b .writehead