Set SSH_PROGRAM=/usr/bin/ssh1 when building openssh-client-ssh1 so that scp1 works (reported by Olivier MATZ).

2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index f5e5c6b2b..3d97a51fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:7.2p2-6) UNRELEASED; urgency=medium
   * Copy summary of supported SFTP protocol versions from upstream's
     PROTOCOL file into the openssh-sftp-server package description (closes:
     #766887).
+  * Set SSH_PROGRAM=/usr/bin/ssh1 when building openssh-client-ssh1 so that
+    scp1 works (reported by Olivier MATZ).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 30 Apr 2016 11:29:20 +0100
 
diff --git a/debian/rules b/debian/rules
index 5021b34a3..3a8c86cdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,7 +143,7 @@ override_dh_auto_build-arch:
         cd build-udeb && ./config.status
 
         $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
-        $(MAKE) -C build-deb-ssh1 $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
+        $(MAKE) -C build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
         $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
 
         $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)