[mutt] 11/16: Reorder and refresh all patches

Faidon Liambotis paravoid at moszumanska.debian.org
Mon Jul 4 15:51:49 UTC 2016


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

paravoid pushed a commit to branch experimental
in repository mutt.

commit efc322debc13556afe815f3e3bf420b7eabf73a0
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Mon Jul 4 16:40:26 2016 +0300

    Reorder and refresh all patches
    
    dpkg isn't as lenient as quilt is and fuzz or large offsets are
    unacceptable. Refresh all patches and while at it, move the timeout-hook
    patch to features/ and both it and multiple-ffc at the top.
---
 .../patches/debian-specific/467432-write_bcc.patch | 30 +++++++---------------
 .../566076-build_doc_adjustments.patch             |  6 ++---
 .../debian-specific/assumed_charset-compat.patch   |  4 +--
 .../correct_docdir_in_man_page.patch               |  4 +--
 .../debian-specific/document_debian_defaults.patch | 16 +++++-------
 .../dont_document_not_present_features.patch       |  6 +----
 .../debian-specific/use_usr_bin_editor.patch       |  8 ++----
 .../809802_timeout_hook.patch                      | 22 +++++-----------
 debian/patches/features/multiple-fcc.patch         | 11 +-------
 debian/patches/series                              |  4 +--
 debian/patches/upstream/228671-pipe-mime.patch     |  6 ++---
 .../upstream/771125-CVE-2014-9116-jessie.patch     |  4 +--
 12 files changed, 35 insertions(+), 86 deletions(-)

diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index bc49d3b..c292b24 100644
--- a/debian/patches/debian-specific/467432-write_bcc.patch
+++ b/debian/patches/debian-specific/467432-write_bcc.patch
@@ -28,11 +28,9 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
  sendlib.c |  6 +++---
  6 files changed, 11 insertions(+), 16 deletions(-)
 
-diff --git a/headers.c b/headers.c
-index 0a75998..fc33253 100644
 --- a/headers.c
 +++ b/headers.c
-@@ -52,7 +52,7 @@ void mutt_edit_headers (const char *editor,
+@@ -52,7 +52,7 @@ void mutt_edit_headers (const char *edit
    }
    
    mutt_env_to_local (msg->env);
@@ -41,11 +39,9 @@ index 0a75998..fc33253 100644
    fputc ('\n', ofp);	/* tie off the header. */
  
    /* now copy the body of the message. */
-diff --git a/init.h b/init.h
-index 5e325cb..8bc5898 100644
 --- a/init.h
 +++ b/init.h
-@@ -3597,14 +3597,9 @@ struct option_t MuttVars[] = {
+@@ -4070,14 +4070,9 @@ struct option_t MuttVars[] = {
    { "write_bcc",	DT_BOOL, R_NONE, OPTWRITEBCC, 1},
    /*
    ** .pp
@@ -63,11 +59,9 @@ index 5e325cb..8bc5898 100644
    */
    { "write_inc",	DT_NUM,	 R_NONE, UL &WriteInc, 10 },
    /*
-diff --git a/main.c b/main.c
-index bd40aaf..0b09bd7 100644
 --- a/main.c
 +++ b/main.c
-@@ -1129,7 +1129,7 @@ int main (int argc, char **argv)
+@@ -765,7 +765,7 @@ int main (int argc, char **argv)
            mutt_env_to_intl (msg->env, NULL, NULL);
          }
  
@@ -76,11 +70,9 @@ index bd40aaf..0b09bd7 100644
          if (option (OPTRESUMEEDITEDDRAFTFILES))
            fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
          fputc ('\n', fout);
-diff --git a/protos.h b/protos.h
-index 8e5f7aa..1ac2523 100644
 --- a/protos.h
 +++ b/protos.h
-@@ -369,7 +369,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int, char
+@@ -389,7 +389,7 @@ int mutt_write_fcc (const char *path, HE
  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);
@@ -89,11 +81,9 @@ index 8e5f7aa..1ac2523 100644
  void mutt_write_references (LIST *, FILE *, int);
  int mutt_yesorno (const char *, int);
  void mutt_set_header_color(CONTEXT *, HEADER *);
-diff --git a/send.c b/send.c
-index d4ac037..15fabe5 100644
 --- a/send.c
 +++ b/send.c
-@@ -997,10 +997,10 @@ static int send_message (HEADER *msg)
+@@ -1086,10 +1086,10 @@ static int send_message (HEADER *msg)
      unset_option (OPTWRITEBCC);
  #endif
  #ifdef MIXMASTER
@@ -106,11 +96,9 @@ index d4ac037..15fabe5 100644
  #endif
  #ifdef USE_SMTP
    if (old_write_bcc)
-diff --git a/sendlib.c b/sendlib.c
-index e6b6a79..ffe26a8 100644
 --- a/sendlib.c
 +++ b/sendlib.c
-@@ -1936,7 +1936,7 @@ out:
+@@ -1942,7 +1942,7 @@ out:
  
  
  int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
@@ -119,8 +107,8 @@ index e6b6a79..ffe26a8 100644
  {
    char buffer[LONG_STRING];
    char *p, *q;
-@@ -1979,7 +1979,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
-   else if (mode > 0)
+@@ -1991,7 +1991,7 @@ int mutt_write_rfc822_header (FILE *fp,
+ #endif
      fputs ("Cc: \n", fp);
  
 -  if (env->bcc)
@@ -128,7 +116,7 @@ index e6b6a79..ffe26a8 100644
    {
      if(mode != 0 || option(OPTWRITEBCC))
      {
-@@ -2738,7 +2738,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post,
+@@ -2840,7 +2840,7 @@ int mutt_write_fcc (const char *path, HE
    /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
     * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
     * */
diff --git a/debian/patches/debian-specific/566076-build_doc_adjustments.patch b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
index 56d8725..ad75b3f 100644
--- a/debian/patches/debian-specific/566076-build_doc_adjustments.patch
+++ b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
@@ -7,11 +7,9 @@ Use w3m to build the txt manual.
  doc/Makefile.am | 8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
 
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index bc8f856..979f31d 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -109,9 +109,7 @@ uninstall-local:
+@@ -110,9 +110,7 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
@@ -22,7 +20,7 @@ index bc8f856..979f31d 100644
  
  Muttrc: stamp-doc-rc
  
-@@ -123,10 +121,10 @@ stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
+@@ -124,10 +122,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
  	touch stamp-doc-rc
  
  manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
diff --git a/debian/patches/debian-specific/assumed_charset-compat.patch b/debian/patches/debian-specific/assumed_charset-compat.patch
index 5c7b987..f2b1414 100644
--- a/debian/patches/debian-specific/assumed_charset-compat.patch
+++ b/debian/patches/debian-specific/assumed_charset-compat.patch
@@ -9,11 +9,9 @@ for compatibility.
  init.h | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/init.h b/init.h
-index ec999a6..5e325cb 100644
 --- a/init.h
 +++ b/init.h
-@@ -211,6 +211,9 @@ struct option_t MuttVars[] = {
+@@ -226,6 +226,9 @@ struct option_t MuttVars[] = {
    ** Note: for Japanese users, ``iso-2022-*'' must be put at the head
    ** of the value as shown above if included.
    */
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 4d97ace..94e5150 100644
--- a/debian/patches/debian-specific/correct_docdir_in_man_page.patch
+++ b/debian/patches/debian-specific/correct_docdir_in_man_page.patch
@@ -8,11 +8,9 @@ and gzipped manual.
  doc/mutt.man | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/doc/mutt.man b/doc/mutt.man
-index d29294f..28dd7f2 100644
 --- a/doc/mutt.man
 +++ b/doc/mutt.man
-@@ -191,7 +191,7 @@ User's personal mapping between MIME types and file extensions.
+@@ -195,7 +195,7 @@ User's personal mapping between MIME typ
  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 bd9bf10..557ff77 100644
--- a/debian/patches/debian-specific/document_debian_defaults.patch
+++ b/debian/patches/debian-specific/document_debian_defaults.patch
@@ -8,11 +8,9 @@ from the default only on Debian systems.
  init.h | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-diff --git a/init.h b/init.h
-index ca8d18c..ec999a6 100644
 --- a/init.h
 +++ b/init.h
-@@ -312,6 +312,9 @@ struct option_t MuttVars[] = {
+@@ -327,6 +327,9 @@ struct option_t MuttVars[] = {
    ** .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.
@@ -22,7 +20,7 @@ index ca8d18c..ec999a6 100644
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*
-@@ -1076,6 +1079,9 @@ struct option_t MuttVars[] = {
+@@ -1129,6 +1132,9 @@ struct option_t MuttVars[] = {
    ** which case a detected one is not used.
    ** .pp
    ** Also see $$use_domain and $$hidden_host.
@@ -32,7 +30,7 @@ index ca8d18c..ec999a6 100644
    */
  #ifdef HAVE_LIBIDN
    { "idn_decode",	DT_BOOL, R_BOTH, OPTIDNDECODE, 1},
-@@ -1637,6 +1643,9 @@ struct option_t MuttVars[] = {
+@@ -1748,6 +1754,9 @@ struct option_t MuttVars[] = {
    ** 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.
@@ -42,7 +40,7 @@ index ca8d18c..ec999a6 100644
    */
  #endif
    { "move",		DT_QUAD, R_NONE, OPT_MOVE, M_NO },
-@@ -2744,6 +2753,10 @@ struct option_t MuttVars[] = {
+@@ -3188,6 +3197,10 @@ struct option_t MuttVars[] = {
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
@@ -53,7 +51,7 @@ index ca8d18c..ec999a6 100644
    */
    { "smime_certificates",	DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -2957,6 +2970,9 @@ struct option_t MuttVars[] = {
+@@ -3401,6 +3414,9 @@ struct option_t MuttVars[] = {
    ** .ts
    ** set smtp_authenticators="digest-md5:cram-md5"
    ** .te
@@ -63,7 +61,7 @@ index ca8d18c..ec999a6 100644
    */
  # endif /* USE_SASL */
    { "smtp_pass", 	DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
-@@ -3004,6 +3020,9 @@ struct option_t MuttVars[] = {
+@@ -3448,6 +3464,9 @@ struct option_t MuttVars[] = {
    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').
@@ -73,7 +71,7 @@ index ca8d18c..ec999a6 100644
    */
    { "sort_alias",	DT_SORT|DT_SORT_ALIAS,	R_NONE,	UL &SortAlias, SORT_ALIAS },
    /*
-@@ -3580,6 +3599,9 @@ struct option_t MuttVars[] = {
+@@ -4053,6 +4072,9 @@ struct option_t MuttVars[] = {
    ** 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 b9be54a..beba938 100644
--- a/debian/patches/debian-specific/dont_document_not_present_features.patch
+++ b/debian/patches/debian-specific/dont_document_not_present_features.patch
@@ -9,11 +9,9 @@ documented options for Debian will be used.
  init.h      | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/functions.h b/functions.h
-index a29388c..26171a0 100644
 --- a/functions.h
 +++ b/functions.h
-@@ -35,7 +35,7 @@
+@@ -32,7 +32,7 @@
  
  #ifdef _MAKEDOC
  # include "config.h"
@@ -22,8 +20,6 @@ index a29388c..26171a0 100644
  #endif
  
  const struct binding_t OpGeneric[] = { /* map: generic */
-diff --git a/init.h b/init.h
-index 017000c..ca8d18c 100644
 --- a/init.h
 +++ b/init.h
 @@ -19,7 +19,7 @@
diff --git a/debian/patches/debian-specific/use_usr_bin_editor.patch b/debian/patches/debian-specific/use_usr_bin_editor.patch
index 8baea31..1939e57 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.patch
+++ b/debian/patches/debian-specific/use_usr_bin_editor.patch
@@ -10,11 +10,9 @@ to vi.
  init.h | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/init.c b/init.c
-index a23d861..d50102d 100644
 --- a/init.c
 +++ b/init.c
-@@ -3118,7 +3118,7 @@ void mutt_init (int skip_sys_rc, LIST *commands)
+@@ -3361,7 +3361,7 @@ void mutt_init (int skip_sys_rc, LIST *c
    {
      p = getenv ("EDITOR");
      if (!p)
@@ -23,11 +21,9 @@ index a23d861..d50102d 100644
    }
    Editor = safe_strdup (p);
    Visual = safe_strdup (p);
-diff --git a/init.h b/init.h
-index 18fd040..017000c 100644
 --- a/init.h
 +++ b/init.h
-@@ -718,7 +718,7 @@ struct option_t MuttVars[] = {
+@@ -741,7 +741,7 @@ struct option_t MuttVars[] = {
    ** .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/809802_timeout_hook.patch b/debian/patches/features/809802_timeout_hook.patch
similarity index 80%
rename from debian/patches/upstream/809802_timeout_hook.patch
rename to debian/patches/features/809802_timeout_hook.patch
index 7f413cf..e31c73c 100644
--- a/debian/patches/upstream/809802_timeout_hook.patch
+++ b/debian/patches/features/809802_timeout_hook.patch
@@ -11,11 +11,9 @@ Patch provided by gustavo panizzo <gfa at zumbi.com.ar>
  protos.h    |  1 +
  5 files changed, 37 insertions(+), 5 deletions(-)
 
-diff --git a/curs_main.c b/curs_main.c
-index 3c253e1..f418f67 100644
 --- a/curs_main.c
 +++ b/curs_main.c
-@@ -758,8 +758,10 @@ int mutt_index_menu (void)
+@@ -931,8 +931,10 @@ int mutt_index_menu (void)
  
        dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op));
  
@@ -27,11 +25,9 @@ index 3c253e1..f418f67 100644
  
        mutt_curs_set (1);
  
-diff --git a/hook.c b/hook.c
-index 06f7c8e..ce9ae34 100644
 --- a/hook.c
 +++ b/hook.c
-@@ -156,7 +156,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+@@ -154,7 +154,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
  	ptr->rx.not == not &&
  	!mutt_strcmp (pattern.data, ptr->rx.pattern))
      {
@@ -40,7 +36,7 @@ index 06f7c8e..ce9ae34 100644
        {
  	/* these hooks allow multiple commands with the same
  	 * pattern, so if we've already seen this pattern/command pair, just
-@@ -508,6 +508,33 @@ LIST *mutt_crypt_hook (ADDRESS *adr)
+@@ -506,6 +506,33 @@ LIST *mutt_crypt_hook (ADDRESS *adr)
    return _mutt_list_hook (adr->mailbox, M_CRYPTHOOK);
  }
  
@@ -74,11 +70,9 @@ index 06f7c8e..ce9ae34 100644
  #ifdef USE_SOCKET
  void mutt_account_hook (const char* url)
  {
-diff --git a/init.h b/init.h
-index 8bc5898..246020b 100644
 --- a/init.h
 +++ b/init.h
-@@ -3782,6 +3782,7 @@ const struct command_t Commands[] = {
+@@ -4289,6 +4289,7 @@ const struct command_t Commands[] = {
    { "spam",		parse_spam_list,	M_SPAM },
    { "nospam",		parse_spam_list,	M_NOSPAM },
    { "subscribe",	parse_subscribe,	0 },
@@ -86,11 +80,9 @@ index 8bc5898..246020b 100644
    { "toggle",		parse_set,		M_SET_INV },
    { "unalias",		parse_unalias,		0 },
    { "unalternative_order",parse_unlist,		UL &AlternativeOrderList },
-diff --git a/mutt.h b/mutt.h
-index 60fe281..26f260e 100644
 --- a/mutt.h
 +++ b/mutt.h
-@@ -146,10 +146,11 @@ typedef enum
+@@ -159,10 +159,11 @@ typedef enum
  #define M_ACCOUNTHOOK	(1<<9)
  #define M_REPLYHOOK	(1<<10)
  #define M_SEND2HOOK     (1<<11)
@@ -105,11 +97,9 @@ index 60fe281..26f260e 100644
  #endif
  
  /* tree characters for linearize_tree and print_enriched_string */
-diff --git a/protos.h b/protos.h
-index 1ac2523..98a207a 100644
 --- a/protos.h
 +++ b/protos.h
-@@ -148,6 +148,7 @@ const char *mutt_get_name (ADDRESS *);
+@@ -153,6 +153,7 @@ const char *mutt_get_name (ADDRESS *);
  char *mutt_get_parameter (const char *, PARAMETER *);
  LIST *mutt_crypt_hook (ADDRESS *);
  char *mutt_make_date (char *, size_t);
diff --git a/debian/patches/features/multiple-fcc.patch b/debian/patches/features/multiple-fcc.patch
index c6d93a8..c75521c 100644
--- a/debian/patches/features/multiple-fcc.patch
+++ b/debian/patches/features/multiple-fcc.patch
@@ -15,8 +15,6 @@ Changed by Richard Russon <rich at flatcap.org> to apply on top of neomutt.
  sendlib.c | 32 ++++++++++++++++++++++++++++++++
  3 files changed, 34 insertions(+), 1 deletion(-)
 
-diff --git a/protos.h b/protos.h
-index 21a3b3f..5c51adf 100644
 --- a/protos.h
 +++ b/protos.h
 @@ -384,6 +384,7 @@ int mutt_user_is_recipient (HEADER *);
@@ -27,8 +25,6 @@ index 21a3b3f..5c51adf 100644
  int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int, char *, char **);
  int mutt_write_mime_body (BODY *, FILE *);
  int mutt_write_mime_header (BODY *, FILE *);
-diff --git a/send.c b/send.c
-index 1a0b35d..e79c1f7 100644
 --- a/send.c
 +++ b/send.c
 @@ -1974,7 +1974,7 @@ full_fcc:
@@ -40,11 +36,9 @@ index 1a0b35d..e79c1f7 100644
        {
  	/*
  	 * Error writing FCC, we should abort sending.
-diff --git a/sendlib.c b/sendlib.c
-index 247b33a..59c48fe 100644
 --- a/sendlib.c
 +++ b/sendlib.c
-@@ -2756,6 +2756,38 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2756,6 +2756,38 @@ static void set_noconv_flags (BODY *b, s
    }
  }
  
@@ -83,6 +77,3 @@ index 247b33a..59c48fe 100644
  int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid,
  		    int post, char *fcc, char **finalpath)
  {
--- 
-2.8.2
-
diff --git a/debian/patches/series b/debian/patches/series
index d257260..f5f9b9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
 neomutt-20160611.patch
 neomutt-devel/sensible-browser.patch
+features/809802_timeout_hook.patch
+features/multiple-fcc.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch
 debian-specific/use_usr_bin_editor.patch
@@ -15,5 +17,3 @@ upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
 upstream/383769-score-match.patch
 upstream/771125-CVE-2014-9116-jessie.patch
-upstream/809802_timeout_hook.patch
-features/multiple-fcc.patch
diff --git a/debian/patches/upstream/228671-pipe-mime.patch b/debian/patches/upstream/228671-pipe-mime.patch
index c858ef7..07953d9 100644
--- a/debian/patches/upstream/228671-pipe-mime.patch
+++ b/debian/patches/upstream/228671-pipe-mime.patch
@@ -12,11 +12,9 @@ Updated in Debian bug #569279
  imap/message.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
-diff --git a/imap/message.c b/imap/message.c
-index 9b880fe..043593e 100644
 --- a/imap/message.c
 +++ b/imap/message.c
-@@ -400,7 +400,7 @@ int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
+@@ -400,7 +400,7 @@ int imap_fetch_message (MESSAGE *msg, CO
    char path[_POSIX_PATH_MAX];
    char *pc;
    long bytes;
@@ -25,7 +23,7 @@ index 9b880fe..043593e 100644
    int uid;
    int cacheno;
    IMAP_CACHE *cache;
-@@ -497,9 +497,15 @@ int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
+@@ -498,9 +498,15 @@ int imap_fetch_message (MESSAGE *msg, CO
  	    imap_error ("imap_fetch_message()", buf);
  	    goto bail;
  	  }
diff --git a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch b/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
index 38c5627..5a50c68 100644
--- a/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
+++ b/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch
@@ -23,11 +23,9 @@ Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
  lib.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/lib.c b/lib.c
-index 2f500bc..828b9c5 100644
 --- a/lib.c
 +++ b/lib.c
-@@ -815,6 +815,9 @@ char *mutt_substrdup (const char *begin, const char *end)
+@@ -819,6 +819,9 @@ char *mutt_substrdup (const char *begin,
    size_t len;
    char *p;
  

-- 
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