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

[Jerome Marant]

Author: jerome
Date: 2004-10-16 02:22:11 -0600 (Sat, 16 Oct 2004)
New Revision: 96

Removed:
   emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch
Modified:
   emacs21/pkg/trunk/debian/changelog
   emacs21/pkg/trunk/debian/patches/00list
Log:
Reverted shell password protection patch

Modified: emacs21/pkg/trunk/debian/changelog
===================================================================
--- emacs21/pkg/trunk/debian/changelog	2004-10-10 14:19:10 UTC (rev 95)
+++ emacs21/pkg/trunk/debian/changelog	2004-10-16 08:22:11 UTC (rev 96)
@@ -20,12 +20,6 @@
     - 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-10 14:19:10 UTC (rev 95)
+++ emacs21/pkg/trunk/debian/patches/00list	2004-10-16 08:22:11 UTC (rev 96)
@@ -19,5 +19,4 @@
 xfree86-4.3-modifiers
 coding-region-leak
 remote-files-permissions
-shell-mode-protect-passwords
 fix-x-vs-no-x-diffs

Deleted: emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch
===================================================================
--- emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch	2004-10-10 14:19:10 UTC (rev 95)
+++ emacs21/pkg/trunk/debian/patches/shell-mode-protect-passwords.dpatch	2004-10-16 08:22:11 UTC (rev 96)
@@ -1,39 +0,0 @@
-#!/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.