From owner-p4-projects@FreeBSD.ORG  Tue Jun  5 16:20:51 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 96DBE16A46B; Tue,  5 Jun 2007 16:20:51 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5734816A468
	for <perforce@freebsd.org>; Tue,  5 Jun 2007 16:20:51 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 40AF113C483
	for <perforce@freebsd.org>; Tue,  5 Jun 2007 16:20:51 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55GKpdu039997
	for <perforce@freebsd.org>; Tue, 5 Jun 2007 16:20:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55GKExC038987
	for perforce@freebsd.org; Tue, 5 Jun 2007 16:20:14 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 5 Jun 2007 16:20:14 GMT
Message-Id: <200706051620.l55GKExC038987@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120999 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2007 16:20:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=120999

Change 120999 by rwatson@rwatson_zoo on 2007/06/05 16:19:53

	Integrate TrustedBSD base branch from FreeBSD CVS:
	
	- file(1) 4.21
	- X11R6 -> local cleanups
	- Support for compiling stack-protected programs
	- threadlock (much less sched_lock); !SCHED_CORE
	- ipfilter update
	- if_em, mpt,  update
	- much sound
	- new accounting file format
	- 64-bit sysctl type (quad)
	- bsdtar/libarchive compression program support

Affected files ...

.. //depot/projects/trustedbsd/base/Makefile.inc1#86 integrate
.. //depot/projects/trustedbsd/base/UPDATING#82 integrate
.. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#12 integrate
.. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#11 integrate
.. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#8 integrate
.. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#10 integrate
.. //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#8 integrate
.. //depot/projects/trustedbsd/base/bin/pax/tables.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/LEGAL.NOTICE#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Localstuff#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/MAINT#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/c-lang#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/cad#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/cafebabe#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/editors#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/fonts#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mach#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mathematica#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mime#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/mips#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/misctools#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/os2#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/os400#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/revision#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/riff#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgml#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sun#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/sysex#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/tex#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/tgif#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/unicode#1 branch
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.script#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/vmware#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordprocessors#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Magdir/xwindows#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/README#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/apptype.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/compress.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/config.h.in#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/configure#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/configure.in#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/file.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/file.h#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/file/funcs.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/install-sh#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/is_tar.c#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.h#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic.mime#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/magic2mime#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/mkinstalldirs#3 integrate
.. //depot/projects/trustedbsd/base/contrib/file/names.h#5 integrate
.. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/print.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/file/readelf.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#8 integrate
.. //depot/projects/trustedbsd/base/contrib/file/tar.h#4 integrate
.. //depot/projects/trustedbsd/base/contrib/file/test.c#3 integrate
.. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#19 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#8 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#18 integrate
.. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#20 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#24 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#68 integrate
.. //depot/projects/trustedbsd/base/etc/etc.amd64/ttys#3 integrate
.. //depot/projects/trustedbsd/base/etc/etc.arm/ttys#3 integrate
.. //depot/projects/trustedbsd/base/etc/etc.i386/ttys#4 integrate
.. //depot/projects/trustedbsd/base/etc/etc.ia64/ttys#6 integrate
.. //depot/projects/trustedbsd/base/etc/etc.powerpc/ttys#5 integrate
.. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#12 integrate
.. //depot/projects/trustedbsd/base/etc/login.conf#8 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#12 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/initrandom#8 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/jail#18 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/tmp#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/var#7 integrate
.. //depot/projects/trustedbsd/base/etc/root/dot.cshrc#4 integrate
.. //depot/projects/trustedbsd/base/etc/root/dot.profile#2 integrate
.. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#61 integrate
.. //depot/projects/trustedbsd/base/gnu/lib/libgomp/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#18 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#27 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#18 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#21 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#14 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_copy_stat.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_private.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_stat.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#17 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#15 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#17 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#20 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_private.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_program.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_ar.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#17 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_empty.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#23 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#8 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#7 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#7 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#13 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#15 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_private.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#11 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_program.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ar.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#22 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/filter_fork.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/filter_fork.h#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/libarchive_internals.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/README#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_archive_api_feature.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_entry.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_compress_program.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_data_large.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_extract.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_zip.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_large.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_position.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_truncated.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_compress_program.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_open_memory.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/amd64/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/arm/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/arc4random.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/Symbol.map#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/ia64/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/powerpc/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/quad/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/regex/engine.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/rpc/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/Symbol.map#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdtime/Symbol.map#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/Symbol.map#5 integrate
.. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#21 integrate
.. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#16 integrate
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#32 integrate
.. //depot/projects/trustedbsd/base/lib/libmagic/config.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login_access.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libthread_db/arch/amd64/libpthread_md.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/msun/src/s_cbrtf.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/ncurses/form/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/ncurses/menu/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/lib/ncurses/panel/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/install.sgml#21 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate
.. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#18 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/geom_stripe.c#9 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs_msdos/newfs_msdos.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/savecore/savecore.c#17 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#78 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/mmc.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/mmcsd.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/ng_bpf.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#18 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/pty.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_envy24ht.4#2 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/snd_spicds.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#44 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#70 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/bus_alloc_resource.9#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/locking.9#2 integrate
.. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#34 integrate
.. //depot/projects/trustedbsd/base/share/mk/Makefile#16 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.port.options.mk#1 branch
.. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#19 integrate
.. //depot/projects/trustedbsd/base/share/skel/dot.cshrc#2 integrate
.. //depot/projects/trustedbsd/base/share/skel/dot.profile#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#13 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_watchdog.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/pcpu.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/specialreg.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/vmparam.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/intr.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/pcpu.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/vnode.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#21 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#87 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#117 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#83 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdHardware.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#68 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#41 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/README#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#65 integrate
.. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemreg.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemvar.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/md/md.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_sas.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_targ.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccardvarp.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#53 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/clone.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/clone.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24ht.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_fmt.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_volume.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/mixer.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sndstat.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#26 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/unit.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/unit.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/version.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/speaker/spkr.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_status.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/geom/cache/g_cache.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#71 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#57 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/mp_watchdog.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#77 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/pcpu.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/specialreg.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/vmparam.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/interrupt.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#65 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/pcpu.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_main.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#73 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#66 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#64 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_idle.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_lockf.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mib.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#56 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_rwlock.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#72 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sx.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/kern/ksched.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#7 delete
.. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_lock.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prof.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_smp.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#67 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_sockbuf.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#69 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#67 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#89 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#79 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#65 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#33 integrate
.. //depot/projects/trustedbsd/base/sys/modules/dcons/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_media.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/common/ng_bluetooth.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_ppp.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/frag6.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_ifattach.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_sock.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/clock.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/pcpu.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/intr_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/pcpu.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/vmparam.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/intr_machdep.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#62 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/pcpu.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/vmparam.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/intr_machdep.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/machdep.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/pmap.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/trap.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/tsb.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/tte_hash.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/vm_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/conf.h#34 integrate
.. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mutex.h#34 integrate
.. //depot/projects/trustedbsd/base/sys/sys/proc.h#84 integrate
.. //depot/projects/trustedbsd/base/sys/sys/resource.h#14 integrate
.. //depot/projects/trustedbsd/base/sys/sys/resourcevar.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sched.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sx.h#15 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#36 integrate
.. //depot/projects/trustedbsd/base/sys/sys/turnstile.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vmmeter.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#69 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#53 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#68 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#74 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#51 integrate
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/README#2 integrate
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/file/config.h#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/file/file.1#11 integrate
.. //depot/projects/trustedbsd/base/usr.bin/file/magic.5#10 integrate
.. //depot/projects/trustedbsd/base/usr.bin/gzip/gzip.1#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/gzip/gzip.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.bin/less/lesspipe.sh#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/make/main.c#34 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.1#14 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#17 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.h#12 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#16 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#20 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/dconschat/dconschat.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#18 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#25 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/radius.c#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ppp/radius.h#9 integrate

Differences ...

==== //depot/projects/trustedbsd/base/Makefile.inc1#86 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -309,7 +309,7 @@
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
-    usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \
+    usr/bin usr/games usr/include/sys usr/lib \
     usr/libexec usr/sbin usr/share/dict \
     usr/share/groff_font/devX100 \
     usr/share/groff_font/devX100-12 \
@@ -505,7 +505,7 @@
 # and Makefile.inc1 causes the correct PATH to be used, rather than a
 # modification of the current environment's PATH.  In addition, we need
 # to quote multiword values.
-# 
+#
 buildenvvars:
 	@echo ${WMAKEENV:Q}
 
@@ -1113,7 +1113,7 @@
 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
 		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
 
-_prereq_libs:  ${_prereq_libs:S/$/__PL/}
+_prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
 _generic_libs: ${_generic_libs:S/$/__L/}

==== //depot/projects/trustedbsd/base/UPDATING#82 (text+ko) ====

@@ -21,6 +21,12 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070529:
+	The ether_ioctl() function has been synchronized with ioctl(2)
+	and ifnet.if_ioctl.  Due to that, the size of one of its arguments
+	has changed on 64-bit architectures.  All kernel modules using
+	ether_ioctl() need to be rebuilt on such architectures.
+
 20070516:
 	Improved INCLUDE_CONFIG_FILE support has been introduced to the
 	config(8) utility. In order to take advantage of this new
@@ -795,4 +801,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $
+$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $

==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#12 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $
 .\"
 .Dd March 3, 2006
 .Dt CHFLAGS 1
@@ -66,7 +66,7 @@
 If the
 .Ar file
 is a symbolic link,
-change the mode of the link itself rather than the file to which it points.
+change the file flags of the link itself rather than the file to which it points.
 .It Fl L
 If the
 .Fl R

==== //depot/projects/trustedbsd/base/bin/pax/ar_io.c#11 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -1109,8 +1109,8 @@
 int
 ar_next(void)
 {
+	static char *arcbuf;
 	char buf[PAXPATHLEN+2];
-	static int freeit = 0;
 	sigset_t o_mask;
 
 	/*
@@ -1228,17 +1228,14 @@
 		 * try to open new archive
 		 */
 		if (ar_open(buf) >= 0) {
-			if (freeit) {
-				(void)free((char *)(uintptr_t)arcname);
-				freeit = 0;
-			}
-			if ((arcname = strdup(buf)) == NULL) {
+			free(arcbuf);
+			if ((arcbuf = strdup(buf)) == NULL) {
 				done = 1;
 				lstrval = -1;
 				paxwarn(0, "Cannot save archive name.");
 				return(-1);
 			}
-			freeit = 1;
+			arcname = arcbuf;
 			break;
 		}
 		tty_prnt("Cannot open %s, try again\n", buf);

==== //depot/projects/trustedbsd/base/bin/pax/file_subs.c#8 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -284,7 +284,7 @@
 		 */
 		if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) {
 			paxwarn(1, "Unable to link file %s to itself", to);
-			return(-1);;
+			return(-1);
 		}
 
 		/*

==== //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#10 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -140,7 +140,7 @@
 		regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf));
 		paxwarn(1, "%s while compiling regular expression %s", rebuf, str);
 #	endif
-		(void)free((char *)rep);
+		free(rep);
 		return(-1);
 	}
 
@@ -152,11 +152,11 @@
 	*pt1++ = *str;
 	if ((pt2 = strchr(pt1, *str)) == NULL) {
 #		ifdef NET2_REGEX
-		(void)free((char *)rep->rcmp);
+		free(rep->rcmp);
 #		else
-		regfree(&(rep->rcmp));
+		regfree(&rep->rcmp);
 #		endif
-		(void)free((char *)rep);
+		free(rep);
 		paxwarn(1, "Invalid replacement string %s", str);
 		return(-1);
 	}
@@ -181,11 +181,11 @@
 			break;
 		default:
 #			ifdef NET2_REGEX
-			(void)free((char *)rep->rcmp);
+			free(rep->rcmp);
 #			else
-			regfree(&(rep->rcmp));
+			regfree(&rep->rcmp);
 #			endif
-			(void)free((char *)rep);
+			free(rep);
 			*pt1 = *str;
 			paxwarn(1, "Invalid replacement string option %s", str);
 			return(-1);
@@ -401,7 +401,7 @@
 		return(-1);
 	}
 	*ppt = pt->fow;
-	(void)free((char *)pt);
+	free(pt);
 	arcn->pat = NULL;
 	return(0);
 }

==== //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#8 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -412,7 +412,7 @@
 		 */
 		if (str_sec(str, &(pt->low_time)) < 0) {
 			paxwarn(1, "Illegal lower time range %s", str);
-			(void)free((char *)pt);
+			free(pt);
 			goto out;
 		}
 		pt->flgs |= HASLOW;
@@ -424,7 +424,7 @@
 		 */
 		if (str_sec(up_pt, &(pt->high_time)) < 0) {
 			paxwarn(1, "Illegal upper time range %s", up_pt);
-			(void)free((char *)pt);
+			free(pt);
 			goto out;
 		}
 		pt->flgs |= HASHIGH;
@@ -436,7 +436,7 @@
 			if (pt->low_time > pt->high_time) {
 				paxwarn(1, "Upper %s and lower %s time overlap",
 					up_pt, str);
-				(void)free((char *)pt);
+				free(pt);
 				return(-1);
 			}
 		}

==== //depot/projects/trustedbsd/base/bin/pax/tables.c#7 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -178,8 +178,8 @@
 			 */
 			if (--pt->nlink <= 1) {
 				*ppt = pt->fow;
-				(void)free((char *)pt->name);
-				(void)free((char *)pt);
+				free(pt->name);
+				free(pt);
 			}
 			return(1);
 		}
@@ -198,7 +198,7 @@
 			ltab[indx] = pt;
 			return(0);
 		}
-		(void)free((char *)pt);
+		free(pt);
 	}
 
 	paxwarn(1, "Hard link table out of memory");
@@ -254,8 +254,8 @@
 	 * remove and free it
 	 */
 	*ppt = pt->fow;
-	(void)free((char *)pt->name);
-	(void)free((char *)pt);
+	free(pt->name);
+	free(pt);
 }
 
 /*
@@ -288,8 +288,8 @@
 		while (pt != NULL) {
 			ppt = pt;
 			pt = ppt->fow;
-			(void)free((char *)ppt->name);
-			(void)free((char *)ppt);
+			free(ppt->name);
+			free(ppt);
 		}
 	}
 	return;
@@ -460,7 +460,7 @@
 		paxwarn(1, "File time table ran out of memory");
 
 	if (pt != NULL)
-		(void)free((char *)pt);
+		free(pt);
 	return(-1);
 }
 
@@ -538,7 +538,7 @@
 			if (strcmp(nname, pt->nname) == 0)
 				return(0);
 
-			(void)free((char *)pt->nname);
+			free(pt->nname);
 			if ((pt->nname = strdup(nname)) == NULL) {
 				paxwarn(1, "Cannot update rename table");
 				return(-1);
@@ -557,9 +557,9 @@
 				ntab[indx] = pt;
 				return(0);
 			}
-			(void)free((char *)pt->oname);
+			free(pt->oname);
 		}
-		(void)free((char *)pt);
+		free(pt);
 	}
 	paxwarn(1, "Interactive rename table out of memory");
 	return(-1);
@@ -994,7 +994,7 @@
 			atab[indx] = pt;
 			return;
 		}
-		(void)free((char *)pt);
+		free(pt);
 	}
 
 	paxwarn(1, "Directory access time reset table ran out of memory");
@@ -1051,8 +1051,8 @@
 	*ppt = pt->fow;
 	*mtime = pt->mtime;
 	*atime = pt->atime;
-	(void)free((char *)pt->name);
-	(void)free((char *)pt);
+	free(pt->name);
+	free(pt);
 	return(0);
 }
 

==== //depot/projects/trustedbsd/base/contrib/file/ChangeLog#4 (text+ko) ====

@@ -1,3 +1,194 @@
+2007-05-24 10:00 Christos Zoulas <christos@zoulas.com>
+
+	* Fix another integer overflow (Colin Percival)
+
+2007-03-26 13:58 Christos Zoulas <christos@zoulas.com>
+
+	* make sure that all of struct magic_set is initialized appropriately
+	  (Brett)
+
+2007-03-25 17:44 Christos Zoulas <christos@zoulas.com>
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<