diff options
author | Colin Watson <cjwatson@debian.org> | 2005-10-10 16:30:55 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-10-10 16:30:55 +0000 |
commit | 95a839712966c1e430dc9e80868ed2e6dbf70c70 (patch) | |
tree | a365d4d2ed057e81745620612c2dfeaab37b9333 | |
parent | c9ad9bfc20f64ccf4fbc98c508e80e23184d08a2 (diff) |
* 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.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | debian/rules | 2 |
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 @@ | |||
1 | openssh (1:4.2p1-6) UNRELEASED; urgency=low | ||
2 | |||
3 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 | ||
4 | to the normal and superuser paths and /usr/games to the normal path. | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Mon, 10 Oct 2005 17:26:15 +0100 | ||
7 | |||
1 | openssh (1:4.2p1-5) unstable; urgency=low | 8 | openssh (1:4.2p1-5) unstable; urgency=low |
2 | 9 | ||
3 | * Add a CVE name to the 1:4.0p1-1 changelog entry. | 10 | * 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 | |||
94 | build-udeb-stamp: | 94 | build-udeb-stamp: |
95 | dh_testdir | 95 | dh_testdir |
96 | mkdir -p build-udeb | 96 | mkdir -p build-udeb |
97 | 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 | 97 | 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 |
98 | # Debian's /var/log/btmp has inappropriate permissions. | 98 | # Debian's /var/log/btmp has inappropriate permissions. |
99 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h | 99 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h |
100 | # Avoid libnsl linkage. Ugh. | 100 | # Avoid libnsl linkage. Ugh. |