From nobody@FreeBSD.org  Tue Apr  2 21:18:57 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 618FD33F
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  2 Apr 2013 21:18:57 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 5339FBD9
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  2 Apr 2013 21:18:57 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r32LIulN035300
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 2 Apr 2013 21:18:56 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r32LIucm035299;
	Tue, 2 Apr 2013 21:18:56 GMT
	(envelope-from nobody)
Message-Id: <201304022118.r32LIucm035299@red.freebsd.org>
Date: Tue, 2 Apr 2013 21:18:56 GMT
From: Oleg Ginzburg <olevole@olevole.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: suggestion to make ssh-copy-id as dependency from OPENSSH KNOBs
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177590
>Category:       misc
>Synopsis:       [build] [patch] suggestion to make ssh-copy-id as dependency from OPENSSH KNOBs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 02 21:20:00 UTC 2013
>Closed-Date:    Sun Apr 28 17:59:13 UTC 2013
>Last-Modified:  Sun Apr 28 18:00:01 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Wed Apr 24 17:20:54 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177590 
State-Changed-From-To: open->closed 
State-Changed-By: eadler 
State-Changed-When: Sun Apr 28 17:59:12 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177590 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/177590: commit references a PR
Date: Sun, 28 Apr 2013 17:58:18 +0000 (UTC)

 Author: eadler
 Date: Sun Apr 28 17:58:11 2013
 New Revision: 250024
 URL: http://svnweb.freebsd.org/changeset/base/250024
 
 Log:
   When the world is built WITHOUT_OPENSSH also don't
   install ssh-copy-id.
   
   PR:		misc/177590
   Submitted by:	Oleg Ginzburg <olevole@olevole.ru>
   Reviewed by:	imp
 
 Modified:
   head/tools/build/mk/OptionalObsoleteFiles.inc
   head/usr.bin/Makefile
 
 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
 ==============================================================================
 --- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 28 16:35:24 2013	(r250023)
 +++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 28 17:58:11 2013	(r250024)
 @@ -3674,9 +3674,9 @@ OLD_FILES+=usr/share/man/man8/ntptime.8.
  # to be filled in
  #.endif
  
 -#.if ${MK_OPENSSH} == no
 -# to be filled in
 -#.endif
 +.if ${MK_OPENSSH} == no
 +OLD_FILES+=usr.bin/ssh-copy-id
 +.endif
  
  #.if ${MK_OPENSSL} == no
  # to be filled in
 
 Modified: head/usr.bin/Makefile
 ==============================================================================
 --- head/usr.bin/Makefile	Sun Apr 28 16:35:24 2013	(r250023)
 +++ head/usr.bin/Makefile	Sun Apr 28 17:58:11 2013	(r250024)
 @@ -148,7 +148,6 @@ SUBDIR=	alias \
  	sockstat \
  	sort \
  	split \
 -	ssh-copy-id \
  	stat \
  	stdbuf \
  	su \
 @@ -303,6 +302,10 @@ SUBDIR+=	ypmatch
  SUBDIR+=	ypwhich
  .endif
  
 +.if ${MK_OPENSSH} != "no"
 +SUBDIR+=	ssh-copy-id
 +.endif
 +
  .if ${MK_OPENSSL} != "no"
  SUBDIR+=	bc
  SUBDIR+=	chkey
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
