Merge commit 'upstream/1.5.21'

[software/mutt-debian.git] / debian / patches / upstream / 528233-readonly-open.patch

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)
 
 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
 --- 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;
        goto return_error;

++      chmod (tempfile, 0400);

      }
  
      }
  

-+    chmod (tempfile, 0400);

      use_pipe = rfc1524_expand_command (a, tempfile, type,
      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);
+