diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | debian/rules | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index cb074dc7e..379a0480f 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:4.2p1-7) UNRELEASED; urgency=low | ||
2 | |||
3 | * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb | ||
4 | rather than the deb. Fixed. | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:11:33 +0000 | ||
7 | |||
1 | openssh (1:4.2p1-6) unstable; urgency=low | 8 | openssh (1:4.2p1-6) unstable; urgency=low |
2 | 9 | ||
3 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 | 10 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 |
diff --git a/debian/rules b/debian/rules index 51f5ffba4..748d1fdf2 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -71,7 +71,7 @@ build-deb: build-deb-stamp | |||
71 | build-deb-stamp: | 71 | build-deb-stamp: |
72 | dh_testdir | 72 | dh_testdir |
73 | mkdir -p build-deb | 73 | mkdir -p build-deb |
74 | cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr $(SELINUX) | 74 | cd build-deb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/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-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr $(SELINUX) |
75 | 75 | ||
76 | ifeq ($(DEB_HOST_ARCH_OS),linux) | 76 | ifeq ($(DEB_HOST_ARCH_OS),linux) |
77 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). | 77 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). |
@@ -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:/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 | 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=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --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. |