2 files changed, 17 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index d4b2f1b48..1e1ace6e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low
   * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
     closes: #296487).
   * Remove obsolete and unnecessary ssh/forward_warning debconf note.
-  * Restore Hurd X forwarding fix from #102991, lost somewhere along the
-    way.
+  * Hurd fixes:
+    - Restore X forwarding fix from #102991, lost somewhere along the way.
+    - Link with -lcrypt.
+    - Link with -lpthread rather than -pthread.
   * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
   * debconf template translations:
     - Update Czech (thanks, Miroslav Kure; closes: #298744).
diff --git a/debian/rules b/debian/rules
index a35beeae8..4e8117877 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ endif
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | sed 's/.*://')
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 
 CLIENT_UDEB := openssh-client-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
 SERVER_UDEB := openssh-server-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
@@ -43,6 +44,17 @@ PAMSUBST := yes
 PAMDEP := libpam-runtime
 endif
 
+# The Hurd needs libcrypt for res_query et al.
+ifeq ($(DEB_HOST_ARCH_OS),gnu)
+FORCE_LIBS := LIBS=-lcrypt
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+LINK_PTHREAD := -pthread
+else
+LINK_PTHREAD := -lpthread
+endif
+
 # Change the version string to include the Debian version
 SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
 
@@ -57,7 +69,7 @@ build-deb-stamp:
         # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).
         perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h
         # Supply pthread linkage for just those binaries linked to PAM.
-        perl -pi -e 's/^(LIBPAM=.*)/$$1 -pthread/' build-deb/Makefile
+        perl -pi -e 's/^(LIBPAM=.*)/$$1 $(LINK_PTHREAD)/' build-deb/Makefile
 
         $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -DUSE_POSIX_THREADS -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -DSSH_EXTRAVERSION="\" $(SSH_EXTRAVERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign'
         # Support building on Debian 3.0 (with GNOME 1.4) and later.