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

[Jerome Marant]

Author: jerome
Date: 2004-10-10 08:19:10 -0600 (Sun, 10 Oct 2004)
New Revision: 95

Added:
   emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch
Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/patches/00list
Log:
Protect passwords in shell mode (#273855)

Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-10-09 08:14:06 UTC (rev 94)
+++ emacs21/pkg/trunk/debian/changelog	2004-10-10 14:19:10 UTC (rev 95)
@@ -1,25 +1,31 @@
 emacs21 (21.3+1-8) unstable; urgency=medium
 
-  * Apply patch from Denis Barbier <barbier@linufr.org> allowing
-    Emacs to properly interpret logo keys as Meta rather than
-    Meta+Super+Hyper. This problem has been showing up since latest
-    XFree86 and Xorg introducted `fake keys'.
+  * Apply patch allowing Emacs to properly interpret logo keys as Meta
+    rather than Meta+Super+Hyper. This problem has been showing up since
+    latest XFree86 and Xorg introducted `fake keys'.
+    Thanks to Denis Barbier <barbier@linufr.org>
     (closes: #255286, #274103) [Jérôme Marant]
     - debian/patches/xfree86-4.3-modifiers.dpatch: new file
     - debian/patches/00list: updated.
   
-  * Apply patch Florian Weimer <fw@deneb.enyo.de> fixing long-standing
-    memory leak in decode-coding-region and similar routines.
+  * Apply patch fixing long-standing memory leak in decode-coding-region
+    and similar routines. Thanks to Florian Weimer <fw@deneb.enyo.de>.
     (closes: #273919) [Jérôme Marant]
     - 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.
+  * Apply patch tightening permissions of local backup copies of remote
+    files. Thanks to Michael Albinus <michael.albinus@gmx.de>.
     (closes: #274427) [Jérôme Marant]
     - debian/patches/remote-files-permissions.dpatch: new file.
     - debian/patches/00list: updated.
 
+  * Apply patch preventing passwords to be displayed in shell mode.
+    Thanks to Martin Schulze <joey@infodrom.org>.
+    (closes: #273855) [Jérôme Marant]
+    - debian/patches/shell-mode-protect-passwords.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:14:06 UTC (rev 94)
+++ emacs21/pkg/trunk/debian/patches/00list	2004-10-10 14:19:10 UTC (rev 95)
@@ -19,4 +19,5 @@
 xfree86-4.3-modifiers
 coding-region-leak
 remote-files-permissions
+shell-mode-protect-passwords
 fix-x-vs-no-x-diffs

Added: emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch
===================================================================
--- emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch	2004-10-09 08:14:06 UTC (rev 94)
+++ emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch	2004-10-10 14:19:10 UTC (rev 95)
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## shell-mode-protect-passwords.dpatch by Jerome Marant <jerome@debian.org>
+##
+## DP: ** This patch prevents passwords from being displayed within
+## DP: shell mode.
+## DP: Author: Jerome Marant <jerome@debian.org>
+## DP: Status: has been sent upstream
+## DP: Date: Sun, 10 Oct 2004 14:32:18 +0200
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- emacs21.orig/lisp/shell.el	2004-10-10 10:01:08.000000000 +0200
++++ emacs21/lisp/shell.el	2004-10-10 14:28:57.000000000 +0200
+@@ -416,6 +416,8 @@
+   (make-local-variable 'shell-dirtrackp)
+   (setq shell-dirtrackp t)
+   (add-hook 'comint-input-filter-functions 'shell-directory-tracker nil t)
++  ;; Prevent passwords from being displayed
++  (add-hook 'comint-output-filter-functions 'comint-watch-for-password-prompt)
+   (setq comint-input-autoexpand shell-input-autoexpand)
+   ;; This is not really correct, since the shell buffer does not really
+   ;; edit this directory.  But it is useful in the buffer list and menus.


Property changes on: emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch
___________________________________________________________________
Name: svn:executable
   + *