Update upstream/528233-readonly-open.patch: Only chmod saved attachments, not existin...

diff --git a/debian/changelog b/debian/changelog
index fb7af1d32a47ad70a72c3a83b8ccb9870518732f..4bd3d3917ce31b763f09f9a933a816506f9abd2b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mutt (1.5.20-8~unrel) unreleased; urgency=low
   * debian/patches:
     + Update upstream/228671-pipe-mime.patch: Fix segfaults with ssh tunnels.
       Thanks Nikolaus Schulz (Closes: #569279)
+    + Update upstream/528233-readonly-open.patch: Only chmod saved
+      attachments, not existing files. (Closes: #572203)
     + Add upstream/573823-imap_internal_date: Set internaldate of messages
       appended to IMAP mailboxes (Closes: #573823)
 

diff --git a/debian/patches/upstream/528233-readonly-open.patch b/debian/patches/upstream/528233-readonly-open.patch
index df29fd9aff298dec2bc48af7746236f3e839e7b0..049fc0972b051f93013a5aa9801675d9c802ce70 100644 (file)
--- a/debian/patches/upstream/528233-readonly-open.patch
+++ b/debian/patches/upstream/528233-readonly-open.patch
@@ -2,13 +2,27 @@ Open attachments as read-only so the editor won't be able to modify it;
 otherwise the user can believe that he/she can edit it and risk to lose his/her
 work (see upstream bug http://bugs.mutt.org/3261)
 
+#528233, updated in #572203
+
 --- a/attach.c
 +++ b/attach.c
-@@ -494,6 +494,7 @@
+@@ -492,6 +492,7 @@ int mutt_view_attachment (FILE *fp, BODY
+       FREE (&fname);
+       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
        goto return_error;
++      chmod (tempfile, 0400);
      }
  
-+    chmod (tempfile, 0400);
      use_pipe = rfc1524_expand_command (a, tempfile, type,
-                                      command, sizeof (command));
-     use_pager = entry->copiousoutput;
+@@ -633,7 +634,11 @@ int mutt_view_attachment (FILE *fp, BODY
+   if (entry)
+     rfc1524_free_entry (&entry);
+   if (fp && tempfile[0])
++  {
++    /* Restore write permission so mutt_unlink can open the file for writing */
++    chmod(tempfile, 0600);
+     mutt_unlink (tempfile);
++  }
+   else if (unlink_tempfile)
+     unlink(tempfile);
+