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 <bro...@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.
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
