Apply upstream bits of the patch for #258517.

3 files changed, 5 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index 919b36819..8bff3cb2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,7 +290,7 @@ install-files: scard-install
         else \
                 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
         fi
-        @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+        @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
                 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
                         $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
                 else \
@@ -404,6 +404,6 @@ tests:	$(TARGETS)
                 $@
 
 regressclean:
-        if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+        if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
                 (cd regress && $(MAKE) clean) \
         fi
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234..1555b5d37 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
   fi
 fi
 
-if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
+if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
   GET_ID="cat ${ID_FILE}"
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 453116eff..40417bf6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,8 @@ openssh (1:3.8.1p1-5) UNRELEASED; urgency=low
   * Remove Suggests: dnsutils, as it was only needed for
     make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
   * Disable shadow password support in openssh-server-udeb.
-  * Fix non-portable shell constructs in maintainer scripts (thanks, David
-    Weinehall; partial fix for #258517).
+  * Fix non-portable shell constructs in maintainer scripts, Makefile, and
+    ssh-copy-id (thanks, David Weinehall; closes: #258517).
   * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
     handler kill the PAM thread if its waitpid() call returns 0, as well as
     the previous check for -1 (closes: #252676).