[mutt] 01/01: upstream/865822-restore-defaults.patch updated so that the debug file is correctly named and initialized.

[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 46caca2d121ab77455ab2e34cbc24e054e16fe7f
Author: Antonio Radici <antonio at debian.org>
Date:   Thu Jun 29 08:38:29 2017 +0100

    upstream/865822-restore-defaults.patch updated so that the debug file is correctly named and initialized.
---
 debian/changelog                                   |  8 +++++
 .../patches/upstream/865822-restore-defaults.patch | 39 ++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 478aefe..f3ff1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.8.3+neomutt20170609-3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    + upstream/865822-restore-defaults.patch updated so that the debug file is
+      correctly named and initialized.
+
+ -- Antonio Radici <antonio at debian.org>  Thu, 29 Jun 2017 08:36:12 +0100
+
 mutt (1.8.3+neomutt20170609-2) unstable; urgency=medium
 
   * debian/patches:
diff --git a/debian/patches/upstream/865822-restore-defaults.patch b/debian/patches/upstream/865822-restore-defaults.patch
index 9de6611..15857c5 100644
--- a/debian/patches/upstream/865822-restore-defaults.patch
+++ b/debian/patches/upstream/865822-restore-defaults.patch
@@ -12,7 +12,27 @@ http://bugs.debian.org/865842
 
 --- a/init.c
 +++ b/init.c
-@@ -4007,13 +4007,6 @@
+@@ -2196,6 +2196,9 @@
+  */
+ static void start_debug(void)
+ {
++  if (!DebugFile)
++    return;
++
+   char buf[_POSIX_PATH_MAX];
+ 
+   /* rotate the old debug logs */
+@@ -2203,6 +2206,9 @@
+   {
+     snprintf(debugfilename, sizeof(debugfilename), "%s%d", DebugFile, i);
+     snprintf(buf, sizeof(buf), "%s%d", DebugFile, i + 1);
++
++    mutt_expand_path (debugfilename, sizeof (debugfilename));
++    mutt_expand_path (buf, sizeof (buf));
+     rename(debugfilename, buf);
+   }
+ 
+@@ -4007,18 +4013,21 @@
      Shell = safe_strdup((p = getenv("SHELL")) ? p : "/bin/sh");
    }
  
@@ -26,7 +46,22 @@ http://bugs.debian.org/865842
  #ifdef DEBUG
    /* Start up debugging mode if requested from cmdline */
    if (debuglevel_cmdline > 0)
-@@ -4164,6 +4157,13 @@
+   {
+     debuglevel = debuglevel_cmdline;
++    if (debugfile_cmdline)
++    {
++      DebugFile = safe_strdup(debugfile_cmdline);
++    }
++    else
++    {
++      int i = mutt_option_index("debug_file");
++      if ((i >= 0) && (MuttVars[i].init != 0))
++        DebugFile = safe_strdup((const char*) MuttVars[i].init);
++    }
+     start_debug();
+   }
+ #endif
+@@ -4164,6 +4173,13 @@
  
    Matches = safe_calloc(Matches_listsize, sizeof(char *));
  

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