diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index dfba47175..a87df8a36 100644 --- a/debian/changelog +++ b/debian/changelog | |||
| @@ -13,6 +13,7 @@ openssh (1:4.1p1-2) UNRELEASED; urgency=low | |||
| 13 | no-debconf-templates). | 13 | no-debconf-templates). |
| 14 | * Fix picky lintian errors about slogin symlinks. | 14 | * Fix picky lintian errors about slogin symlinks. |
| 15 | * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling. | 15 | * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling. |
| 16 | * Apply Linux 2.2 workaround (see #239999) only on Linux. | ||
| 16 | 17 | ||
| 17 | -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 02:50:49 +0100 | 18 | -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 02:50:49 +0100 |
| 18 | 19 | ||
diff --git a/debian/rules b/debian/rules index ce831e55d..452b7fdbf 100755 --- a/debian/rules +++ b/debian/rules | |||
| @@ -68,8 +68,10 @@ build-deb-stamp: | |||
| 68 | mkdir -p build-deb | 68 | mkdir -p build-deb |
| 69 | 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 | 69 | 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 |
| 70 | 70 | ||
| 71 | ifeq ($(DEB_HOST_ARCH_OS),linux) | ||
| 71 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). | 72 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). |
| 72 | perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h | 73 | perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h |
| 74 | endif | ||
| 73 | 75 | ||
| 74 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' | 76 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' |
| 75 | # Support building on Debian 3.0 (with GNOME 1.4) and later. | 77 | # Support building on Debian 3.0 (with GNOME 1.4) and later. |