d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from CheriBSD:

Browse Source 
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
This commit is contained in:
Brooks Davis 2014-01-30 21:32:25 +00:00
parent 6adfbbbf16
commit a85228f164
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/mtree/Makefile
View File

@ -6,7 +6,7 @@
.PATH: ${.CURDIR}/../../usr.bin/cksum .PATH: ${.CURDIR}/../../usr.bin/cksum
PROG= fmtree 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= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c SRCS+= specspec.c

2
usr.sbin/nmtree/Makefile
View File

@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/../../contrib/mtree .PATH: ${.CURDIR}/../../contrib/mtree
PROG= 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 \ SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
only.c spec.c specspec.c verify.c only.c spec.c specspec.c verify.c
LDADD+= -lmd -lutil LDADD+= -lmd -lutil

7
usr.sbin/mtree/mtree.5 → usr.sbin/nmtree/mtree.5
View File

@ -259,13 +259,6 @@ The
entry format was added by entry format was added by
.Nx . .Nx .
.Sh BUGS .Sh BUGS
The
.Fx
implementation of mtree does not currently support
the
.Nm
2.0
format.
The requirement for a The requirement for a
.Dq #mtree .Dq #mtree
signature line is new and not yet widely implemented. signature line is new and not yet widely implemented.