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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 37 insertions, 37 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/Manifest b/mail-client/mutt/Manifest
index 3588dc2f35c2..b36cc86d5de8 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -13,7 +13,7 @@ AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f29
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
 AUX mutt-1.5.20-gpgme-keys-d41e043fa775.patch 589 RMD160 99b4b44459952afa55db43c5e30f204b3cae797e SHA1 432938b1876fdb95c1bfbd0ab79f6ae8430fe5e9 SHA256 9ea0850343eb54be14f58532bf4bf2a6e5ad970c43ece56e185d693eb50966e8
 AUX mutt-1.5.20-hcache-restore-address-848f08512bf3.patch 1150 RMD160 2df8927ac9b470fa6be814a66ef1dcfcb8cbdf9c SHA1 1423af5422eda09c7c7d5590f19318f7721d9e1d SHA256 86d983f4b61a4449ae148a24dc7ba1749a4b0b5848556dee5de87589a6e39cc3
-AUX mutt-1.5.20-hcache-uidvalidity-size-fix.patch 2451 RMD160 1c011ba20182d38401896ad0cd2f42fc1f46a84b SHA1 38354dffb8bbec53e22b52adf5ccaa0ea02597ab SHA256 7299d0df681300644a897b23a902c9ceadd34e9467477a9508087fc835fcd6c6
+AUX mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch 2498 RMD160 54e0d35609ab7282a689820da70aa9075ecb5cdc SHA1 df926f3a59775c14e054f6b61aa23255ace10fff SHA256 b2757e9db1b92562999fcfd5a7c5e84b5447958d8eaeb5e704b0d51155e71eea
 AUX mutt-1.5.20-header-weeding-f40de578e8ed.patch 619 RMD160 3f6e4b734f6857d0ccef60df0a1b3d21e86584ae SHA1 76487cf18f0d7ff43441e70a6902298990c2cd3a SHA256 f06b539879b4bf7cf511f7ca03d02bb4ff8dd28a864ad7dc7cf498416c20d17c
 AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e1675dca18f1f5a7baeb2c9dbaa SHA1 422621d233b5414987b2153ea81037622ed3158c SHA256 d2042d4b7ba37bfcf3173af243368a2b05f5db51a09cdbe11c3f225491d84fd0
 AUX mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch 451 RMD160 ce68b1841fa9b05cf2e30a7cb53d3475c674081a SHA1 92e8f2bbcfeb9812f727364759f58a0e3656b4fc SHA256 ed7e9295959fad0c0702550e36d83e786bec5a041a74680c3289d1698d0c8435
@@ -44,6 +44,6 @@ EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 3317bb5ee6c7d076c141fc1dc4998116872a32f8 SHA1 c9786de58bfa87b6ed392fb6190cc0bf69df8464 SHA256 d5c91dc2f7c620a36f690b56560ba8f5122b21c65259310366e245d3a660a692
 EBUILD mutt-1.5.20-r1.ebuild 7031 RMD160 fc5bbe19395e6bc0036960ec2ce806b72d02d539 SHA1 646babb8c9b3e293b3e1262543bdf35a4a83b145 SHA256 e537a4334aa9b2f722df8ce3527337ed74cce55121a35aab8d1921061cf90a5b
-EBUILD mutt-1.5.20-r4.ebuild 8390 RMD160 13697c9b817f0bbf9f458011a187d929008597a7 SHA1 9c3827cabe2b7eaa4f452601c62a753cefe43e15 SHA256 b14002a2e33186800172219a9d3e80ae28e4f664267c88d6d9cd49d46e20b6c5
-MISC ChangeLog 33203 RMD160 47f30cb97f10bf4a45b8fd6f17872c1987155351 SHA1 bc7872a677e48d509f7342e911d543bd04871751 SHA256 603137ac5d84ee06891ded1b514c96dd15dba140fe939c03e3ef9d66bfb53a49
+EBUILD mutt-1.5.20-r4.ebuild 8403 RMD160 7443313fd2857976127fa8ec7513ee92f43a0391 SHA1 df4eb702390460523a93ab8f03f898f49145614c SHA256 ef50a9ff949007501308ee01c2a53f22ed72d7f4b96518eb596e39796af434ba
+MISC ChangeLog 33501 RMD160 24c63f79c55cf75fa62f362028648a6741ba45de SHA1 f4dfaa0eb2d385c81826a93b3c5d1681fd21249e SHA256 033180da9993b26d150ec8531da63cee4daf517266a5311315c9ba7764561a85
 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b
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}"')"/' \