- cd.signatures, keep_to, smime.rc, xface patches updated to 1.11.0

diff --git a/mutt-cd.signatures_menu.patch b/mutt-cd.signatures_menu.patch
index 186bb9499558695dca31a086100e84de48e21a52..2267d31e06c22d852e3d288956ed0762ff6315be 100644 (file)
--- a/mutt-cd.signatures_menu.patch
+++ b/mutt-cd.signatures_menu.patch
@@ -28,7 +28,7 @@ diff -pruN2 mutt-1.3.27.orig/OPS mutt-1.3.27/OPS
  OP_PREV_PAGE "move to the previous page"
 +OP_PREV_SIG "move to the previous signature"
  OP_PRINT "print the current entry"
  OP_PREV_PAGE "move to the previous page"
 +OP_PREV_SIG "move to the previous signature"
  OP_PRINT "print the current entry"

- OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"
+ OP_PURGE_MESSAGE "delete the current entry, bypassing the trash folder"

  OP_QUERY "query external program for addresses"
  OP_QUERY_APPEND "append new query results to current results"
  OP_QUIT "save changes to mailbox and quit"
  OP_QUERY "query external program for addresses"
  OP_QUERY_APPEND "append new query results to current results"
  OP_QUIT "save changes to mailbox and quit"


@@ -44,12 +44,11 @@ diff -pruN2 mutt-1.3.27.orig/OPS mutt-1.3.27/OPS
 diff -pruN2 mutt-1.3.27.orig/compose.c mutt-1.3.27/compose.c
 --- mutt-1.3.27.orig/compose.c Mon Dec  3 11:17:57 2001
 +++ mutt-1.3.27/compose.c      Wed Jan 23 22:35:32 2002
 diff -pruN2 mutt-1.3.27.orig/compose.c mutt-1.3.27/compose.c
 --- mutt-1.3.27.orig/compose.c Mon Dec  3 11:17:57 2001
 +++ mutt-1.3.27/compose.c      Wed Jan 23 22:35:32 2002

-@@ -1103,4 +1103,10 @@ int mutt_compose_menu (HEADER *msg,   /*
+@@ -1103,4 +1103,9 @@ int mutt_compose_menu (HEADER *msg,   /*

        break;
  
 +      case OP_COMPOSE_SIG:
 +      mutt_signature(msg->content->filename);
        break;
  
 +      case OP_COMPOSE_SIG:
 +      mutt_signature(msg->content->filename);

-+      MAYBE_REDRAW (menu->redraw);

 +      mutt_update_encoding (msg->content);
 +      break;
 +
 +      mutt_update_encoding (msg->content);
 +      break;
 +


@@ -179,7 +178,7 @@ diff -pruN2 mutt-1.3.27.orig/protos.h mutt-1.3.27/protos.h
 diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 --- mutt-1.3.27.orig/signature.c       Thu Jan  1 01:00:00 1970
 +++ mutt-1.3.27/signature.c    Wed Jan 23 22:35:32 2002
 diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 --- mutt-1.3.27.orig/signature.c       Thu Jan  1 01:00:00 1970
 +++ mutt-1.3.27/signature.c    Wed Jan 23 22:35:32 2002

-@@ -0,0 +1,504 @@
+@@ -0,0 +1,499 @@

 +/*
 + * Copyright (C) 2001 Cedric Duval <cedricduval@free.fr>
 + * 
 +/*
 + * Copyright (C) 2001 Cedric Duval <cedricduval@free.fr>
 + * 


@@ -451,7 +450,6 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +      break;
 +
 +      case OP_EXIT:
 +      break;
 +
 +      case OP_EXIT:

-+      set_option (OPTNEEDREDRAW);

 +        done = 1;
 +        break;
 +    }
 +        done = 1;
 +        break;
 +    }


@@ -475,7 +473,7 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +
 +  snprintf (buf, sizeof(buf), searchBuf ? searchBuf : "");
 +  if (mutt_get_field (_("Search for: "), buf,
 +
 +  snprintf (buf, sizeof(buf), searchBuf ? searchBuf : "");
 +  if (mutt_get_field (_("Search for: "), buf,

-+                    sizeof (buf), M_CLEAR) != 0 || !buf[0])
++                    sizeof (buf), MUTT_CLEAR) != 0 || !buf[0])

 +    return (NULL);
 +  if (menu->menu >= 0 && menu->menu < MENU_MAX)
 +  {
 +    return (NULL);
 +  if (menu->menu >= 0 && menu->menu < MENU_MAX)
 +  {


@@ -629,7 +627,6 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +          done = 1;
 +        }
 +
 +          done = 1;
 +        }
 +

-+        MAYBE_REDRAW (menu->redraw);

 +        free_sig_list (&sigl);
 +      }
 +      break;
 +        free_sig_list (&sigl);
 +      }
 +      break;


@@ -648,7 +645,6 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +          done = 1;
 +        }
 +
 +          done = 1;
 +        }
 +

-+        MAYBE_REDRAW (menu->redraw);

 +        free_sig_list (&sigl);
 +              }
 +      break;
 +        free_sig_list (&sigl);
 +              }
 +      break;


@@ -681,8 +677,6 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
 +
 +  if (sig_dir_menu (SigDirectory, msg_file) == -1)
 +    mutt_error (_("%s: no files in this directory"), SigDirectory);
 +
 +  if (sig_dir_menu (SigDirectory, msg_file) == -1)
 +    mutt_error (_("%s: no files in this directory"), SigDirectory);

-+  else
-+    set_option (OPTNEEDREDRAW);

 +}
 diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES
 --- mutt-1.3.27.orig/PATCHES    Mon Nov 26 20:16:52 2001
 +}
 diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES
 --- mutt-1.3.27.orig/PATCHES    Mon Nov 26 20:16:52 2001

diff --git a/mutt-keep_to.patch b/mutt-keep_to.patch
index 1dcbb4cebe55790f256151656b5e6375f8c5ba13..70567b1c4eeb65e2f8d613622dfabaca3362b546 100644 (file)
--- a/mutt-keep_to.patch
+++ b/mutt-keep_to.patch
@@ -31,7 +31,7 @@ diff -ur mutt-1.5.23.orig/init.h mutt-1.5.23/init.h
 +  ** Controls where recipients from ``To:'' list go on group-reply. If \fIset\fP
 +  ** they are copied to ``To:'' otherwise to ``Cc:''.
 +  */
 +  ** Controls where recipients from ``To:'' list go on group-reply. If \fIset\fP
 +  ** they are copied to ``To:'' otherwise to ``Cc:''.
 +  */

-   { "locale",         DT_STR,  R_BOTH, UL &Locale, UL "C" },
+   { "mail_check",     DT_NUM,  R_NONE, UL &BuffyTimeout, 5 },

    /*
    ** .pp
 diff -ur mutt-1.5.23.orig/mutt.h mutt-1.5.23/mutt.h
    /*
    ** .pp
 diff -ur mutt-1.5.23.orig/mutt.h mutt-1.5.23/mutt.h

diff --git a/mutt-smime.rc.patch b/mutt-smime.rc.patch
index 1bef8a950894b7287fd298eb5de93d6b3b6ee93d..c720e1ee31b5604798b762125568294f86113061 100644 (file)
--- a/mutt-smime.rc.patch
+++ b/mutt-smime.rc.patch
@@ -9,7 +9,7 @@
  
  # Uncomment this if you don't want to set labels for certificates you add.
  # unset smime_ask_cert_label
  
  # Uncomment this if you don't want to set labels for certificates you add.
  # unset smime_ask_cert_label

-@@ -13,30 +13,31 @@
+@@ -13,10 +13,10 @@

  set smime_timeout=300
  
  # Global crypto options -- these affect PGP operations as well.
  set smime_timeout=300
  
  # Global crypto options -- these affect PGP operations as well.


@@ -23,15 +23,8 @@
 +# set crypt_replysignencrypted = yes
  set crypt_verify_sig = yes
  
 +# set crypt_replysignencrypted = yes
  set crypt_verify_sig = yes
  

- # Section A: Key Management.

  
  

- # The (default) keyfile for signing/decrypting.  Uncomment the following
- # line and replace the keyid with your own.
--set smime_default_key="12345678.0"
-+# set smime_default_key="12345678.0"
- 
- # Uncomment to make mutt ask what key to use when trying to decrypt a message.
- # It will use the default key above (if that was set) else.
+@@ -47,13 +47,14 @@

  # unset smime_decrypt_use_default_key
  
  # Path to a file or directory with trusted certificates
  # unset smime_decrypt_use_default_key
  
  # Path to a file or directory with trusted certificates


@@ -40,8 +33,7 @@
 +set smime_ca_location="/etc/certs/ca-certificates.crt"
  
  # Path to where all known certificates go. (must exist!)
 +set smime_ca_location="/etc/certs/ca-certificates.crt"
  
  # Path to where all known certificates go. (must exist!)

--set smime_certificates="~/.smime/certificates"
-+# set smime_certificates="~/.smime/certificates"
+ set smime_certificates="~/.smime/certificates"

  
  # Path to where all private keys go. (must exist!)
 -set smime_keys="~/.smime/keys"
  
  # Path to where all private keys go. (must exist!)
 -set smime_keys="~/.smime/keys"

diff --git a/mutt-xface.patch b/mutt-xface.patch
index bca5e9f4cd004e3f04e8ffb400a20ea33e40df3a..32558956f2c8a938c356dd9c623e737aa899a694 100644 (file)
--- a/mutt-xface.patch
+++ b/mutt-xface.patch
@@ -119,11 +119,10 @@ diff -urp ../MUTT/mutt/init.c mutt/init.c
  #include <sys/wait.h>
  
  void toggle_quadoption (int opt)
  #include <sys/wait.h>
  
  void toggle_quadoption (int opt)

-@@ -2356,3 +2358,131 @@ int mutt_get_hook_type (const char *name
-       return c->data;
-   return 0;
+@@ -2356,3 +2358,130 @@ int mutt_get_hook_type (const char *name
+   return 1;

  }
  }

-+
+ 

 +void mutt_start_slrnface(void)
 +{
 +  char *fifo;
 +void mutt_start_slrnface(void)
 +{
 +  char *fifo;


@@ -276,18 +275,18 @@ diff -urp ../MUTT/mutt/main.c mutt/main.c
  
 +    mutt_start_slrnface();
 +
  
 +    mutt_start_slrnface();
 +

-     if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
+     if((Context = mx_open_mailbox (folder, ((flags & MUTT_RO) || option (OPTREADONLY)) ? MUTT_READONLY : 0, NULL))

         || !explicit_folder)
      {
 @@ -913,6 +915,8 @@ int main (int argc, char **argv)
         || !explicit_folder)
      {
 @@ -913,6 +915,8 @@ int main (int argc, char **argv)

-       FREE (&Context);

      }
      }

-     mutt_endwin (Errorbuf);
+ 
+     exit_endwin_msg = Errorbuf;

 +
 +    mutt_stop_slrnface();
    }
  
 +
 +    mutt_stop_slrnface();
    }
  

-   exit (0);
+   exit_code = 0;

 diff -urp ../MUTT/mutt/mutt.h mutt/mutt.h
 --- ../MUTT/mutt/mutt.h        2004-07-21 13:33:02.000000000 +0200
 +++ mutt/mutt.h        2004-07-21 13:33:47.000000000 +0200
 diff -urp ../MUTT/mutt/mutt.h mutt/mutt.h
 --- ../MUTT/mutt/mutt.h        2004-07-21 13:33:02.000000000 +0200
 +++ mutt/mutt.h        2004-07-21 13:33:47.000000000 +0200


@@ -405,17 +404,17 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
 +        mutt_suppress_xface ();
          mutt_help (MENU_PAGER);
 +        mutt_show_xface ();
 +        mutt_suppress_xface ();
          mutt_help (MENU_PAGER);
 +        mutt_show_xface ();

-         redraw = REDRAW_FULL;
+         pager_menu->redraw = REDRAW_FULL;

          InHelp = 0;
        }
          InHelp = 0;
        }

-@@ -2383,59 +2448,71 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
+@@ -2383,58 +2448,70 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);

        case OP_MAIL:
        CHECK_MODE(IsHeader (extra) && !IsAttach (extra));
          CHECK_ATTACH;      
 +      mutt_suppress_xface ();
        ci_send_message (0, NULL, NULL, extra->ctx, NULL);
 +      mutt_show_xface ();
        case OP_MAIL:
        CHECK_MODE(IsHeader (extra) && !IsAttach (extra));
          CHECK_ATTACH;      
 +      mutt_suppress_xface ();
        ci_send_message (0, NULL, NULL, extra->ctx, NULL);
 +      mutt_show_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
        case OP_REPLY:
        break;
  
        case OP_REPLY:


@@ -423,13 +422,12 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
          CHECK_ATTACH;      
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra)) 
          CHECK_ATTACH;      
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra)) 

-         mutt_attach_reply (extra->fp, extra->hdr, extra->idx,
-                            extra->idxlen, extra->bdy,
-                            SENDREPLY);
+         mutt_attach_reply (extra->fp, extra->hdr, extra->actx,
+                            extra->bdy, SENDREPLY);

        else
          ci_send_message (SENDREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();
        else
          ci_send_message (SENDREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
        case OP_RECALL_MESSAGE:
        break;
  
        case OP_RECALL_MESSAGE:


@@ -438,7 +436,7 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
 +      mutt_suppress_xface();
        ci_send_message (SENDPOSTPONED, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();
 +      mutt_suppress_xface();
        ci_send_message (SENDPOSTPONED, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
        case OP_GROUP_REPLY:
        break;
  
        case OP_GROUP_REPLY:


@@ -446,12 +444,12 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
          CHECK_ATTACH;
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))
          CHECK_ATTACH;
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))

-         mutt_attach_reply (extra->fp, extra->hdr, extra->idx,
-                            extra->idxlen, extra->bdy, SENDREPLY|SENDGROUPREPLY);
+         mutt_attach_reply (extra->fp, extra->hdr, extra->actx,
+                            extra->bdy, SENDREPLY|SENDGROUPREPLY);

          else
          ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_suppress_xface ();
          else
          ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_suppress_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
        case OP_LIST_REPLY:
        break;
  
        case OP_LIST_REPLY:


@@ -459,12 +457,12 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
          CHECK_ATTACH;        
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))
          CHECK_ATTACH;        
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))

-         mutt_attach_reply (extra->fp, extra->hdr, extra->idx,
-                            extra->idxlen, extra->bdy, SENDREPLY|SENDLISTREPLY);
+         mutt_attach_reply (extra->fp, extra->hdr, extra->actx,
+                            extra->bdy, SENDREPLY|SENDLISTREPLY);

          else
          ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();
          else
          ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
        case OP_FORWARD_MESSAGE:
        break;
  
        case OP_FORWARD_MESSAGE:


@@ -472,12 +470,12 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
          CHECK_ATTACH;
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))
          CHECK_ATTACH;
 +      mutt_suppress_xface();
          if (IsMsgAttach (extra))

-         mutt_attach_forward (extra->fp, extra->hdr, extra->idx,
-                              extra->idxlen, extra->bdy);
+         mutt_attach_forward (extra->fp, extra->hdr, extra->actx,
+                              extra->bdy);

          else
          ci_send_message (SENDFORWARD, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();
          else
          ci_send_message (SENDFORWARD, NULL, NULL, extra->ctx, extra->hdr);
 +      mutt_show_xface ();

-       redraw = REDRAW_FULL;
+       pager_menu->redraw = REDRAW_FULL;

        break;
  
 @@ -2485,7 +2562,9 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);
        break;
  
 @@ -2485,7 +2562,9 @@ CHECK_IMAP_ACL(IMAP_ACL_WRITE);


@@ -487,13 +485,13 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
 +      mutt_suppress_xface ();
        mutt_shell_escape ();
 +      mutt_show_xface ();
 +      mutt_suppress_xface ();
        mutt_shell_escape ();
 +      mutt_show_xface ();

-       MAYBE_REDRAW (redraw);

        break;
  
        break;
  

+       case OP_TAG:

 @@ -2644,5 +2723,6 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 @@ -2644,5 +2723,6 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);

-   FREE (&lineInfo);
-   if (index)
-     mutt_menuDestroy(&index);
+   FREE (&rd.pager_status_window);
+   FREE (&rd.pager_window);
+ 

 +  mutt_clear_xface ();
    return (rc != -1 ? rc : 0);
  }
 +  mutt_clear_xface ();
    return (rc != -1 ? rc : 0);
  }

diff --git a/mutt.spec b/mutt.spec
index 53952138a8eee690721addabf76aa9f29611be66..36747fe628a77be6c1632c0bd49aa1b27a7fa594 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -9,7 +9,7 @@
 %bcond_with    folder_column   # build with folder_column patch
 %bcond_with    imap_recent     # show IMAP RECENT messages as new (instead of UNSEEN)
 %bcond_without sasl            # don't use sasl
 %bcond_with    folder_column   # build with folder_column patch
 %bcond_with    imap_recent     # show IMAP RECENT messages as new (instead of UNSEEN)
 %bcond_without sasl            # don't use sasl

-%bcond_without home_etc        # don't use home_etc
+%bcond_with    home_etc        # use home_etc

 %bcond_with    gdbm            # use GDBM instead of BerkeleyDB
 %bcond_with    qdbm            # use QDBM instead of BerkeleyDB
 %bcond_with    tokyocabinet    # use TokyoCabinet instead of BerkeleyDB
 %bcond_with    gdbm            # use GDBM instead of BerkeleyDB
 %bcond_with    qdbm            # use QDBM instead of BerkeleyDB
 %bcond_with    tokyocabinet    # use TokyoCabinet instead of BerkeleyDB


@@ -160,31 +160,51 @@ Mutt - це невеликий, але потужний повноекранни
 #%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 #%patch2 -p1
 %patch3 -p1
 %patch4 -p1

-#%patch5 -p1
+%patch5 -p1
+# trash folder patch applied upstream

 #%patch6 -p1
 #%patch6 -p1

+# purge patch applied upstream

 #%patch7 -p1
 #%patch7 -p1

-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p1
-#%patch11 -p1
-#%patch12 -p1
-#%patch13 -p1
-#%{?with_home_etc:%patch14 -p1}
-#%patch15 -p1
+# cd.signatures
+%patch8 -p1
+# crypt-autosolect
+%patch9 -p1
+# manual
+%patch10 -p1
+# xface
+%patch11 -p1
+# muttrc_mbox_path
+%patch12 -p1
+# po
+%patch13 -p1
+%{?with_home_etc:%patch14 -p1}
+# muttrc
+%patch15 -p1
+# muttbug-tmp - idea dropped, issues to be reported via gitlab

 #%patch16 -p1
 # breaks display if arrow_cursor is set
 #%patch16 -p1
 # breaks display if arrow_cursor is set

-#%{?with_folder_column:%patch17 -p1}
-#%{?with_imap_recent:%patch18 -p1}
-#%patch19 -p1
-#%patch20 -p1
-#%patch21 -p1
-#%patch22 -p1
-#%patch23 -p1
-#%{?with_nntp:%patch24 -p1}
-#%patch25 -p1
-#%patch26 -p1
-#%patch27 -p1
-#%patch28 -p1
+%{?with_folder_column:%patch17 -p1}
+%{?with_imap_recent:%patch18 -p1}
+# muttr.head
+%patch19 -p1
+# smime.rc
+%patch20 -p1
+# sidebar.patch - applied upstream
+# %patch21 -p1
+# imap_fast_trash - applied upstream
+# %patch22 -p1
+# db
+%patch23 -p1
+# nntp
+%{?with_nntp:%patch24 -p1}
+# formats-ecurity
+%patch25 -p1
+# keep-to
+%patch26 -p1
+# mutt-gpgme - applied upstream
+# %patch27 -p1
+# openssl - applied upstream
+# %patch28 -p1

 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}