PERFORCE change 109358 for review
Robert Watson
rwatson at FreeBSD.org
Mon Nov 6 15:58:59 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109358
Change 109358 by rwatson at rwatson_zoo on 2006/11/06 15:40:25
Integrate TrustedBSD base tree from FreeBSD CVS:
- BIND 9.3.2-P2
- bsnmp update
- gjournal, BIO_FLUSH, VV_DELETED
- De-ia64-ize EFI.
- CAM_NEW_TRAN_CODE
- SCTP
- priv(9)
- if_em update
- kernel console output ordering
- m_getm2(), sosend/sendfile optimization
Affected files ...
.. //depot/projects/trustedbsd/base/Makefile#48 integrate
.. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#16 integrate
.. //depot/projects/trustedbsd/base/bin/cp/cp.1#15 integrate
.. //depot/projects/trustedbsd/base/bin/rm/rm.1#15 integrate
.. //depot/projects/trustedbsd/base/bin/rm/rm.c#20 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#4 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/bind9/version#5 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/action.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/tree.def#4 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#39 integrate
.. //depot/projects/trustedbsd/base/etc/snmpd.config#5 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.sh#11 integrate
.. //depot/projects/trustedbsd/base/include/Makefile#56 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#12 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/resolver.3#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/Makefile.inc#8 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_gen.S#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/getpid.2#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/statfs.2#8 integrate
.. //depot/projects/trustedbsd/base/lib/libcam/camlib.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/cgread.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/cgroup.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/libufs.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libufs/libufs.h#7 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#115 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#16 integrate
.. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#18 integrate
.. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#10 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsck.h#16 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#19 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/gjournal.c#1 branch
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#13 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#19 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#19 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#25 integrate
.. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.c#15 integrate
.. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.h#8 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/cache/geom_cache.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/journal/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal.c#1 branch
.. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal.h#1 branch
.. //depot/projects/trustedbsd/base/sbin/geom/class/journal/geom_journal_ufs.c#1 branch
.. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/geom_mirror.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#9 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/geom_raid3.c#9 integrate
.. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#6 integrate
.. //depot/projects/trustedbsd/base/sbin/growfs/debug.c#8 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#43 integrate
.. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#17 integrate
.. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#15 integrate
.. //depot/projects/trustedbsd/base/sbin/mount/mount.c#26 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#28 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs/newfs.8#22 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#21 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs/newfs.h#13 integrate
.. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#17 integrate
.. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#15 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/pthread_create.3#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/aac.4#13 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/acpi_sony.4#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/elf.5#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/fs.5#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VOP_REMOVE.9#6 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/VOP_RENAME.9#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/disk.9#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/g_bio.9#4 integrate
.. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#30 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#17 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#17 integrate
.. //depot/projects/trustedbsd/base/share/snmp/mibs/FREEBSD-MIB.txt#3 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/io.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/boot/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/bootstrap.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/devopen.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/common/load_elf.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efi.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efi_nii.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiapi.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/eficon.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidebug.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidef.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efidevp.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efierr.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efifs.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efilib.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efinet.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efipart.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiprot.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efipxebc.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efiser.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/efistdarg.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/i386/efibind.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/i386/pe.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/ia64/efibind.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/include/ia64/pe.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#11 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/copy.c#5 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/devicename.c#3 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efiboot.h#6 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifpswa.c#3 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifs.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efinet.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/elf_freebsd.c#12 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/errno.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/handles.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/libefi.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/module.c#3 delete
.. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/time.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bioscd.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biosdisk.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/bootinfo32.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/devicename.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/elf32_freebsd.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#15 integrate
.. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/autoload.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/bootinfo.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/copy.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/devicename.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/exec.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/common/libia64.h#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/conf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/efimd.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/main.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/acpi_stub.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/bootinfo.c#5 delete
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/copy.c#2 delete
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/devicename.c#2 delete
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/efi_stub.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/elf_freebsd.c#3 delete
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/libski.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/skifs.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/skimd.c#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/version#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ofw/common/main.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/libofw.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/biosdisk.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#58 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#29 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#79 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#108 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#47 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#76 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options.sparc64#14 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_cbq.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_cdnr.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/altq/altq/altq_rio.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_main.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_aiboost.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_sony.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/advansys/advlib.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amr/amr_cam.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amr/amr_disk.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cp/if_cp.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ctau/if_ct.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#37 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_library.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_sbus.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_stds.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispreg.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ispfw/asm_2300.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/md/md.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nmdm/nmdm.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/dev/null/null.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/dev/random/randomdev.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sbsh/if_sbsh.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/si/si.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/sysmouse.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/uart/uart_kbd_sun.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#48 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#57 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#47 integrate
.. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_smb.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/geom/concat/g_concat.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom.h#43 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_disk.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.c#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.h#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal_ufs.c#1 branch
.. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/geom/shsec/g_shsec.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/io.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/vm86.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysi86.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/genassym.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#62 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/ssc.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#67 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#63 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ntptime.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_priv.c#1 branch
.. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#40 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#33 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_xxx.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_firmware.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#60 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#62 integrate
.. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_ipc.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#63 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#59 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#54 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#83 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#74 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#61 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ath_rate_amrr/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/bge/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/sys/modules/geom/geom_journal/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/nfe/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sys/modules/ufs/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/net/bpf.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/net/bridgestp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_gre.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_sl.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_tap.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_tun.c#36 integrate
.. //depot/projects/trustedbsd/base/sys/net/ppp_tty.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/net/rtsock.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/at_control.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netatalk/ddp_pcb.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/ng_tty.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_carp.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#52 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/sctp.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_asconf.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_auth.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_header.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_lock_bsd.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_os.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#45 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_src.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_var.h#1 branch
.. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_osdep.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netipx/ipx_pcb.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_mod.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netncp/ncp_subr.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_conn.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/cbus/fdc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/conf/DEFAULTS#6 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#49 integrate
.. //depot/projects/trustedbsd/base/sys/pci/ncr.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/posix4/p1003_1b.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/genassym.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_net.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_priv.c#1 branch
.. //depot/projects/trustedbsd/base/sys/security/mac/mac_system.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_portacl/mac_portacl.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_stub/mac_stub.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#19 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/conf/DEFAULTS#3 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/hypervisor_api.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/hypervisorvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/trap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/include/utrap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/exception.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/hcall.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/wbuf.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/bio.h#22 integrate
.. //depot/projects/trustedbsd/base/sys/sys/cons.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/sys/jail.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/sys/libkern.h#21 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#51 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#51 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mount.h#42 integrate
.. //depot/projects/trustedbsd/base/sys/sys/pcpu.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/priv.h#1 branch
.. //depot/projects/trustedbsd/base/sys/sys/socket.h#24 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#61 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#61 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#62 integrate
.. //depot/projects/trustedbsd/base/sys/sys/systm.h#42 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#64 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#19 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#43 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#55 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/fs.h#17 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/gjournal.h#1 branch
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_gjournal.c#1 branch
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#51 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#50 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#36 integrate
.. //depot/projects/trustedbsd/base/tools/build/options/WITHOUT_CDDL#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/find-sb/mini_ufs.h#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/README#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/bridge/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/default/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/firewall/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/minimal/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/vpn/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wireless/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wrap/tinybsd.localfiles#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/tar/getdate.y#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.8#14 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidcontrol/hid.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/client.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/bsnmpd/Makefile#11 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#6 integrate
Differences ...
==== //depot/projects/trustedbsd/base/Makefile#48 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $
+# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $
#
# The user-driven targets are:
#
@@ -240,7 +240,7 @@
MMAKE= ${MMAKEENV} make \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WERROR
+ -DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF
make: .PHONY
@echo
==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#16 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.58 2006/11/05 00:39:56 trhodes Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -183,6 +183,17 @@
# 20041109: replaced by em(4)
OLD_FILES+=usr/share/man/man4/gx.4.gz
OLD_FILES+=usr/share/man/man4/if_gx.4.gz
+# 20041017: rune interface removed
+OLD_FILES+=usr/include/rune.h
+OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/fputrune.3.gz
+OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
+OLD_FILES+=usr/share/man/man3/mbrune.3.gz
+OLD_FILES+=usr/share/man/man3/rune.3.gz
+OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
+OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
+OLD_FILES+=usr/share/man/man3/sputrune.3.gz
# 20040925: bind9 import
OLD_FILES+=usr/bin/dnskeygen
OLD_FILES+=usr/bin/dnsquery
@@ -628,7 +639,9 @@
OLD_FILES+=usr/lib/libpam_ssh_p.a
OLD_FILES+=usr/bin/help
OLD_FILES+=usr/bin/sccs
+.if ${TARGET_ARCH} != "i386"
OLD_FILES+=usr/bin/gdbserver
+.endif
OLD_FILES+=usr/bin/ssh-keysign
OLD_FILES+=usr/sbin/gifconfig
OLD_FILES+=usr/sbin/prefix
==== //depot/projects/trustedbsd/base/bin/cp/cp.1#15 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.38 2006/10/27 08:26:24 trhodes Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $
.\"
.Dd October 27, 2006
.Dt CP 1
@@ -264,7 +264,7 @@
is a synonym for
.Fl RL
and works the same unless modified by other flags.
-Historical implemenations
+Historical implementations
of
.Fl r
differ as they copy special files as normal
==== //depot/projects/trustedbsd/base/bin/rm/rm.1#15 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
-.\" $FreeBSD: src/bin/rm/rm.1,v 1.40 2006/10/30 03:32:09 delphij Exp $
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $
.\"
.Dd October 30, 2006
.Dt RM 1
@@ -88,7 +88,9 @@
Overwrite regular files before deleting them.
Files are overwritten three times, first with the byte pattern 0xff,
then 0x00, and then 0xff again, before they are deleted.
-Files with multiple links will not be overwritten.
+Files with multiple links will not be overwritten nor deleted unless
+.Fl f
+is specified, a warning is generated instead.
.Pp
Specifying this flag for a read only file will cause
.Nm
@@ -170,6 +172,12 @@
For example:
.Dl rm /home/user/-filename
.Dl rm ./-filename
+.Pp
+When
+.Fl P
+is specified with
+.Fl f
+the file will be overwritten and removed even if it has hard links.
.Sh COMPATIBILITY
The
.Nm
==== //depot/projects/trustedbsd/base/bin/rm/rm.c#20 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.57 2006/10/30 03:32:09 delphij Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $");
#include <sys/stat.h>
#include <sys/param.h>
@@ -400,10 +400,10 @@
}
if (!S_ISREG(sbp->st_mode))
return (1);
- if (sbp->st_nlink > 1) {
+ if (sbp->st_nlink > 1 && !fflag) {
warnx("%s (inode %u): not overwritten due to multiple links",
file, sbp->st_ino);
- return (1);
+ return (0);
}
if ((fd = open(file, O_WRONLY, 0)) == -1)
goto err;
==== //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#5 (text+ko) ====
@@ -1,4 +1,19 @@
+ --- 9.3.2-P2 released ---
+
+2090. [port] win32: Visual C++ 2005 command line manifest support.
+ [RT #16417]
+
+2089. [security] Raise the minimum safe OpenSSL versions to
+ OpenSSL 0.9.7l and OpenSSL 0.9.8d. Versions
+ prior to these have known security flaws which
+ are (potentially) exploitable in named. [RT #16391]
+
+2088. [security] Change the default RSA exponent from 3 to 65537.
+ [RT #16391]
+
+2083. [port] win32: Visual C++ 2005 support.
+
--- 9.3.2-P1 released ---
2066. [security] Handle SIG queries gracefully. [RT #16300]
==== //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */
+/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */
#include <config.h>
==== //depot/projects/trustedbsd/base/contrib/bind9/configure.in#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +18,7 @@
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
-AC_REVISION($Revision: 1.294.2.23.2.51 $)
+AC_REVISION($Revision: 1.294.2.23.2.51.4.3 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.13)
@@ -357,6 +357,7 @@
#
# was --with-openssl specified?
#
+OPENSSL_WARNING=
AC_MSG_CHECKING(for OpenSSL library)
AC_ARG_WITH(openssl,
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
@@ -462,51 +463,38 @@
[AC_MSG_RESULT(assuming it does work on target platform)]
)
-#
-# OpenSSLDie is new with CERT CS-2002-23. If we see it we have may
-# have a patched library otherwise check that we are greater than
-# the fixed versions
-#
- AC_CHECK_FUNC(OpenSSLDie,
+AC_ARG_ENABLE(openssl-version-check,
+[AC_HELP_STRING([--enable-openssl-version-check],
+ [Check OpenSSL Version @<:@default=yes@:>@])])
+case "$enable_openssl_version_check" in
+yes|'')
AC_MSG_CHECKING(OpenSSL library version)
AC_TRY_RUN([
#include <stdio.h>
#include <openssl/opensslv.h>
int main() {
- if (OPENSSL_VERSION_NUMBER >= 0x0090581fL)
+ if ((OPENSSL_VERSION_NUMBER >= 0x009070cfL &&
+ OPENSSL_VERSION_NUMBER < 0x009080000L) ||
+ OPENSSL_VERSION_NUMBER >= 0x0090804fL)
return (0);
printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
OPENSSL_VERSION_NUMBER);
- printf("Require OPENSSL_VERSION_NUMBER 0x0090581f or greater\n\n");
+ printf("Require OPENSSL_VERSION_NUMBER 0x009070cf or greater (0.9.7l)\n"
+ "Require OPENSSL_VERSION_NUMBER 0x0090804f or greater (0.9.8d)\n\n");
return (1);
}
-],
+ ],
[AC_MSG_RESULT(ok)],
[AC_MSG_RESULT(not compatible)
- AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)],
+ OPENSSL_WARNING=yes
+ ],
[AC_MSG_RESULT(assuming target platform has compatible version)])
- ,
- AC_MSG_RESULT(did not find fixes for CERT CA-2002-23)
- AC_MSG_CHECKING(OpenSSL library version)
- AC_TRY_RUN([
-#include <stdio.h>
-#include <openssl/opensslv.h>
-int main() {
- if ((OPENSSL_VERSION_NUMBER >= 0x0090605fL &&
- OPENSSL_VERSION_NUMBER < 0x009070000L) ||
- OPENSSL_VERSION_NUMBER >= 0x00907003L)
- return (0);
- printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
- OPENSSL_VERSION_NUMBER);
- printf("Require OPENSSL_VERSION_NUMBER 0x0090605f or greater (0.9.6e)\n"
- "Require OPENSSL_VERSION_NUMBER 0x00907003 or greater (0.9.7-beta2)\n\n");
- return (1);
-}
-],
- [AC_MSG_RESULT(ok)],
- [AC_MSG_RESULT(not compatible)
- AC_MSG_ERROR(you need OpenSSL 0.9.6e/0.9.7-beta2 (or newer): CERT CA-2002-23)],
- [AC_MSG_RESULT(assuming target platform has compatible version)]))
+;;
+no)
+ AC_MSG_RESULT(Skipped OpenSSL version check)
+;;
+esac
+
AC_MSG_CHECKING(for OpenSSL DSA support)
if test -f $use_openssl/include/openssl/dsa.h
then
@@ -2116,6 +2104,30 @@
)
chmod a+x isc-config.sh
+if test "X$OPENSSL_WARNING" != "X"; then
+cat << \EOF
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING
+WARNING Your OpenSSL crypto library may be vulnerable to WARNING
+WARNING one or more of the the following known security WARNING
+WARNING flaws: WARNING
+WARNING WARNING
+WARNING CAN-2002-0659, CAN-2006-4339, CVE-2006-2937 and WARNING
+WARNING CVE-2006-2940. WARNING
+WARNING WARNING
+WARNING It is recommended that you upgrade to OpenSSL WARNING
+WARNING version 0.9.8d/0.9.7l (or greater). WARNING
+WARNING WARNING
+WARNING You can disable this warning by specifying: WARNING
+WARNING WARNING
+WARNING --disable-openssl-version-check WARNING
+WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+EOF
+fi
+
# Tell Emacs to edit this file in shell mode.
# Local Variables:
# mode: sh
==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.1.4.1 2004/12/09 04:07:18 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.1.4.1.10.5 2006/10/11 03:58:50 marka Exp $
*/
#ifdef OPENSSL
@@ -39,7 +39,23 @@
#include <openssl/err.h>
#include <openssl/objects.h>
#include <openssl/rsa.h>
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+#include <openssl/bn.h>
+#endif
+
+/*
+ * We don't use configure for windows so enforce the OpenSSL version
+ * here. Unlike with configure we don't support overriding this test.
+ */
+#ifdef WIN32
+#if !((OPENSSL_VERSION_NUMBER >= 0x009070cfL && \
+ OPENSSL_VERSION_NUMBER < 0x009080000L) || \
+ OPENSSL_VERSION_NUMBER >= 0x0090804fL)
+#error Please upgrade OpenSSL to 0.9.8d/0.9.7l or greater.
+#endif
+#endif
+
/*
* XXXMPA Temporarially disable RSA_BLINDING as it requires
* good quality random data that cannot currently be guarenteed.
@@ -260,13 +276,47 @@
static isc_result_t
opensslrsa_generate(dst_key_t *key, int exp) {
+#if OPENSSL_VERSION_NUMBER > 0x00908000L
+ BN_GENCB cb;
+ RSA *rsa = RSA_new();
+ BIGNUM *e = BN_new();
+
+ if (rsa == NULL || e == NULL)
+ goto err;
+
+ if (exp == 0) {
+ /* RSA_F4 0x10001 */
+ BN_set_bit(e, 0);
+ BN_set_bit(e, 16);
+ } else {
+ /* F5 0x100000001 */
+ BN_set_bit(e, 0);
+ BN_set_bit(e, 32);
+ }
+
+ BN_GENCB_set_old(&cb, NULL, NULL);
+
+ if (RSA_generate_key_ex(rsa, key->key_size, e, &cb)) {
+ BN_free(e);
+ SET_FLAGS(rsa);
+ key->opaque = rsa;
+ return (ISC_R_SUCCESS);
+ }
+
+ err:
+ if (e != NULL)
+ BN_free(e);
+ if (rsa != NULL)
+ RSA_free(rsa);
+ return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
+#else
RSA *rsa;
unsigned long e;
if (exp == 0)
- e = RSA_3;
+ e = RSA_F4;
else
- e = RSA_F4;
+ e = 0x40000003;
rsa = RSA_generate_key(key->key_size, e, NULL, NULL);
if (rsa == NULL)
return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
@@ -274,6 +324,7 @@
key->opaque = rsa;
return (ISC_R_SUCCESS);
+#endif
}
static isc_boolean_t
==== //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#6 (text+ko) ====
@@ -1,5 +1,5 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the trustedbsd-cvs
mailing list