From owner-p4-projects@FreeBSD.ORG Thu Jan 8 21:55:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A6F41065672; Thu, 8 Jan 2009 21:55:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB2B7106566C for ; Thu, 8 Jan 2009 21:55:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C131F8FC26 for ; Thu, 8 Jan 2009 21:55:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n08Lt0Ss097804 for ; Thu, 8 Jan 2009 21:55:00 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n08Lsxb9097788 for perforce@freebsd.org; Thu, 8 Jan 2009 21:54:59 GMT (envelope-from trasz@freebsd.org) Date: Thu, 8 Jan 2009 21:54:59 GMT Message-Id: <200901082154.n08Lsxb9097788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 155836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jan 2009 21:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155836 Change 155836 by trasz@trasz_victim7 on 2009/01/08 21:54:31 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/fattr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/keyword.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lex.rcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/lister.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/misc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/mux.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/proto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcsparse.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rcstokenizer.l#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/rsyncfile.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/status.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/stream.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/AUTHORS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/COPYING#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ChangeLog#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/INSTALL#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/LEGAL.NOTICE#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/MAINT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/animation#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/apple#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/archive#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/audio#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/c64#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cafebabe#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cddb#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/clarion#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/commands#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/compress#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/console#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cracklib#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/database#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/diff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/dump#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/elf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/erlang#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/flash#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fortran#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/frame#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/freebsd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/fsav#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/games#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gimp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnome-keyring#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/gnumeric#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/graphviz#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/hp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/iff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/images#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/inform#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/java#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/kde#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/linux#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/llvm#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/lua#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/luks#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mail.news#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathcad#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mercurial#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mozilla#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mup#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/netware#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ole2compounddocs#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/os2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/palm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/perl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pgp#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/pkgadd#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/printer#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/psion#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/revision#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/riff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rpm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/rtf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/ruby#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/scientific#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/securitycerts#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sharc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/sketch#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/softquad#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/spectrum#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/tex#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/troff#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/unicode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/uuencode#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/warc#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/weak#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/windows#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/xilinx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.am#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.std#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/NEWS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/PORTING#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/README#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/TODO#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/acinclude.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/aclocal.m4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/apprentice.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ascmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/asprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.guess#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.sub#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.ac#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/elfclass.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/fsmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/funcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/getopt_long.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/is_tar.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/libmagic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.man#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic2mime#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/mygetopt.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/names.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/patchlevel.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/print.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/softmagic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.am#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/Makefile.in#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.magic#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.result#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/gedcom.testfile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/tests/test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/vasprintf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/socket.2#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libelf/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/bootp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/virstor/gvirstor.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/md5.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ping/ping.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ae.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cd.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/cpuctl.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_hda.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/snd_ich.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/build.7#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/domain.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/insmntque.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/obio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/forth/support.4th#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/exca/exca.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken_subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_mbus.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ustorage2_fs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_bitops.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sound/driver/au88x0/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_3g/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_input.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_vjc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/gracklevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/elf_common.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/protosw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/soundcard.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/csup/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/globals.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/make.1#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/var.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/cpucontrol/cpucontrol.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/fwcontrol/fwcontrol.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_i386.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/ef_obj.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/fileformat#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mld6query/mld6query.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/lib/plist.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rrenumd/rrenumd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtadvd/rtadvd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/traceroute6/traceroute6.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wlandebug/wlandebug.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.166 2009/01/03 11:25:50 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1 +OLD_FILES+=usr/share/man/man8/nsupdate.8.gz # 20081223: ipprotosw.h removed OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed ==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.26 2006/12/14 10:42:46 ru Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.27 2009/01/07 01:03:23 danger Exp $ .\" .Dd July 31, 2006 .Dt TEST 1 @@ -310,7 +310,7 @@ standards document. All other cases are subject to the ambiguity in the command semantics. -.Sh RETURN VALUES +.Sh EXIT STATUS The .Nm utility exits with one of the following values: ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/GNUmakefile#2 (text) ==== @@ -2,7 +2,7 @@ # be used elsewhere because it assumes that the target system doesn't # support BSD extended file flags. # -# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/GNUmakefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ # PREFIX?=/usr/local @@ -12,8 +12,9 @@ UNAME= $(shell uname -s) SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ - globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c pathcomp.c \ - parse.c proto.c status.c stream.c threads.c token.c updater.c + globtree.c idcache.c keyword.c lex.rcs.c lister.c main.c misc.c mux.c \ + pathcomp.c parse.c proto.c rcsfile.c rcsparse.c rsyncfile.c status.c \ + stream.c threads.c token.c updater.c OBJS= $(SRCS:.c=.o) WARNS= -Wall -W -Wno-unused-parameter -Wmissing-prototypes -Wpointer-arith \ ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/Makefile#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/csup/Makefile,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +# $FreeBSD: src/contrib/csup/Makefile,v 1.2 2009/01/05 15:18:16 lulf Exp $ PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin @@ -9,10 +9,11 @@ PROG= csup SRCS= attrstack.c config.c detailer.c diff.c fattr.c fixups.c fnmatch.c \ globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \ - pathcomp.c proto.c status.c stream.c threads.c token.l updater.c + pathcomp.c proto.c status.c stream.c threads.c token.l updater.c \ + rcsfile.c rcsparse.c lex.rcs.c rsyncfile.c CFLAGS+= -I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG -WARNS?= 6 +WARNS?= 1 # A bit of tweaking is needed to get this Makefile working # with the bsd.prog.mk of all the *BSD OSes... ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/TODO#2 (text) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/csup/TODO,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ +$FreeBSD: src/contrib/csup/TODO,v 1.2 2009/01/05 15:18:16 lulf Exp $ BUGS: @@ -28,4 +28,3 @@ checkout files (files in CVS/ subdirectores), a command line override to only update a specific collection and a third verbosity level to display commit log messages. -- Add support for CVS mode (maybe?). ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/config.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/config.c,v 1.1.1.2 2006/03/14 03:51:13 mux Exp $ + * $FreeBSD: src/contrib/csup/config.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include @@ -133,7 +133,6 @@ coll->co_options &= ~CO_CHECKRCS; /* In recent versions, we always try to set the file modes. */ coll->co_options |= CO_SETMODE; - /* XXX We don't support the rsync updating algorithm yet. */ coll->co_options |= CO_NORSYNC; error = config_parse_refusefiles(coll); if (error) @@ -444,10 +443,6 @@ "\"%s\"\n", cur_coll->co_name); exit(1); } - if (!(cur_coll->co_options & CO_CHECKOUTMODE)) { - lprintf(-1, "Client only supports checkout mode\n"); - exit(1); - } if (!STAILQ_EMPTY(&colls)) { coll = STAILQ_LAST(&colls, coll, co_next); if (strcmp(coll->co_host, cur_coll->co_host) != 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/csup.1#2 (text) ==== @@ -22,7 +22,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $ -.\" $FreeBSD: src/contrib/csup/csup.1,v 1.1.1.2 2006/03/14 03:51:12 mux Exp $ +.\" $FreeBSD: src/contrib/csup/csup.1,v 1.2 2009/01/07 18:37:07 lulf Exp $ .\" .Dd February 1, 2006 .Os FreeBSD @@ -442,8 +442,6 @@ mode and .Em checkout mode. -.Nm -only supports the checkout mode for now. .Pp In CVS mode, the client receives copies of the actual RCS files making up the master CVS repository. CVS mode is the default mode of operation. ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/detailer.c#2 (text) ==== @@ -23,20 +23,28 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/detailer.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/detailer.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ #include #include #include #include +#include +#include +#include +#include + #include "config.h" #include "detailer.h" #include "fixups.h" +#include "globtree.h" #include "misc.h" #include "mux.h" #include "proto.h" +#include "rcsfile.h" +#include "rsyncfile.h" #include "status.h" #include "stream.h" @@ -56,8 +64,16 @@ static int detailer_batch(struct detailer *); static int detailer_coll(struct detailer *, struct coll *, struct status *); -static int detailer_dofile(struct detailer *, struct coll *, +static int detailer_dofile_co(struct detailer *, struct coll *, struct status *, char *); +static int detailer_dofile_rcs(struct detailer *, struct coll *, + char *, char *); +static int detailer_dofile_regular(struct detailer *, char *, char *); +static int detailer_dofile_rsync(struct detailer *, char *, char *); +static int detailer_checkrcsattr(struct detailer *, struct coll *, char *, + struct fattr *, int); +int detailer_send_details(struct detailer *, struct coll *, char *, + char *, struct fattr *); void * detailer(void *arg) @@ -186,8 +202,13 @@ } if (fixup->f_coll != coll) break; - error = proto_printf(wr, "Y %s %s %s\n", fixup->f_name, - coll->co_tag, coll->co_date); + if (coll->co_options & CO_CHECKOUTMODE) + error = proto_printf(wr, "Y %s %s %s\n", + fixup->f_name, coll->co_tag, coll->co_date); + else { + error = proto_printf(wr, "A %s\n", + fixup->f_name); + } if (error) return (DETAILER_ERR_WRITE); fixup = NULL; @@ -208,12 +229,14 @@ static int detailer_coll(struct detailer *d, struct coll *coll, struct status *st) { + struct fattr *rcsattr; struct stream *rd, *wr; - char *cmd, *file, *line, *msg; - int error; + char *attr, *cmd, *file, *line, *msg, *path, *target; + int error, attic; rd = d->rd; wr = d->wr; + attic = 0; line = stream_getln(rd, NULL); if (line == NULL) return (DETAILER_ERR_READ); @@ -226,17 +249,84 @@ /* Delete file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "D %s\n", file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'I': + case 'i': + case 'j': + /* Directory operations. */ + file = proto_get_ascii(&line); + if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = proto_printf(wr, "D %s\n", file); + error = proto_printf(wr, "%s %s\n", cmd, file); + if (error) + return (DETAILER_ERR_WRITE); + break; + case 'J': + /* Set directory attributes. */ + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || line != NULL || attr == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, attr); if (error) return (DETAILER_ERR_WRITE); break; + case 'H': + case 'h': + /* Create a hard link. */ + file = proto_get_ascii(&line); + target = proto_get_ascii(&line); + if (file == NULL || target == NULL) + return (DETAILER_ERR_PROTO); + error = proto_printf(wr, "%s %s %s\n", cmd, file, + target); + break; + case 't': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) { + return (DETAILER_ERR_PROTO); + } + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) { + return (DETAILER_ERR_PROTO); + } + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 1); + break; + + case 'T': + file = proto_get_ascii(&line); + attr = proto_get_ascii(&line); + if (file == NULL || attr == NULL || line != NULL) + return (DETAILER_ERR_PROTO); + rcsattr = fattr_decode(attr); + if (rcsattr == NULL) + return (DETAILER_ERR_PROTO); + error = detailer_checkrcsattr(d, coll, file, rcsattr, + 0); + break; + case 'U': /* Add or update file. */ file = proto_get_ascii(&line); if (file == NULL || line != NULL) return (DETAILER_ERR_PROTO); - error = detailer_dofile(d, coll, st, file); + if (coll->co_options & CO_CHECKOUTMODE) { + error = detailer_dofile_co(d, coll, st, file); + } else { + path = cvspath(coll->co_prefix, file, 0); + rcsattr = fattr_frompath(path, FATTR_NOFOLLOW); + error = detailer_send_details(d, coll, file, + path, rcsattr); + if (rcsattr != NULL) + fattr_free(rcsattr); + free(path); + } if (error) return (error); break; @@ -261,14 +351,110 @@ return (0); } +/* + * Tell the server to update a regular file. + */ +static int +detailer_dofile_regular(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct stat st; + char md5[MD5_DIGEST_SIZE]; + int error; + + wr = d->wr; + error = stat(path, &st); + /* If we don't have it or it's unaccessible, we want it again. */ + if (error) { + proto_printf(wr, "A %s\n", name); + return (0); + } + + /* If not, we want the file to be updated. */ + error = MD5_File(path, md5); + if (error) { + lprintf(-1, "Error reading \"%s\"\n", name); + return (error); + } + error = proto_printf(wr, "R %s %O %s\n", name, st.st_size, md5); + if (error) + return (DETAILER_ERR_WRITE); + return (0); +} + +/* + * Tell the server to update a file with the rsync algorithm. + */ +static int +detailer_dofile_rsync(struct detailer *d, char *name, char *path) +{ + struct stream *wr; + struct rsyncfile *rf; + + wr = d->wr; + rf = rsync_open(path, 0, 1); + if (rf == NULL) { + /* Fallback if we fail in opening it. */ + proto_printf(wr, "A %s\n", name); + return (0); + } + proto_printf(wr, "r %s %z %z\n", name, rsync_filesize(rf), + rsync_blocksize(rf)); + /* Detail the blocks. */ + while (rsync_nextblock(rf) != 0) + proto_printf(wr, "%s %s\n", rsync_rsum(rf), rsync_blockmd5(rf)); + proto_printf(wr, ".\n"); + rsync_close(rf); + return (0); +} + +/* + * Tell the server to update an RCS file that we have, or send it if we don't. + */ static int -detailer_dofile(struct detailer *d, struct coll *coll, struct status *st, +detailer_dofile_rcs(struct detailer *d, struct coll *coll, char *name, + char *path) +{ + struct stream *wr; + struct fattr *fa; + struct rcsfile *rf; + int error; + + wr = d->wr; + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + if (fa == NULL) { + /* We don't have it, so send request to get it. */ + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + free(path); + return (0); + } + + rf = rcsfile_frompath(path, name, coll->co_cvsroot, coll->co_tag, 1); + free(path); + if (rf == NULL) { + error = proto_printf(wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* Tell to update the RCS file. The client version details follow. */ + rcsfile_send_details(rf, wr); + rcsfile_free(rf); + fattr_free(fa); + return (0); +} + +static int +detailer_dofile_co(struct detailer *d, struct coll *coll, struct status *st, char *file) { - char md5[MD5_DIGEST_SIZE]; struct stream *wr; struct fattr *fa; struct statusrec *sr; + char md5[MD5_DIGEST_SIZE]; char *path; int error, ret; @@ -337,3 +523,81 @@ return (DETAILER_ERR_WRITE); return (0); } + +int +detailer_checkrcsattr(struct detailer *d, struct coll *coll, char *name, + struct fattr *server_attr, int attic) +{ + struct fattr *client_attr; + char *attr, *path; + int error; + + /* + * I don't think we can use the status file, since it only records file + * attributes in cvsmode. + */ + client_attr = NULL; + path = cvspath(coll->co_prefix, name, attic); + if (path == NULL) { + return (DETAILER_ERR_PROTO); + } + + if (access(path, F_OK) == 0 && + ((client_attr = fattr_frompath(path, FATTR_NOFOLLOW)) != NULL) && + fattr_equal(client_attr, server_attr)) { + attr = fattr_encode(client_attr, NULL, 0); + if (attic) { + error = proto_printf(d->wr, "l %s %s\n", name, attr); + } else { + error = proto_printf(d->wr, "L %s %s\n", name, attr); + } + free(attr); + free(path); + fattr_free(client_attr); + if (error) + return (DETAILER_ERR_WRITE); + return (0); + } + /* We don't have it, so tell the server to send it. */ + error = detailer_send_details(d, coll, name, path, client_attr); + fattr_free(client_attr); + free(path); + return (error); +} + +int +detailer_send_details(struct detailer *d, struct coll *coll, char *name, + char *path, struct fattr *fa) +{ + int error; + size_t len; + + /* + * Try to check if the file exists either live or dead to see if we can + * edit it and put it live or dead, rather than receiving the entire + * file. + */ + if (fa == NULL) { + path = atticpath(coll->co_prefix, name); + fa = fattr_frompath(path, FATTR_NOFOLLOW); + } + if (fa == NULL) { + error = proto_printf(d->wr, "A %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } else if (fattr_type(fa) == FT_FILE) { + if (isrcs(name, &len) && !(coll->co_options & CO_NORCS)) { + detailer_dofile_rcs(d, coll, name, path); + } else if (!(coll->co_options & CO_NORSYNC) && + !globtree_test(coll->co_norsync, name)) { + detailer_dofile_rsync(d, name, path); + } else { + detailer_dofile_regular(d, name, path); + } + } else { + error = proto_printf(d->wr, "N %s\n", name); + if (error) + return (DETAILER_ERR_WRITE); + } + return (0); +} ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/diff.c#2 (text) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/diff.c,v 1.1.1.1 2006/03/03 04:11:26 mux Exp $ + * $FreeBSD: src/contrib/csup/diff.c,v 1.2 2009/01/05 15:18:16 lulf Exp $ */ +#include + #include #include #include +#include #include #include @@ -36,15 +39,20 @@ #include "keyword.h" #include "misc.h" #include "stream.h" +#include "queue.h" typedef long lineno_t; #define EC_ADD 0 #define EC_DEL 1 +#define MAXKEY LONG_MAX /* Editing command and state. */ struct editcmd { int cmd; + long key; + int havetext; + int offset; lineno_t where; lineno_t count; lineno_t lasta; @@ -55,20 +63,28 @@ struct diffinfo *di; struct stream *orig; struct stream *dest; >>> TRUNCATED FOR MAIL (1000 lines) <<<