From owner-svn-src-head@FreeBSD.ORG  Thu Jan 30 21:32:26 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B83772E9;
 Thu, 30 Jan 2014 21:32:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A0891853;
 Thu, 30 Jan 2014 21:32:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ULWQph045258;
 Thu, 30 Jan 2014 21:32:26 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ULWPgu045255;
 Thu, 30 Jan 2014 21:32:25 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201401302132.s0ULWPgu045255@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 30 Jan 2014 21:32:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261298 - in head/usr.sbin: mtree nmtree
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jan 2014 21:32:26 -0000

Author: brooks
Date: Thu Jan 30 21:32:25 2014
New Revision: 261298
URL: http://svnweb.freebsd.org/changeset/base/261298

Log:
  Merge from CheriBSD:
  commit 70b8f0c127db6b80411789d237b403cc64a93573
  Author: Brooks Davis <brooks@one-eyed-alien.net>
  Date:   Mon Jan 27 22:53:57 2014 +0000
  
      Move mtree.5 to usr.sbin/nmtree.
      Remove note that mtree 2.0 format files aren't supported.
  
  MFC after:	4 weeks
  Sponsored by:	DARPA, AFRL

Added:
  head/usr.sbin/nmtree/mtree.5
     - copied, changed from r261296, head/usr.sbin/mtree/mtree.5
Deleted:
  head/usr.sbin/mtree/mtree.5
Modified:
  head/usr.sbin/mtree/Makefile
  head/usr.sbin/nmtree/Makefile

Modified: head/usr.sbin/mtree/Makefile
==============================================================================
--- head/usr.sbin/mtree/Makefile	Thu Jan 30 21:25:01 2014	(r261297)
+++ head/usr.sbin/mtree/Makefile	Thu Jan 30 21:32:25 2014	(r261298)
@@ -6,7 +6,7 @@
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 
 PROG=	fmtree
-MAN=	fmtree.8 mtree.5
+MAN=	fmtree.8
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
 SRCS+=	specspec.c
 

Modified: head/usr.sbin/nmtree/Makefile
==============================================================================
--- head/usr.sbin/nmtree/Makefile	Thu Jan 30 21:25:01 2014	(r261297)
+++ head/usr.sbin/nmtree/Makefile	Thu Jan 30 21:32:25 2014	(r261298)
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../contrib/mtree
 
 PROG=		mtree
-MAN=		mtree.8
+MAN=		mtree.5 mtree.8
 SRCS=		compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
 		only.c spec.c specspec.c verify.c
 LDADD+=		-lmd -lutil

Copied and modified: head/usr.sbin/nmtree/mtree.5 (from r261296, head/usr.sbin/mtree/mtree.5)
==============================================================================
--- head/usr.sbin/mtree/mtree.5	Thu Jan 30 21:08:36 2014	(r261296, copy source)
+++ head/usr.sbin/nmtree/mtree.5	Thu Jan 30 21:32:25 2014	(r261298)
@@ -259,13 +259,6 @@ The
 entry format was added by
 .Nx .
 .Sh BUGS
-The
-.Fx
-implementation of mtree does not currently support
-the
-.Nm
-2.0
-format.
 The requirement for a
 .Dq #mtree
 signature line is new and not yet widely implemented.