[mutt] 01/01: upstream/771125-CVE-2014-9116-jessie.patch removed, already upstream.

[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 59fbd2be358b47c71b70b39d6af3dfb3eeed730d
Author: Antonio Radici <antonio at debian.org>
Date:   Sun Jun 25 10:03:59 2017 +0100

    upstream/771125-CVE-2014-9116-jessie.patch removed, already upstream.
    
    Committed by mutt devs in https://dev.mutt.org/trac/changeset/2a6bfdb9f869d8f07b453f6697c8de0246e24755
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 .../upstream/771125-CVE-2014-9116-jessie.patch     | 37 ----------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60d1b59..68fefb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mutt (1.8.3+neomutt20170609-2) UNRELEASED; urgency=medium
 
   * debian/patches:
     + upstream/644992-ipv6-literal.patch removed, already upstream.
+    + upstream/771125-CVE-2014-9116-jessie.patch removed, already upstream.
 
  -- Antonio Radici <antonio at debian.org>  Sun, 25 Jun 2017 10:00:09 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 62011d5..0b1dc27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ misc/gpg.rc-paths.patch
 misc/smime.rc.patch
 upstream/528233-readonly-open.patch
 upstream/383769-score-match.patch
-upstream/771125-CVE-2014-9116-jessie.patch
 upstream/693993-manpage-corrections.patch
 upstream/749483-conststrings.patch
 upstream/fix_doc_builddir.patch
diff --git a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch b/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
deleted file mode 100644
index cfe0a16..0000000
--- a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Fri, 18 Sep 2015 11:48:47 +0200
-Subject: 771125-CVE-2014-9116-jessie
-
-This patch solves the issue raised by CVE-2014-9116 in bug 771125.
-
-We correctly redefine what are the whitespace characters as per RFC5322; by
-doing so we prevent mutt_substrdup from being used in a way that could lead to
-a segfault.
-
-The lib.c part was written by Antonio Radici <antonio at debian.org> to prevent
-crashes due to this kind of bugs from happening again.
-
-The wheezy version of this patch is slightly different, therefore this patch
-has -jessie prefixed in its name.
-
-The sendlib.c part was provided by Salvatore Bonaccorso and it is the same as
-the upstream patch reported here:
-http://dev.mutt.org/trac/attachment/ticket/3716/ticket-3716-stable.patch
-
-Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
----
- lib.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/lib.c
-+++ b/lib.c
-@@ -815,6 +815,9 @@
-   size_t len;
-   char *p = NULL;
- 
-+  if (end != NULL && end < begin)
-+    return NULL;
-+
-   if (end)
-     len = end - begin;
-   else

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