Module Name: src Committed By: tls Date: Sun Aug 10 06:49:17 UTC 2014
Modified Files: src/etc/mtree [tls-earlyentropy]: NetBSD.dist.base NetBSD.dist.earm NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.powerpc64 NetBSD.dist.sparc64 NetBSD.dist.tests NetBSD.dist.x86_64 special Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.135.2.1 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.1.8.1 src/etc/mtree/NetBSD.dist.earm cvs rdiff -u -r1.7 -r1.7.4.1 src/etc/mtree/NetBSD.dist.mips64eb cvs rdiff -u -r1.8 -r1.8.4.1 src/etc/mtree/NetBSD.dist.mips64el cvs rdiff -u -r1.1 -r1.1.2.1 src/etc/mtree/NetBSD.dist.powerpc64 cvs rdiff -u -r1.8 -r1.8.2.1 src/etc/mtree/NetBSD.dist.sparc64 cvs rdiff -u -r1.103 -r1.103.2.1 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.7 -r1.7.2.1 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.146 -r1.146.4.1 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.135 src/etc/mtree/NetBSD.dist.base:1.135.2.1 --- src/etc/mtree/NetBSD.dist.base:1.135 Mon Mar 31 11:25:48 2014 +++ src/etc/mtree/NetBSD.dist.base Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.135 2014/03/31 11:25:48 martin Exp $ +# $NetBSD: NetBSD.dist.base,v 1.135.2.1 2014/08/10 06:49:17 tls Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -231,7 +231,7 @@ ./usr/lib ./usr/lib/i18n ./usr/lib/lua -./usr/lib/lua/5.1 +./usr/lib/lua/5.3 ./usr/lib/pkgconfig ./usr/lib/security ./usr/libdata @@ -271,95 +271,67 @@ ./usr/share/dict/papers ./usr/share/dict/special ./usr/share/doc -./usr/share/doc/atf -./usr/share/doc/groff -./usr/share/doc/groff/mom -./usr/share/doc/html -./usr/share/doc/html/bind9 -./usr/share/doc/html/bind9/arm -./usr/share/doc/html/bzip2 -./usr/share/doc/html/groff -./usr/share/doc/html/groff/mom -./usr/share/doc/html/ntp -./usr/share/doc/html/ntp/build -./usr/share/doc/html/ntp/drivers -./usr/share/doc/html/ntp/drivers/icons -./usr/share/doc/html/ntp/drivers/scripts -./usr/share/doc/html/ntp/icons -./usr/share/doc/html/ntp/scripts -./usr/share/doc/html/postfix -./usr/share/doc/kyua-atf-compat -./usr/share/doc/kyua-cli -./usr/share/doc/kyua-testers +./usr/share/doc/papers +./usr/share/doc/papers/mckusick84-ffs +./usr/share/doc/papers/mckusick85-fsck +./usr/share/doc/papers/morris78-password ./usr/share/doc/psd -./usr/share/doc/psd/01.cacm -./usr/share/doc/psd/02.implement -./usr/share/doc/psd/03.iosys -./usr/share/doc/psd/04.uprog -./usr/share/doc/psd/05.sysman -./usr/share/doc/psd/06.Clang -./usr/share/doc/psd/07.pascal -./usr/share/doc/psd/08.f77 -./usr/share/doc/psd/09.f77io -./usr/share/doc/psd/10.gdb -./usr/share/doc/psd/11.adb -./usr/share/doc/psd/12.make -./usr/share/doc/psd/13.rcs -./usr/share/doc/psd/14.sccs -./usr/share/doc/psd/15.yacc -./usr/share/doc/psd/16.lex -./usr/share/doc/psd/17.m4 -./usr/share/doc/psd/18.gprof -./usr/share/doc/psd/19.curses -./usr/share/doc/psd/20.ipctut -./usr/share/doc/psd/21.ipc +./usr/share/doc/reference +./usr/share/doc/reference/ref1 +./usr/share/doc/reference/ref1/atf +./usr/share/doc/reference/ref1/bzip2 +./usr/share/doc/reference/ref1/config +./usr/share/doc/reference/ref1/csh +./usr/share/doc/reference/ref1/ex +./usr/share/doc/reference/ref1/gprof +./usr/share/doc/reference/ref1/kyua +./usr/share/doc/reference/ref1/kyua/kyua-atf-compat +./usr/share/doc/reference/ref1/kyua/kyua-cli +./usr/share/doc/reference/ref1/kyua/kyua-testers +./usr/share/doc/reference/ref1/mail +./usr/share/doc/reference/ref1/make +./usr/share/doc/reference/ref1/roff +./usr/share/doc/reference/ref1/roff/memacros +./usr/share/doc/reference/ref1/roff/meref +./usr/share/doc/reference/ref1/roff/msdiffs +./usr/share/doc/reference/ref1/roff/msmacros +./usr/share/doc/reference/ref1/roff/mom +./usr/share/doc/reference/ref1/roff/mom_examples +./usr/share/doc/reference/ref1/sh +./usr/share/doc/reference/ref1/vi +./usr/share/doc/reference/ref2 +./usr/share/doc/reference/ref3 +./usr/share/doc/reference/ref3/curses +./usr/share/doc/reference/ref3/sockets +./usr/share/doc/reference/ref3/sockets-advanced +./usr/share/doc/reference/ref3/sysman +./usr/share/doc/reference/ref4 +./usr/share/doc/reference/ref5 +./usr/share/doc/reference/ref5/timed +./usr/share/doc/reference/ref6 +./usr/share/doc/reference/ref6/rogue +./usr/share/doc/reference/ref6/trek +./usr/share/doc/reference/ref7 +./usr/share/doc/reference/ref7/quotas +./usr/share/doc/reference/ref8 +./usr/share/doc/reference/ref8/bind9 +./usr/share/doc/reference/ref8/bind9/arm +./usr/share/doc/reference/ref8/lpd +./usr/share/doc/reference/ref8/ntp +./usr/share/doc/reference/ref8/ntp/drivers +./usr/share/doc/reference/ref8/ntp/drivers/scripts +./usr/share/doc/reference/ref8/ntp/scripts +./usr/share/doc/reference/ref8/postfix +./usr/share/doc/reference/ref8/timed +./usr/share/doc/reference/ref9 +./usr/share/doc/reference/ref9/net +./usr/share/doc/reference/ref9/nfs ./usr/share/doc/smm -./usr/share/doc/smm/01.setup -./usr/share/doc/smm/02.config -./usr/share/doc/smm/03.fsck_ffs -./usr/share/doc/smm/04.quotas -./usr/share/doc/smm/05.fastfs -./usr/share/doc/smm/06.nfs -./usr/share/doc/smm/07.lpd -./usr/share/doc/smm/11.timedop -./usr/share/doc/smm/12.timed -./usr/share/doc/smm/13.amd -./usr/share/doc/smm/16.security -./usr/share/doc/smm/17.password -./usr/share/doc/smm/18.net +./usr/share/doc/smm/setup ./usr/share/doc/usd -./usr/share/doc/usd/01.begin -./usr/share/doc/usd/02.learn -./usr/share/doc/usd/03.shell -./usr/share/doc/usd/04.csh -./usr/share/doc/usd/05.dc -./usr/share/doc/usd/06.bc -./usr/share/doc/usd/07.mail -./usr/share/doc/usd/08.mh -./usr/share/doc/usd/09.edtut -./usr/share/doc/usd/10.edadv -./usr/share/doc/usd/11.edit -./usr/share/doc/usd/12.ex -./usr/share/doc/usd/12.vi -./usr/share/doc/usd/13.viref -./usr/share/doc/usd/14.jove -./usr/share/doc/usd/15.sed -./usr/share/doc/usd/16.awk -./usr/share/doc/usd/17.msmacros -./usr/share/doc/usd/18.msdiffs -./usr/share/doc/usd/19.memacros -./usr/share/doc/usd/20.meref -./usr/share/doc/usd/21.troff -./usr/share/doc/usd/22.trofftut -./usr/share/doc/usd/23.eqn -./usr/share/doc/usd/24.eqnguide -./usr/share/doc/usd/25.tbl -./usr/share/doc/usd/26.refer -./usr/share/doc/usd/27.invert -./usr/share/doc/usd/28.bib -./usr/share/doc/usd/29.diction -./usr/share/doc/usd/30.rogue -./usr/share/doc/usd/31.trek +./usr/share/doc/usd/begin +./usr/share/doc/usd/edit +./usr/share/doc/usd/vi ./usr/share/examples ./usr/share/examples/amd ./usr/share/examples/apm @@ -861,7 +833,7 @@ ./usr/share/locale/zh_TW.eucTW/LC_MESSAGES ./usr/share/locale/zh_TW/LC_MESSAGES ./usr/share/lua -./usr/share/lua/5.1 +./usr/share/lua/5.3 ./usr/share/man ./usr/share/man/cat1 ./usr/share/man/cat1/atari @@ -1228,6 +1200,8 @@ ./usr/share/nls/zh_CN.UTF-8 ./usr/share/nvi ./usr/share/nvi/catalog +./usr/share/sysinst +./usr/share/sysinst/catalog ./usr/share/tabset ./usr/share/tmac ./usr/share/tmac/mdoc Index: src/etc/mtree/NetBSD.dist.earm diff -u src/etc/mtree/NetBSD.dist.earm:1.1 src/etc/mtree/NetBSD.dist.earm:1.1.8.1 --- src/etc/mtree/NetBSD.dist.earm:1.1 Sat Apr 27 07:59:09 2013 +++ src/etc/mtree/NetBSD.dist.earm Sun Aug 10 06:49:17 2014 @@ -1,11 +1,11 @@ -# $NetBSD: NetBSD.dist.earm,v 1.1 2013/04/27 07:59:09 matt Exp $ +# $NetBSD: NetBSD.dist.earm,v 1.1.8.1 2014/08/10 06:49:17 tls Exp $ ./lib/oabi ./lib/oabi/npf ./usr/lib/oabi ./usr/lib/oabi/i18n ./usr/lib/oabi/lua -./usr/lib/oabi/lua/5.1 +./usr/lib/oabi/lua/5.3 ./usr/lib/oabi/security ./usr/libdata/debug/lib/oabi ./usr/libdata/debug/lib/oabi/npf Index: src/etc/mtree/NetBSD.dist.mips64eb diff -u src/etc/mtree/NetBSD.dist.mips64eb:1.7 src/etc/mtree/NetBSD.dist.mips64eb:1.7.4.1 --- src/etc/mtree/NetBSD.dist.mips64eb:1.7 Wed Nov 6 00:53:03 2013 +++ src/etc/mtree/NetBSD.dist.mips64eb Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.mips64eb,v 1.7 2013/11/06 00:53:03 mrg Exp $ +# $NetBSD: NetBSD.dist.mips64eb,v 1.7.4.1 2014/08/10 06:49:17 tls Exp $ ./lib/o32 ./lib/o32/npf @@ -10,12 +10,12 @@ ./usr/lib/o32 ./usr/lib/o32/i18n ./usr/lib/o32/lua -./usr/lib/o32/lua/5.1 +./usr/lib/o32/lua/5.3 ./usr/lib/o32/security ./usr/lib/64 ./usr/lib/64/i18n ./usr/lib/64/lua -./usr/lib/64/lua/5.1 +./usr/lib/64/lua/5.3 ./usr/lib/64/security ./usr/libdata/debug/lib/o32 ./usr/libdata/debug/lib/o32/npf Index: src/etc/mtree/NetBSD.dist.mips64el diff -u src/etc/mtree/NetBSD.dist.mips64el:1.8 src/etc/mtree/NetBSD.dist.mips64el:1.8.4.1 --- src/etc/mtree/NetBSD.dist.mips64el:1.8 Wed Nov 6 00:53:03 2013 +++ src/etc/mtree/NetBSD.dist.mips64el Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.mips64el,v 1.8 2013/11/06 00:53:03 mrg Exp $ +# $NetBSD: NetBSD.dist.mips64el,v 1.8.4.1 2014/08/10 06:49:17 tls Exp $ ./lib/o32 ./lib/o32/npf @@ -10,12 +10,12 @@ ./usr/lib/o32 ./usr/lib/o32/i18n ./usr/lib/o32/lua -./usr/lib/o32/lua/5.1 +./usr/lib/o32/lua/5.3 ./usr/lib/o32/security ./usr/lib/64 ./usr/lib/64/i18n ./usr/lib/64/lua -./usr/lib/64/lua/5.1 +./usr/lib/64/lua/5.3 ./usr/lib/64/security ./usr/libdata/debug/lib/o32 ./usr/libdata/debug/lib/o32/npf Index: src/etc/mtree/NetBSD.dist.powerpc64 diff -u src/etc/mtree/NetBSD.dist.powerpc64:1.1 src/etc/mtree/NetBSD.dist.powerpc64:1.1.2.1 --- src/etc/mtree/NetBSD.dist.powerpc64:1.1 Fri Mar 7 04:18:06 2014 +++ src/etc/mtree/NetBSD.dist.powerpc64 Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.powerpc64,v 1.1 2014/03/07 04:18:06 matt Exp $ +# $NetBSD: NetBSD.dist.powerpc64,v 1.1.2.1 2014/08/10 06:49:17 tls Exp $ ./lib/powerpc ./lib/powerpc/npf @@ -7,7 +7,7 @@ ./usr/lib/powerpc ./usr/lib/powerpc/i18n ./usr/lib/powerpc/lua -./usr/lib/powerpc/lua/5.1 +./usr/lib/powerpc/lua/5.3 ./usr/lib/powerpc/security ./usr/libdata/debug/lib/powerpc ./usr/libdata/debug/lib/powerpc/npf Index: src/etc/mtree/NetBSD.dist.sparc64 diff -u src/etc/mtree/NetBSD.dist.sparc64:1.8 src/etc/mtree/NetBSD.dist.sparc64:1.8.2.1 --- src/etc/mtree/NetBSD.dist.sparc64:1.8 Wed Nov 6 00:53:03 2013 +++ src/etc/mtree/NetBSD.dist.sparc64 Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.sparc64,v 1.8 2013/11/06 00:53:03 mrg Exp $ +# $NetBSD: NetBSD.dist.sparc64,v 1.8.2.1 2014/08/10 06:49:17 tls Exp $ ./lib/sparc ./lib/sparc/npf @@ -7,7 +7,7 @@ ./usr/lib/sparc ./usr/lib/sparc/i18n ./usr/lib/sparc/lua -./usr/lib/sparc/lua/5.1 +./usr/lib/sparc/lua/5.3 ./usr/lib/sparc/security ./usr/libdata/debug/lib/sparc ./usr/libdata/debug/lib/sparc/npf Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.103 src/etc/mtree/NetBSD.dist.tests:1.103.2.1 --- src/etc/mtree/NetBSD.dist.tests:1.103 Sat Feb 8 19:45:51 2014 +++ src/etc/mtree/NetBSD.dist.tests Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.103 2014/02/08 19:45:51 jmmv Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.103.2.1 2014/08/10 06:49:17 tls Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -75,6 +75,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063 ./usr/libdata/debug/usr/tests/lib/libc/db ./usr/libdata/debug/usr/tests/lib/libc/gen +./usr/libdata/debug/usr/tests/lib/libc/gen/execve ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn ./usr/libdata/debug/usr/tests/lib/libc/hash ./usr/libdata/debug/usr/tests/lib/libc/locale @@ -127,6 +128,7 @@ ./usr/libdata/debug/usr/tests/net ./usr/libdata/debug/usr/tests/net/bpf ./usr/libdata/debug/usr/tests/net/bpfilter +./usr/libdata/debug/usr/tests/net/bpfjit ./usr/libdata/debug/usr/tests/net/carp ./usr/libdata/debug/usr/tests/net/fdpass ./usr/libdata/debug/usr/tests/net/icmp @@ -165,6 +167,8 @@ ./usr/tests/bin/ps ./usr/tests/bin/sleep ./usr/tests/bin/sh +./usr/tests/bin/sh/dotcmd +./usr/tests/bin/sh/dotcmd/out ./usr/tests/bin/tar ./usr/tests/crypto ./usr/tests/crypto/libcrypto @@ -177,6 +181,7 @@ ./usr/tests/dev/scsipi ./usr/tests/dev/sysmon ./usr/tests/fs +./usr/tests/fs/cd9660 ./usr/tests/fs/ffs ./usr/tests/fs/fifofs ./usr/tests/fs/hfs @@ -236,6 +241,7 @@ ./usr/tests/lib/libc/c063 ./usr/tests/lib/libc/db ./usr/tests/lib/libc/gen +./usr/tests/lib/libc/gen/execve ./usr/tests/lib/libc/gen/posix_spawn ./usr/tests/lib/libc/hash ./usr/tests/lib/libc/hash/data @@ -296,6 +302,7 @@ ./usr/tests/net ./usr/tests/net/bpf ./usr/tests/net/bpfilter +./usr/tests/net/bpfjit ./usr/tests/net/carp ./usr/tests/net/fdpass ./usr/tests/net/icmp Index: src/etc/mtree/NetBSD.dist.x86_64 diff -u src/etc/mtree/NetBSD.dist.x86_64:1.7 src/etc/mtree/NetBSD.dist.x86_64:1.7.2.1 --- src/etc/mtree/NetBSD.dist.x86_64:1.7 Wed Nov 6 00:53:03 2013 +++ src/etc/mtree/NetBSD.dist.x86_64 Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.x86_64,v 1.7 2013/11/06 00:53:03 mrg Exp $ +# $NetBSD: NetBSD.dist.x86_64,v 1.7.2.1 2014/08/10 06:49:17 tls Exp $ ./lib/i386 ./lib/i386/npf @@ -7,7 +7,7 @@ ./usr/lib/i386 ./usr/lib/i386/i18n ./usr/lib/i386/lua -./usr/lib/i386/lua/5.1 +./usr/lib/i386/lua/5.3 ./usr/lib/i386/security ./usr/libdata/debug/lib/i386 ./usr/libdata/debug/lib/i386/npf Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.146 src/etc/mtree/special:1.146.4.1 --- src/etc/mtree/special:1.146 Tue Jul 9 09:34:58 2013 +++ src/etc/mtree/special Sun Aug 10 06:49:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.146 2013/07/09 09:34:58 roy Exp $ +# $NetBSD: special,v 1.146.4.1 2014/08/10 06:49:17 tls Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -38,7 +38,7 @@ ./etc/bootptab type=file mode=0644 optional ./etc/ccd.conf type=file mode=0644 optional ./etc/cgd type=dir mode=0700 optional -./etc/cgd/cgd.conf type=file mode=0600 optional +./etc/cgd/cgd.conf type=file mode=0600 optional tags=nodiff ./etc/changelist type=file mode=0644 ./etc/crontab type=file mode=0644 optional ./etc/csh.cshrc type=file mode=0644 @@ -81,7 +81,7 @@ ./etc/hosts type=file mode=0644 ./etc/hosts.allow type=file mode=0644 optional ./etc/hosts.deny type=file mode=0644 optional -./etc/hosts.equiv type=file mode=0600 optional +./etc/hosts.equiv type=file mode=0600 optional tags=nodiff ./etc/hosts.lpd type=file mode=0644 optional ./etc/ifaliases type=file mode=0644 optional ./etc/inetd.conf type=file mode=0644 @@ -90,7 +90,7 @@ ./etc/ipnat.conf type=file mode=0644 optional ./etc/ipsec.conf type=file mode=0600 optional tags=nodiff ./etc/iscsi type=dir mode=0755 -./etc/iscsi/auths type=file mode=0600 +./etc/iscsi/auths type=file mode=0600 tags=nodiff ./etc/iscsi/targets type=file mode=0644 ./etc/ld.so.conf type=file mode=0644 optional ./etc/localtime type=link mode=0755 @@ -304,16 +304,16 @@ ./etc/security.local type=file mode=0644 optional ./etc/services type=file mode=0644 ./etc/shells type=file mode=0644 -./etc/shosts.equiv type=file mode=0600 optional +./etc/shosts.equiv type=file mode=0600 optional tags=nodiff ./etc/skel type=dir mode=0755 optional -./etc/spwd.db type=file mode=0600 tags=exclude +./etc/spwd.db type=file mode=0600 tags=exclude tags=nodiff ./etc/ssh type=dir mode=0755 optional ./etc/ssh/ssh_config type=file mode=0644 optional ./etc/ssh/ssh_host_dsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_dsa_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_ecdsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_ecdsa_key.pub type=file mode=0644 optional -./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff +./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff tags=nodiff ./etc/ssh/ssh_host_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_rsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_rsa_key.pub type=file mode=0644 optional @@ -339,14 +339,14 @@ ./root type=dir mode=0755 ./root/.cshrc type=file mode=0644 -./root/.klogin type=file mode=0600 optional +./root/.klogin type=file mode=0600 optional tags=nodiff ./root/.login type=file mode=0644 ./root/.profile type=file mode=0644 -./root/.rhosts type=file mode=0600 optional -./root/.shosts type=file mode=0600 optional +./root/.rhosts type=file mode=0600 optional tags=nodiff +./root/.shosts type=file mode=0600 optional tags=nodiff ./root/.ssh type=dir mode=0700 optional -./root/.ssh/authorized_keys type=file mode=0600 optional -./root/.ssh/authorized_keys2 type=file mode=0600 optional +./root/.ssh/authorized_keys type=file mode=0600 optional tags=nodiff +./root/.ssh/authorized_keys2 type=file mode=0600 optional tags=nodiff ./root/.ssh/config type=file mode=0644 optional ./root/.ssh/id_dsa type=file mode=0600 optional tags=nodiff ./root/.ssh/id_dsa.pub type=file mode=0644 optional @@ -404,7 +404,7 @@ ./var/chroot/tftp-proxy type=dir mode=0755 ./var/cron type=dir mode=0755 ./var/cron/tabs type=dir mode=0700 -./var/cron/tabs/root type=file mode=0600 +./var/cron/tabs/root type=file mode=0600 tags=nodiff ./var/db type=dir mode=0755 ./var/log type=dir mode=0755 ./var/log/authlog type=file mode=0600 optional tags=exclude @@ -425,7 +425,7 @@ ./var/spool/ftp/etc type=dir mode=0755 optional ./var/spool/ftp/etc/group type=file mode=0644 optional ./var/spool/ftp/etc/localtime type=file mode=0644 optional -./var/spool/ftp/etc/master.passwd type=file mode=0600 optional +./var/spool/ftp/etc/master.passwd type=file mode=0600 optional tags=nodiff ./var/spool/ftp/etc/passwd type=file mode=0644 optional ./var/spool/ftp/hidden type=dir mode=0111 ignore optional ./var/spool/ftp/pub type=dir mode=0775 ignore optional