Hello community,

here is the log from the commit of package mutt for openSUSE:Factory
checked in at Thu Jul 7 15:45:04 CEST 2011.



--------
--- mutt/mutt.changes   2011-06-20 15:25:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutt/mutt.changes      2011-07-07 
13:27:54.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul  7 11:26:18 UTC 2011 - [email protected]
+
+- Update patch for Mutt Ticket #3288 and check for empty headers
+  in mx_update_context() (bnx#704359)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.twHfPQ/_old  2011-07-07 15:40:49.000000000 +0200
+++ /var/tmp/diff_new_pack.twHfPQ/_new  2011-07-07 15:40:49.000000000 +0200
@@ -42,7 +42,7 @@
 #Requires:    desktop-data-SuSE
 AutoReqProv:    on
 Version:        1.5.21
-Release:        18
+Release:        20
 Summary:        Mail Program
 # ftp://ftp.mutt.org/mutt/devel/
 Source0:        %name-%version.tar.bz2

++++++ mutt-1.5.21-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch 
new/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch
--- old/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch       
2011-06-20 14:11:41.000000000 +0200
+++ new/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch       
2011-07-07 13:21:51.000000000 +0200
@@ -8,7 +8,7 @@
 
 --- a/imap/message.c
 +++ b/imap/message.c
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ int imap_read_headers (IMAP_DATA* idata,
    char *hdrreq = NULL;
    FILE *fp;
    char tempfile[_POSIX_PATH_MAX];
@@ -17,7 +17,7 @@
    IMAP_HEADER h;
    IMAP_STATUS* status;
    int rc, mfhrc, oldmsgcount;
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ int imap_read_headers (IMAP_DATA* idata,
            continue;
          }
  
@@ -26,7 +26,15 @@
          ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
          if (ctx->hdrs[idx])
          {
-@@ -282,13 +282,14 @@
+@@ -211,6 +211,7 @@ int imap_read_headers (IMAP_DATA* idata,
+           dprint (3, (debugfile, "bad cache entry at %d, giving up\n", h.sid 
- 1));
+           imap_free_header_data((void**) (void*) &h.data);
+           evalhc = 0;
++          idx--;
+         }
+       }
+       while (rc != IMAP_CMD_OK && mfhrc == -1);
+@@ -273,18 +274,20 @@ int imap_read_headers (IMAP_DATA* idata,
        {
          dprint (2, (debugfile, "msg_fetch_header: ignoring fetch response 
with no body\n"));
          mfhrc = -1;
@@ -42,3 +50,17 @@
        if (idx > msgend)
        {
          dprint (1, (debugfile, "imap_read_headers: skipping FETCH response 
for "
+                     "unknown message number %d\n", h.sid));
+         mfhrc = -1;
++        idx--;
+         continue;
+       }
+       /* May receive FLAGS updates in a separate untagged response (#2935) */
+@@ -292,6 +295,7 @@ int imap_read_headers (IMAP_DATA* idata,
+       {
+       dprint (2, (debugfile, "imap_read_headers: message %d is not new\n",
+                   h.sid));
++        idx--;
+       continue;
+       }
+ 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mutt-1.5.21-patches/3459-split-fetches.patch 
new/mutt-1.5.21-patches/3459-split-fetches.patch
--- old/mutt-1.5.21-patches/3459-split-fetches.patch    2011-06-20 
14:12:15.000000000 +0200
+++ new/mutt-1.5.21-patches/3459-split-fetches.patch    2011-07-07 
13:23:06.000000000 +0200
@@ -3,7 +3,7 @@
 
 --- a/imap/message.c
 +++ b/imap/message.c
-@@ -242,6 +242,15 @@
+@@ -243,6 +243,15 @@ int imap_read_headers (IMAP_DATA* idata,
        char *cmd;
  
        fetchlast = msgend + 1;

++++++ mutt-1.5.21.dif ++++++
--- /var/tmp/diff_new_pack.twHfPQ/_old  2011-07-07 15:40:49.000000000 +0200
+++ /var/tmp/diff_new_pack.twHfPQ/_new  2011-07-07 15:40:49.000000000 +0200
@@ -296,3 +296,15 @@
    { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
    /*
    ** .pp
+--- mx.c
++++ mx.c       2011-07-07 11:24:48.680426606 +0000
+@@ -1591,6 +1591,9 @@ void mx_update_context (CONTEXT *ctx, in
+   {
+     h = ctx->hdrs[msgno];
+ 
++    if (!h)
++      continue;
++
+     if (WithCrypto)
+     {
+       /* NOTE: this _must_ be done before the check for mailcap! */




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to