Switch to using the real committed patch, which is codewise identical to the suggested patch.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 34 insertions, 34 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index cfb11e5ca759..0dfd564dd6bf 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.143 2009/07/29 19:55:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.144 2009/07/30 08:03:56 grobian Exp $
+
+  30 Jul 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r4.ebuild,
+  -files/mutt-1.5.20-hcache-uidvalidity-size-fix.patch,
+  +files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch:
+  Switch to using the real committed patch, which is codewise identical to
+  the suggested patch.
 
 *mutt-1.5.20-r4 (29 Jul 2009)
 
diff --git a/mail-client/mutt/files/mutt-1.5.20-hcache-uidvalidity-size-fix.patch b/mail-client/mutt/files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
index 0d9f437d773f..a2d4c1efc8cf 100644
--- a/mail-client/mutt/files/mutt-1.5.20-hcache-uidvalidity-size-fix.patch
+++ b/mail-client/mutt/files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
@@ -1,28 +1,29 @@
-http://dev.mutt.org/trac/attachment/ticket/3296/hcache-uidvalidity-size-fix.patch
+http://dev.mutt.org/trac/changeset/a2a4286491b4
+http://dev.mutt.org/trac/ticket/3296
 
-diff --git a/hcache.c b/hcache.c
---- a/hcache.c
-+++ b/hcache.c
-@@ -86,7 +86,7 @@
- typedef union
+Harmonize hcache uidvalidity size to unsigned int (per IMAP RFC).
+Closes #3296.
+
+
+Index: hcache.c
+===================================================================
+--- hcache.c (revision 5986:848f08512bf3)
++++ hcache.c (revision 6002:a2a4286491b4)
+@@ -87,5 +87,5 @@
  {
    struct timeval timeval;
 -  unsigned long uid_validity;
 +  unsigned int uidvalidity;
  } validate;
  
- static void *
-@@ -589,7 +589,7 @@
-  * db_store */
+@@ -590,5 +590,5 @@
  static void *
  mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,
 -		 unsigned long uid_validity)
 +		 unsigned int uidvalidity)
  {
    unsigned char *d = NULL;
-   HEADER nh;
-@@ -598,8 +598,8 @@
-   *off = 0;
+@@ -599,6 +599,6 @@
    d = lazy_malloc(sizeof (validate));
  
 -  if (uid_validity)
@@ -31,30 +32,25 @@ diff --git a/hcache.c b/hcache.c
 +    memcpy(d, &uidvalidity, sizeof (uidvalidity));
    else
    {
-     struct timeval now;
-@@ -758,7 +758,7 @@
- 
+@@ -759,5 +759,5 @@
  int
  mutt_hcache_store(header_cache_t *h, const char *filename, HEADER * header,
 -		  unsigned long uid_validity,
 +		  unsigned int uidvalidity,
  		  size_t(*keylen) (const char *fn))
  {
-   char* data;
-@@ -768,7 +768,7 @@
-   if (!h)
+@@ -769,5 +769,5 @@
      return -1;
    
 -  data = mutt_hcache_dump(h, header, &dlen, uid_validity);
 +  data = mutt_hcache_dump(h, header, &dlen, uidvalidity);
    ret = mutt_hcache_store_raw (h, filename, data, dlen, keylen);
    
-   FREE(&data);
-diff --git a/hcache.h b/hcache.h
---- a/hcache.h
-+++ b/hcache.h
-@@ -33,8 +33,9 @@
- void *mutt_hcache_fetch(header_cache_t *h, const char *filename, size_t (*keylen)(const char *fn));
+Index: hcache.h
+===================================================================
+--- hcache.h (revision 5224:010084b62288)
++++ hcache.h (revision 6002:a2a4286491b4)
+@@ -34,6 +34,7 @@
  void *mutt_hcache_fetch_raw (header_cache_t *h, const char *filename,
                               size_t (*keylen)(const char *fn));
 +/* uidvalidity is an IMAP-specific unsigned 32 bit number */
@@ -63,16 +59,14 @@ diff --git a/hcache.h b/hcache.h
 +                      unsigned int uidvalidity, size_t (*keylen)(const char *fn));
  int mutt_hcache_store_raw (header_cache_t *h, const char* filename, void* data,
                             size_t dlen, size_t(*keylen) (const char* fn));
- int mutt_hcache_delete(header_cache_t *h, const char *filename, size_t (*keylen)(const char *fn));
-diff --git a/imap/util.c b/imap/util.c
---- a/imap/util.c
-+++ b/imap/util.c
-@@ -129,6 +129,8 @@
-   {
+Index: imap/util.c
+===================================================================
+--- imap/util.c (revision 5957:ecea9568202f)
++++ imap/util.c (revision 6002:a2a4286491b4)
+@@ -130,4 +130,6 @@
      if (*uv == idata->uid_validity)
        h = mutt_hcache_restore ((unsigned char*)uv, NULL);
 +    else
 +      dprint (3, (debugfile, "hcache uidvalidity mismatch: %u", *uv));
      FREE (&uv);
    }
- 
diff --git a/mail-client/mutt/mutt-1.5.20-r4.ebuild b/mail-client/mutt/mutt-1.5.20-r4.ebuild
index 8145ce1ec4fb..9c708a628c52 100644
--- a/mail-client/mutt/mutt-1.5.20-r4.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r4.ebuild,v 1.3 2009/07/29 20:15:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r4.ebuild,v 1.4 2009/07/30 08:03:56 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -74,7 +74,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
 	epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix.patch
 	# post-release hot-fixes
 	epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
@@ -91,6 +90,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \