[mutt] 09/17: completed the patch refresh

[Antonio Radici]

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

antonio pushed a commit to branch master
in repository mutt.

commit 54145e636ff3d94698bede035aa0d7a60fec3f08
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Jun 24 10:30:09 2017 +0100

    completed the patch refresh
---
 debian/patches/upstream/383769-score-match.patch          | 6 +++---
 debian/patches/upstream/693993-manpage-corrections.patch  | 4 ++--
 debian/patches/upstream/771125-CVE-2014-9116-jessie.patch | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/upstream/383769-score-match.patch b/debian/patches/upstream/383769-score-match.patch
index fb72c41..3edf50e 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
-@@ -135,7 +135,7 @@
+@@ -142,7 +142,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, &cache) > 0)
-+    if (mutt_pattern_exec (tmp->pat, MUTT_MATCH_FULL_ADDRESS, NULL, hdr, &cache) > 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/693993-manpage-corrections.patch b/debian/patches/upstream/693993-manpage-corrections.patch
index 65819b8..ea6b18c 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
-@@ -1458,7 +1458,7 @@
+@@ -1471,7 +1471,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
-@@ -1475,6 +1475,7 @@
+@@ -1488,6 +1488,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).
diff --git a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch b/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
index 0361e1f..cfe0a16 100644
--- a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
+++ b/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
@@ -25,9 +25,9 @@ Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
 
 --- a/lib.c
 +++ b/lib.c
-@@ -838,6 +838,9 @@
+@@ -815,6 +815,9 @@
    size_t len;
-   char *p;
+   char *p = NULL;
  
 +  if (end != NULL && end < begin)
 +    return NULL;

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