[mutt] 04/04: upstream/383769-score-match.patch: changed slightly to be applied; all other patches refreshed.

Antonio Radici antonio at moszumanska.debian.org
Tue Mar 14 21:49:41 UTC 2017 

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 5cdb9482965431892b10db16ba9e30a9d08fc935
Author: Antonio Radici <antonio at debian.org>
Date:   Tue Mar 14 21:45:30 2017 +0000

    upstream/383769-score-match.patch: changed slightly to be applied; all other patches refreshed.
---
 debian/changelog                                       |  2 ++
 debian/patches/debian-specific/467432-write_bcc.patch  | 18 +++++++++---------
 .../Md.etc_mailname_gethostbyname.patch                |  4 ++--
 .../debian-specific/correct_docdir_in_man_page.patch   |  2 +-
 .../debian-specific/document_debian_defaults.patch     | 12 ++++++------
 .../dont_document_not_present_features.patch           |  4 ++--
 .../patches/debian-specific/use_usr_bin_editor.patch   |  4 ++--
 debian/patches/upstream/228671-pipe-mime.patch         |  4 ++--
 debian/patches/upstream/383769-score-match.patch       |  6 +++---
 debian/patches/upstream/528233-readonly-open.patch     |  2 +-
 .../611410-no-implicit_autoview-for-text-html.patch    |  4 ++--
 debian/patches/upstream/644992-ipv6-literal.patch      |  4 ++--
 .../patches/upstream/693993-manpage-corrections.patch  |  4 ++--
 13 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c12473..17a4658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mutt (1.8.0-1) UNRELEASED; urgency=medium
   * New upstream NeoMutt release, 2017-03-06 (Closes: 857687)
   * debian/patches:
     + neomutt-devel/832971-reset-xlabel.patch removed, already upstream.
+    + upstream/383769-score-match.patch: changed slightly to be applied.
+    + all other patches refreshed.
 
  -- Antonio Radici <antonio at debian.org>  Tue, 14 Mar 2017 21:30:19 +0000
 
diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index a2782c9..5d586bf 100644
--- a/debian/patches/debian-specific/467432-write_bcc.patch
+++ b/debian/patches/debian-specific/467432-write_bcc.patch
@@ -30,7 +30,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
 
 --- a/headers.c
 +++ b/headers.c
-@@ -57,7 +57,7 @@
+@@ -53,7 +53,7 @@
    }
    
    mutt_env_to_local (msg->env);
@@ -41,7 +41,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
    /* now copy the body of the message. */
 --- a/init.h
 +++ b/init.h
-@@ -4230,14 +4230,9 @@
+@@ -4277,14 +4277,9 @@
    { "write_bcc",	DT_BOOL, R_NONE, OPTWRITEBCC, 1},
    /*
    ** .pp
@@ -61,7 +61,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
    /*
 --- a/main.c
 +++ b/main.c
-@@ -776,7 +776,7 @@
+@@ -783,7 +783,7 @@
            mutt_env_to_intl (msg->env, NULL, NULL);
          }
  
@@ -72,7 +72,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
          fputc ('\n', fout);
 --- a/protos.h
 +++ b/protos.h
-@@ -401,7 +401,7 @@
+@@ -395,7 +395,7 @@
  int mutt_write_mime_body (BODY *, FILE *);
  int mutt_write_mime_header (BODY *, FILE *);
  int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
@@ -83,7 +83,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
  void mutt_set_header_color(CONTEXT *, HEADER *);
 --- a/send.c
 +++ b/send.c
-@@ -1077,10 +1077,10 @@
+@@ -1078,10 +1078,10 @@
      unset_option (OPTWRITEBCC);
  #endif
  #ifdef MIXMASTER
@@ -98,7 +98,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
    if (old_write_bcc)
 --- a/sendlib.c
 +++ b/sendlib.c
-@@ -1960,7 +1960,7 @@
+@@ -1961,7 +1961,7 @@
  
  
  int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
@@ -107,7 +107,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
  {
    char buffer[LONG_STRING];
    char *p, *q;
-@@ -2009,7 +2009,7 @@
+@@ -2010,7 +2010,7 @@
  #endif
      fputs ("Cc: \n", fp);
  
@@ -116,12 +116,12 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
    {
      if(mode != 0 || option(OPTWRITEBCC))
      {
-@@ -2889,7 +2889,7 @@
+@@ -2890,7 +2890,7 @@
    /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
     * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
     * */
 -  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
 +  mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1);
  
-   /* (postponment) if this was a reply of some sort, <msgid> contians the
+   /* (postponment) if this was a reply of some sort, <msgid> contains the
     * Message-ID: of message replied to.  Save it using a special X-Mutt-
diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
index cfed175..e7b2302 100644
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
@@ -18,7 +18,7 @@ used, rather than calling gethostbyname() on the actual hostname.
  #include <errno.h>
  #include <sys/wait.h>
  #include <sys/time.h>
-@@ -3464,6 +3465,31 @@
+@@ -3654,6 +3655,31 @@
    return NULL;
  }
  
@@ -50,7 +50,7 @@ used, rather than calling gethostbyname() on the actual hostname.
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;
-@@ -3557,8 +3583,10 @@
+@@ -3749,8 +3775,10 @@
    else
      Hostname = safe_strdup (utsname.nodename);
  
diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.patch b/debian/patches/debian-specific/correct_docdir_in_man_page.patch
index 1be248e..3408881 100644
--- a/debian/patches/debian-specific/correct_docdir_in_man_page.patch
+++ b/debian/patches/debian-specific/correct_docdir_in_man_page.patch
@@ -10,7 +10,7 @@ and gzipped manual.
 
 --- a/doc/mutt.man
 +++ b/doc/mutt.man
-@@ -195,7 +195,7 @@
+@@ -197,7 +197,7 @@
  System mapping between MIME types and file extensions.
  .IP "@bindir@/mutt_dotlock"
  The privileged dotlocking program.
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index e65e991..4e76fa4 100644
--- a/debian/patches/debian-specific/document_debian_defaults.patch
+++ b/debian/patches/debian-specific/document_debian_defaults.patch
@@ -10,7 +10,7 @@ from the default only on Debian systems.
 
 --- a/init.h
 +++ b/init.h
-@@ -365,6 +365,9 @@
+@@ -371,6 +371,9 @@
    ** .pp
    ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
    ** bouncing messages.  Postfix users may wish to \fIunset\fP this variable.
@@ -20,7 +20,7 @@ from the default only on Debian systems.
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*
-@@ -1224,6 +1227,9 @@
+@@ -1236,6 +1239,9 @@
    ** which case a detected one is not used.
    ** .pp
    ** Also see $$use_domain and $$hidden_host.
@@ -30,7 +30,7 @@ from the default only on Debian systems.
    */
  #ifdef HAVE_LIBIDN
    { "idn_decode",	DT_BOOL, R_BOTH, OPTIDNDECODE, 1},
-@@ -1863,6 +1869,9 @@
+@@ -1883,6 +1889,9 @@
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
@@ -40,7 +40,7 @@ from the default only on Debian systems.
    */
  #endif
    { "move",		DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
-@@ -3323,6 +3332,10 @@
+@@ -3370,6 +3379,10 @@
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
@@ -51,7 +51,7 @@ from the default only on Debian systems.
    */
    { "smime_certificates",	DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -3594,6 +3607,9 @@
+@@ -3641,6 +3654,9 @@
    ** .ts
    ** set sort=reverse-date-sent
    ** .te
@@ -61,7 +61,7 @@ from the default only on Debian systems.
    */
    { "sort_alias",	DT_SORT|DT_SORT_ALIAS,	R_NONE,	UL &SortAlias, SORT_ALIAS },
    /*
-@@ -4219,6 +4235,9 @@
+@@ -4266,6 +4282,9 @@
    ** is set to deliver directly via SMTP (see $$smtp_url), this
    ** option does nothing: mutt will never write out the ``Bcc:'' header
    ** in this case.
diff --git a/debian/patches/debian-specific/dont_document_not_present_features.patch b/debian/patches/debian-specific/dont_document_not_present_features.patch
index beba938..54a1466 100644
--- a/debian/patches/debian-specific/dont_document_not_present_features.patch
+++ b/debian/patches/debian-specific/dont_document_not_present_features.patch
@@ -19,7 +19,7 @@ documented options for Debian will be used.
 +/* # include "doc/makedoc-defs.h" include only documented options for Debian */
  #endif
  
- const struct binding_t OpGeneric[] = { /* map: generic */
+ // clang-format off
 --- a/init.h
 +++ b/init.h
 @@ -19,7 +19,7 @@
@@ -30,4 +30,4 @@ documented options for Debian will be used.
 +/* # include "makedoc-defs.h" include only documented options for Debian */
  #else
  # include "sort.h"
- #endif
+ # include "mx.h"
diff --git a/debian/patches/debian-specific/use_usr_bin_editor.patch b/debian/patches/debian-specific/use_usr_bin_editor.patch
index b1255af..38323f9 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.patch
+++ b/debian/patches/debian-specific/use_usr_bin_editor.patch
@@ -12,7 +12,7 @@ to vi.
 
 --- a/init.c
 +++ b/init.c
-@@ -3661,7 +3661,7 @@
+@@ -3853,7 +3853,7 @@
    {
      p = getenv ("EDITOR");
      if (!p)
@@ -23,7 +23,7 @@ to vi.
    Visual = safe_strdup (p);
 --- a/init.h
 +++ b/init.h
-@@ -785,7 +785,7 @@
+@@ -791,7 +791,7 @@
    ** .pp
    ** This variable specifies which editor is used by mutt.
    ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
diff --git a/debian/patches/upstream/228671-pipe-mime.patch b/debian/patches/upstream/228671-pipe-mime.patch
index abcef9c..54764cb 100644
--- a/debian/patches/upstream/228671-pipe-mime.patch
+++ b/debian/patches/upstream/228671-pipe-mime.patch
@@ -14,7 +14,7 @@ Updated in Debian bug #569279
 
 --- a/imap/message.c
 +++ b/imap/message.c
-@@ -402,7 +402,7 @@
+@@ -419,7 +419,7 @@
    char path[_POSIX_PATH_MAX];
    char *pc;
    long bytes;
@@ -23,7 +23,7 @@ Updated in Debian bug #569279
    int uid;
    int cacheno;
    IMAP_CACHE *cache;
-@@ -500,8 +500,14 @@
+@@ -517,8 +517,14 @@
  	    imap_error ("imap_fetch_message()", buf);
  	    goto bail;
  	  }
diff --git a/debian/patches/upstream/383769-score-match.patch b/debian/patches/upstream/383769-score-match.patch
index 23f6c31..fb72c41 100644
--- a/debian/patches/upstream/383769-score-match.patch
+++ b/debian/patches/upstream/383769-score-match.patch
@@ -10,12 +10,12 @@ Better matching for ~f, same as mutt-ng did.
 
 --- a/score.c
 +++ b/score.c
-@@ -133,7 +133,7 @@
+@@ -135,7 +135,7 @@
    hdr->score = 0; /* in case of re-scoring */
    for (tmp = Score; tmp; tmp = tmp->next)
    {
--    if (mutt_pattern_exec (tmp->pat, 0, NULL, hdr) > 0)
-+    if (mutt_pattern_exec (tmp->pat, MUTT_MATCH_FULL_ADDRESS, NULL, hdr) > 0)
+-    if (mutt_pattern_exec (tmp->pat, 0, NULL, hdr, &cache) > 0)
++    if (mutt_pattern_exec (tmp->pat, MUTT_MATCH_FULL_ADDRESS, NULL, hdr, &cache) > 0)
      {
        if (tmp->exact || tmp->val == 9999 || tmp->val == -9999)
        {
diff --git a/debian/patches/upstream/528233-readonly-open.patch b/debian/patches/upstream/528233-readonly-open.patch
index 2e4ae96..b723dc1 100644
--- a/debian/patches/upstream/528233-readonly-open.patch
+++ b/debian/patches/upstream/528233-readonly-open.patch
@@ -13,7 +13,7 @@ Debian bugs: #528233, updated in #572203
 
 --- a/attach.c
 +++ b/attach.c
-@@ -415,6 +415,7 @@
+@@ -413,6 +413,7 @@
        FREE (&fname);
        if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
  	goto return_error;
diff --git a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
index c9bc501..b5fdd72 100644
--- a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
+++ b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
@@ -9,7 +9,7 @@ The original Debian bug for this problem is http://bugs.debian.org/611410
 
 --- a/init.h
 +++ b/init.h
-@@ -1415,7 +1415,9 @@
+@@ -1435,7 +1435,9 @@
    ** ``\fCcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have
    ** an internal viewer defined for.  If such an entry is found, mutt will
    ** use the viewer defined in that entry to convert the body part to text
@@ -22,7 +22,7 @@ The original Debian bug for this problem is http://bugs.debian.org/611410
    /*
 --- a/muttlib.c
 +++ b/muttlib.c
-@@ -707,6 +707,9 @@
+@@ -734,6 +734,9 @@
    switch (m->type)
    {
      case TYPETEXT:
diff --git a/debian/patches/upstream/644992-ipv6-literal.patch b/debian/patches/upstream/644992-ipv6-literal.patch
index 8166e43..dd09e9f 100644
--- a/debian/patches/upstream/644992-ipv6-literal.patch
+++ b/debian/patches/upstream/644992-ipv6-literal.patch
@@ -7,7 +7,7 @@ Mutt bug: http://bugs.mutt.org/3681
 
 --- a/mutt_socket.c
 +++ b/mutt_socket.c
-@@ -456,6 +456,8 @@
+@@ -462,6 +462,8 @@
    int fd;
  
    char *host_idna = NULL;
@@ -16,7 +16,7 @@ Mutt bug: http://bugs.mutt.org/3681
    
  #ifdef HAVE_GETADDRINFO
  /* --- IPv4/6 --- */
-@@ -488,10 +490,18 @@
+@@ -494,10 +496,18 @@
    host_idna = conn->account.host;
  # endif
  
diff --git a/debian/patches/upstream/693993-manpage-corrections.patch b/debian/patches/upstream/693993-manpage-corrections.patch
index 8fa1cdb..65819b8 100644
--- a/debian/patches/upstream/693993-manpage-corrections.patch
+++ b/debian/patches/upstream/693993-manpage-corrections.patch
@@ -4,7 +4,7 @@ Debian bug: http://bugs.debian.org/693993
 
 --- a/init.h
 +++ b/init.h
-@@ -1438,7 +1438,7 @@
+@@ -1458,7 +1458,7 @@
    ** message to which you are replying.  You are strongly encouraged not to
    ** change this value, as it tends to agitate the more fanatical netizens.
    ** .pp
@@ -13,7 +13,7 @@ Debian bug: http://bugs.debian.org/693993
    ** the quoting mechanism is strictly defined for format=flowed.
    ** .pp
    ** This option is a format string, please see the description of
-@@ -1455,6 +1455,7 @@
+@@ -1475,6 +1475,7 @@
    ** .pp
    ** ``Format strings'' are similar to the strings used in the C
    ** function \fCprintf(3)\fP to format output (see the man page for more details).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git

More information about the pkg-mutt-commits mailing list