misc/177590: suggestion to make ssh-copy-id as dependency from OPENSSH KNOBs

[Oleg Ginzburg]

>Number:         177590
>Category:       misc
>Synopsis:       suggestion to make ssh-copy-id as dependency from OPENSSH KNOBs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 02 21:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Ginzburg
>Release:        10-current
>Organization:
>Environment:
>Description:
After command

mkdir /tmp/tempdir && env WITHOUT_OPENSSH=yes make -C /usr/src installworld distribution DESTDIR="/tmp/tempdir"

we have base in /tmp/tempdir with /usr/bin/ssh-copy-id file which is unusable without openssh part.

I assume that it has to be dependent on the option WITH_OPENSSH=yes from src.conf(5)

>How-To-Repeat:
env WITHOUT_OPENSSH=yes make -C /usr/src installworld distribution 
ls /usr/bin/ |grep ssh
>Fix:


Patch attached with submission follows:

--- /usr/src/usr.bin/Makefile.orig	2013-04-03 01:08:16.101230459 +0400
+++ /usr/src/usr.bin/Makefile	2013-04-03 01:09:27.501231391 +0400
@@ -148,7 +148,6 @@
 	sockstat \
 	sort \
 	split \
-	ssh-copy-id \
 	stat \
 	stdbuf \
 	su \
@@ -303,6 +302,11 @@
 SUBDIR+=	ypwhich
 .endif
 
+SUBDIR=
+.if ${MK_OPENSSH} != "no"
+SUBDIR+=ssh-copy-id
+.endif
+
 .if ${MK_OPENSSL} != "no"
 SUBDIR+=	bc
 SUBDIR+=	chkey


>Release-Note:
>Audit-Trail:
>Unformatted: