* Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11

  to the normal and superuser paths and /usr/games to the normal path.

2 files changed, 8 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 7c9fec65d..07675bbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:4.2p1-6) UNRELEASED; urgency=low
+
+  * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
+    to the normal and superuser paths and /usr/games to the normal path.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 10 Oct 2005 17:26:15 +0100
+
 openssh (1:4.2p1-5) unstable; urgency=low
 
   * Add a CVE name to the 1:4.0p1-1 changelog entry.
diff --git a/debian/rules b/debian/rules
index 43868d52c..51f5ffba4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ build-udeb: build-udeb-stamp
 build-udeb-stamp:
         dh_testdir
         mkdir -p build-udeb
-        cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --without-xauth --with-default-path=/usr/local/bin:/bin:/usr/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper
+        cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --without-xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/bin/X11:/usr/games --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper
         # Debian's /var/log/btmp has inappropriate permissions.
         perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h
         # Avoid libnsl linkage. Ugh.