* Really fix the search path for krsh.

diff --git a/debian/changelog b/debian/changelog
index c8de0dc92e206cfcaf6f2ca3552d45c651cb6f6a..ef3e59ea551b141d9fa81a5ec4c007fefbef7740 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kftgt (1.9-2) unstable; urgency=low
+
+  * Really fix the search path for krsh.
+
+ -- Russ Allbery <rra@stanford.edu>  Tue, 11 Oct 2005 10:11:07 -0700
+
 kftgt (1.9-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/patches/01-debian-paths.dpatch b/debian/patches/01-debian-paths.dpatch
index b1731ed8901bd76d1466eececd5abf65e13de129..366550a37435eb0f647b57ff91af4cd21e0dd9c6 100755 (executable)
--- a/debian/patches/01-debian-paths.dpatch
+++ b/debian/patches/01-debian-paths.dpatch
@@ -8,9 +8,9 @@
 ## DP: rlogin, rcp, or telnet.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./klogin /tmp/dpep-work.J4UhRW/kftgt/klogin
---- ./klogin   2005-08-23 21:43:31.000000000 -0700
-+++ /tmp/dpep-work.J4UhRW/kftgt/klogin 2005-08-23 22:30:54.000000000 -0700
+diff -urNad kftgt~/klogin kftgt/klogin
+--- kftgt~/klogin      2005-08-23 23:11:07.000000000 -0700
++++ kftgt/klogin       2005-10-11 10:09:32.000000000 -0700
 @@ -17,7 +17,9 @@
  # Find locations of Kerberos programs.  These directories are searched before
  # the user path.  /usr/pubsw/bin is the standard Stanford location, and
@@ -35,18 +35,20 @@ diff -urNad --exclude=CVS --exclude=.svn ./klogin /tmp/dpep-work.J4UhRW/kftgt/kl
  }
  
  # Parse command-line options, ensure that the arguments are consistent, and
-diff -urNad --exclude=CVS --exclude=.svn ./krsh /tmp/dpep-work.J4UhRW/kftgt/krsh
---- ./krsh     2005-08-23 21:43:31.000000000 -0700
-+++ /tmp/dpep-work.J4UhRW/kftgt/krsh   2005-08-23 22:32:37.000000000 -0700
-@@ -16,6 +16,8 @@
+diff -urNad kftgt~/krsh kftgt/krsh
+--- kftgt~/krsh        2005-08-23 23:11:07.000000000 -0700
++++ kftgt/krsh 2005-10-11 10:09:41.000000000 -0700
+@@ -16,7 +16,9 @@
  # remote host, the user's path is always used.  /usr/pubsw/bin is the standard
  # Stanford location, /usr/local/bin is used by stow packages, and
  # /etc/leland/bin was used by Kerberos kits.
+-@PATH = qw(/usr/pubsw/bin /usr/local/bin /etc/leland/bin);
 +#
 +# Removed on Debian to search only the user's PATH.
- @PATH = qw(/usr/pubsw/bin /usr/local/bin /etc/leland/bin);
++@PATH = qw();
  
  ##############################################################################
+ # Modules and declarations
 @@ -91,7 +93,7 @@
  # honoring environment variables for each one.
  sub find_programs {