2 files changed, 4 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d5fee834..1027d0818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:3.8.1p1-2) UNRELEASED; urgency=low
   * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
     (not yet uploaded).
   * Restore ssh-askpass-gnome binary, lost by mistake.
+  * Don't link against libnsl in udeb builds.
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 13 May 2004 10:00:44 +0100
 
diff --git a/debian/rules b/debian/rules
index 168f3f13c..2c2ce4015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,9 @@ build-udeb-stamp:
         dh_testdir
         mkdir -p build-udeb
         cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --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
+        # Avoid libnsl linkage. Ugh.
+        perl -pi -e 's/ +-lnsl//' build-udeb/config.status
+        cd build-udeb && ./config.status
         $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -DSSH_VERSION="\"$(SSH_VERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign' ssh sshd
         touch build-udeb-stamp