From owner-p4-projects@FreeBSD.ORG  Mon Apr 22 15:29:21 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 461F725D; Mon, 22 Apr 2013 15:29:21 +0000 (UTC)
Delivered-To: perforce@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 0767725B
 for <perforce@freebsd.org>; Mon, 22 Apr 2013 15:29:21 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EBAA41181
 for <perforce@freebsd.org>; Mon, 22 Apr 2013 15:29:20 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MFTKjK014153
 for <perforce@freebsd.org>; Mon, 22 Apr 2013 15:29:20 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3MFTK84014150
 for perforce@freebsd.org; Mon, 22 Apr 2013 15:29:20 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 22 Apr 2013 15:29:20 GMT
Message-Id: <201304221529.r3MFTK84014150@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 227980 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Apr 2013 15:29:21 -0000

http://p4web.freebsd.org/@@227980?ac=10

Change 227980 by brooks@brooks_zenith on 2013/04/22 15:29:06

	Merge enabling SSH non-cypher support.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/share/mk/bsd.own.mk#7 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/share/mk/bsd.own.mk#7 (text+ko) ====

@@ -317,6 +317,7 @@
     NS_CACHING \
     NTP \
     OPENSSH \
+    OPENSSH_NONE_CIPHER \
     OPENSSL \
     PAM \
     PC_SYSINSTALL \
@@ -375,7 +376,6 @@
     NMTREE \
     NAND \
     OFED \
-    OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN
 
 #