Debian Emacs Devel Commit: r94 - in emacs21/pkg/trunk/debian: . patches

Jerome Marant jerome@haydn.debian.org
Sat, 09 Oct 2004 02:14:16 -0600


Author: jerome
Date: 2004-10-09 02:14:06 -0600 (Sat, 09 Oct 2004)
New Revision: 94

Added:
   emacs21/pkg/trunk/debian/patches/remote-files-permissions.dpatch
Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/patches/00list
Log:
Tighten permissions of local backup copies of remote files (#274427)

Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-10-09 08:06:21 UTC (rev 93)
+++ emacs21/pkg/trunk/debian/changelog	2004-10-09 08:14:06 UTC (rev 94)
@@ -11,9 +11,15 @@
   * Apply patch Florian Weimer <fw@deneb.enyo.de> fixing long-standing
     memory leak in decode-coding-region and similar routines.
     (closes: #273919) [Jérôme Marant]
-    - debian/patches/coding-region-leak.dpatch: new file
+    - debian/patches/coding-region-leak.dpatch: new file.
     - debian/patches/00list: updated.
 
+  * Apply patch from Michael Albinus <michael.albinus@gmx.de> tightening
+    permissions of local backup copies of remote files.
+    (closes: #274427) [Jérôme Marant]
+    - debian/patches/remote-files-permissions.dpatch: new file.
+    - debian/patches/00list: updated.
+
  --
 
 emacs21 (21.3+1-7) unstable; urgency=medium

Modified: emacs21/pkg/trunk/debian/patches/00list
===================================================================
--- emacs21/pkg/trunk/debian/patches/00list	2004-10-09 08:06:21 UTC (rev 93)
+++ emacs21/pkg/trunk/debian/patches/00list	2004-10-09 08:14:06 UTC (rev 94)
@@ -18,4 +18,5 @@
 python-completion-ignored-extensions
 xfree86-4.3-modifiers
 coding-region-leak
+remote-files-permissions
 fix-x-vs-no-x-diffs

Added: emacs21/pkg/trunk/debian/patches/remote-files-permissions.dpatch
===================================================================
--- emacs21/pkg/trunk/debian/patches/remote-files-permissions.dpatch	2004-10-09 08:06:21 UTC (rev 93)
+++ emacs21/pkg/trunk/debian/patches/remote-files-permissions.dpatch	2004-10-09 08:14:06 UTC (rev 94)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## remote-files-permissions.dpatch by Michael Albinus <michael.albinus@gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+## DP: Tightens permissions of local backup copies of remote files.
+## DP: Authors: Michael Albinus <michael.albinus@gmx.de>
+## DP: Status: has been incorporated upstream
+## DP: Date: Sat,  9 Oct 2004 09:51:33 +0200
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- emacs21.orig/src/fileio.c	2004-10-09 09:45:43.000000000 +0200
++++ emacs21/src/fileio.c	2004-10-09 09:46:32.000000000 +0200
+@@ -5438,6 +5438,9 @@
+       && stat (XSTRING (current_buffer->filename)->data, &st) >= 0)
+     /* But make sure we can overwrite it later!  */
+     auto_save_mode_bits = st.st_mode | 0600;
++  else if (! NILP (current_buffer->filename))
++    /* Remote files don't cooperate with stat.  */
++    auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600;
+   else
+     auto_save_mode_bits = 0666;
+ 


Property changes on: emacs21/pkg/trunk/debian/patches/remote-files-permissions.dpatch
___________________________________________________________________
Name: svn:executable
   + *