Drop workaround for #242462 on amd64; it's been fixed properly upstream.

2 files changed, 1 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index eee48263b..d4b2f1b48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low
   * Remove obsolete and unnecessary ssh/forward_warning debconf note.
   * Restore Hurd X forwarding fix from #102991, lost somewhere along the
     way.
+  * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
   * debconf template translations:
     - Update Czech (thanks, Miroslav Kure; closes: #298744).
     - Update Finnish (thanks, Matti Pöllä; closes: #303787).
diff --git a/debian/rules b/debian/rules
index cfa791cdf..a35beeae8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,12 +43,6 @@ PAMSUBST := yes
 PAMDEP := libpam-runtime
 endif
 
-# Temporary linkage hack for amd64 due to lack of res_query weak alias, see
-# #242462. Real fix sent upstream.
-ifeq ($(DEB_HOST_ARCH),amd64)
-FORCE_LIBS = LIBS=-lresolv
-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/[^-]*-//')