Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jul 2009 07:27:35 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 166252 for review
Message-ID:  <200907190727.n6J7RZpE001391@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=166252

Change 166252 by mav@mav_mavbook on 2009/07/19 07:26:37

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/Makefile.inc1#6 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#9 integrate
.. //depot/projects/scottl-camlock/src/UPDATING#10 integrate
.. //depot/projects/scottl-camlock/src/contrib/amd/amd/get_args.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#5 integrate
.. //depot/projects/scottl-camlock/src/contrib/ntp/scripts/mkver.in#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/NEWS#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/VERSION#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/config/config.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/configure#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/configure.ac#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/etc/audit_event#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_control.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_token.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/man/audit_control.5#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/sys/bsm/audit.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/sh/makeinfo.sh#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcpdump/ieee802_11.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcpdump/ieee802_11_radio.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcpdump/print-802_11.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/Fixes#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/Imakefile#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/Makefile.ADMIN#2 delete
.. //depot/projects/scottl-camlock/src/contrib/tcsh/Makefile.in#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/README#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/RELEASE-PROCEDURE#2 delete
.. //depot/projects/scottl-camlock/src/contrib/tcsh/complete.tcsh#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/config.guess#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/config.h.in#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/config.rpath#1 branch
.. //depot/projects/scottl-camlock/src/contrib/tcsh/config.sub#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/config_f.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/configure#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/configure.in#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.chared.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.decls.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.inputl.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.screen.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.term.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ed.xmap.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/glob.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/host.defs#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/ma.setp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/patchlevel.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.char.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.char.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.decls.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.dir.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.dol.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.err.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.exec.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.exp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.file.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.func.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.glob.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.lex.c#4 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.proc.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.proc.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.sem.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/sh.set.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/snames.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.bind.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.const.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.decls.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.func.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.os.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.sig.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tc.str.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tcsh.man#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tw.color.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tw.comp.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/tcsh/tw.parse.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/scottl-camlock/src/etc/ntp.conf#2 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/etc/pam.d/gdm#3 delete
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#5 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/gnu/lib/libssp/libssp_nonshared/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/include/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/include/dlfcn.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/dlopen.3#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/ftok.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/msgctl.3#4 delete
.. //depot/projects/scottl-camlock/src/lib/libc/gen/msgget.3#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/gen/msgrcv.3#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/gen/msgsnd.3#2 delete
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/Makefile.inc#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/fread.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/fwrite.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/Makefile.inc#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#8 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/msgctl.2#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/sys/msgget.2#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/sys/msgrcv.2#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/sys/msgsnd.2#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/sys/stack_protector.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libcam/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libdwarf/dwarf_loc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/map_object.c#4 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#6 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#13 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifmedia.c#4 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libcrypto/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/aac.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ath.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ieee80211.4#3 delete
.. //depot/projects/scottl-camlock/src/share/man/man4/mwl.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/net80211.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/pcm.4#8 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ral.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/wlan.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.lib.mk#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#25 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#4 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/bsm/audit_kevents.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#93 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/sig.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_sockio.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#32 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#39 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#9 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#28 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_subr.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/rdma_cma.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_expr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_sym.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_variables.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/db_variables.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ddb/ddb.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/advansys/advlib.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ciss/cissvar.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ipw/if_ipw.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfivar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlxvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mwl/if_mwl.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2560.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ral/rt2661.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/feeder_rate.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_busdma.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#24 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_bus.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_poll.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_prot.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_synch.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sysctl.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_uuid.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_vimage.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/link_elf.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_domain.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pmap.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#31 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bridgestp.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net/flowtable.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_clone.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_faith.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gif.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_gre.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_media.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_mib.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_spppsubr.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_stf.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/net/raw_cb.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/net/raw_cb.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/raw_usrreq.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net/vnet.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/vnet.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/_ieee80211.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ddb.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_freebsd.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_node.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_var.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/atm/ng_atm.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/netgraph.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_base.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ether.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_gif.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/icmp6.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/icmp_var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_gif.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_rmx.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_var.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_hostcache.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_offload.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_offload.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_reass.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_sack.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_subr.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timer.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_timewait.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/udp_usrreq.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/udp_var.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/vinet.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/netinet6/dest6.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/frag6.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_gif.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_mcast.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_rmx.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_var.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_forward.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_ipsec.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_mroute.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/route6.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/scope6.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/tcp6_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/udp6_usrreq.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/vinet6.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/netipsec/ah_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/esp_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipcomp_var.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipip_var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec6.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_input.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_mbuf.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/ipsec_output.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key_debug.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/key_debug.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/keysock.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/keysock.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/vipsec.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ah.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_esp.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipcomp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_ipip.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netipsec/xform_tcp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_diskless.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#19 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/clnt_rc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_errno.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/pmap.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/vm.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/pcpu.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sleepqueue.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ucred.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/vimage.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/device_pager.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_phys.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_phys.h#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/poll/4/pipepoll.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/4/pipeselect.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/7/pipepoll.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/7/pipeselect.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/Readme#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/l/pipepoll.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/l/pipeselect.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/m/pipepoll.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/m/pipeselect.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/n/pipepoll.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/n/pipeselect.out#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/pipepoll.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/poll/pipeselect.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/G2348#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/G2358#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/config#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/common#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/config.mesh#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/setup.simple#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/topology.line#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/topology.ring#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/topology.star#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/scripts/mesh/topology.tree#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/vimage/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/vimage/vimage.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/mkioctls#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mklocale/yacc.y#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wlandebug/wlandebug.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/hostapd/hostapd.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/hostapd/hostapd.conf.5#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/hostapd_cli/hostapd_cli.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_cli/wpa_cli.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/Makefile.inc1#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.627 2009/06/29 01:33:59 kan Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1069,7 +1069,7 @@
 #
 # static libgcc.a prerequisite for shared libc
 #
-_prereq_libs= gnu/lib/libgcc
+_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc
 
 # These dependencies are not automatically generated:
 #

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.199 2009/07/01 07:37:21 dfr Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.202 2009/07/18 16:33:27 marcus Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,17 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090718: the gdm pam.d file is no longer required.
+OLD_FILES+=etc/pam.d/gdm
+# 20090713: vimage container structs removed.
+OLD_FILES+=usr/include/netinet/vinet.h
+OLD_FILES+=usr/include/netinet6/vinet6.h
+OLD_FILES+=usr/include/netipsec/vipsec.h
+# 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
+OLD_FILES+=usr/share/man/man3/msgctl.3.gz
+OLD_FILES+=usr/share/man/man3/msgget.3.gz
+OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
+OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)

==== //depot/projects/scottl-camlock/src/UPDATING#10 (text+ko) ====

@@ -22,6 +22,25 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090714:
+	Due to changes in the implementation of virtual network stack
+	support, all network-related kernel modules must be recompiled.
+	As this change breaks the ABI, bump __FreeBSD_version to 800104.
+
+20090713:
+	The TOE interface to the TCP syncache has been modified to remove struct
+	tcpopt (<netinet/tcp_var.h>) from the ABI of the network stack.  The
+	cxgb driver is the only TOE consumer affected by this change, and needs
+	to be recompiled along with the kernel. As this change breaks the ABI,
+	bump __FreeBSD_version to 800103.
+
+20090712:
+	Padding has been added to struct tcpcb, sackhint and tcpstat in
+	<netinet/tcp_var.h> to facilitate future MFCs and bug fixes whilst
+	maintainig the ABI. However, this change breaks the ABI, so bump
+	__FreeBSD_version to 800102. User space tools that rely on the size of
+	any of these structs (e.g. sockstat) need to be recompiled.
+
 20090630:
 	The NFS_LEGACYRPC option has been removed along with the old
 	kernel RPC implementation that this option selected. Kernel
@@ -1641,4 +1660,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.627 2009/07/01 18:12:50 dfr Exp $
+$FreeBSD: src/UPDATING,v 1.630 2009/07/14 22:48:30 rwatson Exp $

==== //depot/projects/scottl-camlock/src/contrib/amd/amd/get_args.c#3 (text+ko) ====

@@ -96,8 +96,8 @@
   xsnprintf(tmpbuf, sizeof(tmpbuf), "Configured by %s@%s on date %s.\n",
 	    USER_NAME, HOST_NAME, CONFIG_DATE);
   strlcat(vers, tmpbuf, len);
-  xsnprintf(tmpbuf, sizeof(tmpbuf), "Built by %s@%s on date %s.\n",
-	    BUILD_USER, BUILD_HOST, BUILD_DATE);
+  xsnprintf(tmpbuf, sizeof(tmpbuf), "Built by %s@%s.\n",
+	    BUILD_USER, BUILD_HOST);
   strlcat(vers, tmpbuf, len);
   xsnprintf(tmpbuf, sizeof(tmpbuf), "cpu=%s (%s-endian), arch=%s, karch=%s.\n",
 	    cpu, endian, gopt.arch, gopt.karch);

==== //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#3 (text+ko) ====

@@ -18,7 +18,7 @@
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.25 2008/09/01 22:22:44 obrien Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.26 2009/07/14 21:19:13 kan Exp $ */
 
 /* Common FreeBSD configuration. 
    All FreeBSD architectures should include this file, which will specify
@@ -168,6 +168,7 @@
     %{pg:  %{pthread:-lpthread_p} -lc_p}}				\
   %{shared:								\
     %{pthread:-lpthread} -lc}						\
+  %{fstack-protector|fstack-protector-all:-lssp_nonshared}		\
   "
 #endif
 #endif

==== //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#5 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.13 2009/05/29 07:18:31 delphij Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.14 2009/07/11 17:35:55 cperciva Exp $
 .\"
-.Dd $Mdocdate: May 6 2008 $
+.Dd May 6 2008
 .Dt NC 1
 .Os
 .Sh NAME

==== //depot/projects/scottl-camlock/src/contrib/ntp/scripts/mkver.in#3 (text+ko) ====

@@ -17,8 +17,6 @@
  *) ConfStr="${ConfStr}-?" ;;
 esac
 
-ConfStr="$ConfStr `LC_TIME=C TZ= date`"
-
 if [ ! -f .version ]; then
   echo 0 > .version
 fi

==== //depot/projects/scottl-camlock/src/contrib/openbsm/NEWS#2 (text) ====

@@ -1,5 +1,14 @@
 OpenBSM Version History
 
+OpenBSM 1.1p1
+
+- Fixes to AUT_SOCKUNIX token parsing.
+- IPv6 support for au_to_me(3).
+- Improved robustness in the parsing of audit_control, especially long
+  flags/naflags strings and whitespace in all fields.
+- Add missing conversion of a number of FreeBSD/Mac OS X errnos to/from BSM
+  error number space.
+
 OpenBSM 1.1
 
 - Change auditon(2) parameters and data structures to be 32/64-bit architecture
@@ -449,4 +458,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#40 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#42 $

==== //depot/projects/scottl-camlock/src/contrib/openbsm/VERSION#3 (text) ====

@@ -1,1 +1,1 @@
-OPENBSM_1_1
+OPENBSM_1_1p1

==== //depot/projects/scottl-camlock/src/contrib/openbsm/config/config.h#3 (text) ====

@@ -1,15 +1,14 @@
 /* config/config.h.  Generated from config.h.in by configure.  */
 /* config/config.h.in.  Generated from configure.ac by autoheader.  */
-/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.10 2009/03/03 11:57:29 rwatson Exp $ */
 
 /* Define to 1 if you have the `alarm' function. */
 #define HAVE_ALARM 1
 
 /* Define if audit system calls present */
-#define HAVE_AUDIT_SYSCALLS 
+#define HAVE_AUDIT_SYSCALLS /**/
 
 /* Define if be32enc is present */
-#define HAVE_BE32ENC 
+#define HAVE_BE32ENC /**/
 
 /* Define to 1 if you have the `bzero' function. */
 #define HAVE_BZERO 1
@@ -33,7 +32,7 @@
 #define HAVE_FTRUNCATE 1
 
 /* Define if queue.h includes LIST_FIRST */
-#define HAVE_FULL_QUEUE_H 
+#define HAVE_FULL_QUEUE_H /**/
 
 /* Define to 1 if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY 1
@@ -153,7 +152,7 @@
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */
-/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 
 /* Name of package */
 #define PACKAGE "OpenBSM"
@@ -165,13 +164,13 @@
 #define PACKAGE_NAME "OpenBSM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.1beta1"
+#define PACKAGE_STRING "OpenBSM 1.1p1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openbsm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1beta1"
+#define PACKAGE_VERSION "1.1p1"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -189,10 +188,13 @@
 /* #undef USE_MACH_IPC */
 
 /* Define to use native include files */
-#define USE_NATIVE_INCLUDES 
+#define USE_NATIVE_INCLUDES /**/
 
 /* Version number of package */
-#define VERSION "1.1beta1"
+#define VERSION "1.1p1"
+
+/* Use extended API on platforms that require it */
+#define _GNU_SOURCE /**/
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

==== //depot/projects/scottl-camlock/src/contrib/openbsm/configure#3 (text) ====

@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#51 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#52 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for OpenBSM 1.1.
+# Generated by GNU Autoconf 2.62 for OpenBSM 1.1p1.
 #
 # Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
 #
@@ -751,8 +751,8 @@
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='OpenBSM 1.1'
+PACKAGE_VERSION='1.1p1'
+PACKAGE_STRING='OpenBSM 1.1p1'
 PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
 
 ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -1492,7 +1492,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenBSM 1.1 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.1p1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1562,7 +1562,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenBSM 1.1:";;
+     short | recursive ) echo "Configuration of OpenBSM 1.1p1:";;
    esac
   cat <<\_ACEOF
 
@@ -1671,7 +1671,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.1
+OpenBSM configure 1.1p1
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1685,7 +1685,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenBSM $as_me 1.1, which was
+It was created by OpenBSM $as_me 1.1p1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -19662,7 +19662,7 @@
 
 # Define the identity of the package.
  PACKAGE=OpenBSM
- VERSION=1.1
+ VERSION=1.1p1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24400,7 +24400,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenBSM $as_me 1.1, which was
+This file was extended by OpenBSM $as_me 1.1p1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24453,7 +24453,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-OpenBSM config.status 1.1
+OpenBSM config.status 1.1p1
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

==== //depot/projects/scottl-camlock/src/contrib/openbsm/configure.ac#3 (text) ====

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.1], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#52 $])
+AC_INIT([OpenBSM], [1.1p1], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#53 $])
 AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADER([config/config.h])

==== //depot/projects/scottl-camlock/src/contrib/openbsm/etc/audit_event#3 (text) ====

@@ -1,6 +1,6 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#39 $
-# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.13 2009/04/19 16:17:13 rwatson Exp $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#40 $
+# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.14 2009/07/17 14:02:20 rwatson Exp $
 #
 # The mapping between event identifiers and values is also hard-coded in
 # audit_kevents.h and audit_uevents.h, so changes must occur in both places,
@@ -556,6 +556,7 @@
 43193:AUE_PWRITE:pwrite(2):no
 43194:AUE_FSCTL:fsctl():fm
 43195:AUE_FFSCTL:ffsctl():fm
+43196:AUE_LPATHCONF:lpathconf(2):fa
 #
 # Solaris userspace events.
 #

==== //depot/projects/scottl-camlock/src/contrib/openbsm/libauditd/auditd_lib.c#2 (text) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#11 $
  */
 
 #include <sys/param.h>
@@ -130,7 +130,7 @@
 
 #define MAXERRCODE (sizeof(auditd_errmsg) / sizeof(auditd_errmsg[0]))
 
-#define NA_EVENT_STR_SIZE       25
+#define NA_EVENT_STR_SIZE       128
 #define POL_STR_SIZE            128
 
 

==== //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_control.c#3 (text) ====

@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#33 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#34 $
  */
 
 #include <config/config.h>
@@ -121,9 +121,13 @@
 		if (linestr[0] == '#')
 			continue;
 
-		/* Remove trailing new line character. */
-		if ((nl = strrchr(linestr, '\n')) != NULL)
+		/* Remove trailing new line character and white space. */
+		nl = strchr(linestr, '\0') - 1;
+		while (nl >= linestr && ('\n' == *nl || ' ' == *nl ||
+			'\t' == *nl)) {
 			*nl = '\0';
+			nl--;
+		}
 
 		tokptr = linestr;
 		if ((type = strtok_r(tokptr, delim, &last)) != NULL) {

==== //depot/projects/scottl-camlock/src/contrib/openbsm/libbsm/bsm_errno.c#2 (text) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. 
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#17 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#19 $
  */
 
 #include <sys/types.h>
@@ -453,6 +453,104 @@
 	{ BSM_ERRNO_EINPROGRESS, EINPROGRESS,
 	    ES("Operation now in progress") },
 	{ BSM_ERRNO_ESTALE, ESTALE, ES("Stale NFS file handle") },
+	{ BSM_ERRNO_EPROCLIM,
+#ifdef EPROCLIM
+	EPROCLIM,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("Too many processes") },
+	{ BSM_ERRNO_EBADRPC,
+#ifdef EBADRPC
+	EBADRPC,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("RPC struct is bad") },
+	{ BSM_ERRNO_ERPCMISMATCH,
+#ifdef ERPCMISMATCH
+	ERPCMISMATCH,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("RPC version wrong") },
+	{ BSM_ERRNO_EPROGUNAVAIL,
+#ifdef EPROGUNAVAIL
+	EPROGUNAVAIL,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("RPC prog. not avail") },
+	{ BSM_ERRNO_EPROGMISMATCH,
+#ifdef EPROGMISMATCH
+	EPROGMISMATCH,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("RPC version wrong") },
+	{ BSM_ERRNO_EPROCUNAVAIL,
+#ifdef EPROCUNAVAIL
+	EPROCUNAVAIL,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("Bad procedure for program") },
+	{ BSM_ERRNO_EFTYPE,
+#ifdef EFTYPE
+	EFTYPE,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("Inappropriate file type or format") },
+	{ BSM_ERRNO_EAUTH,
+#ifdef EAUTH
+	EAUTH,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif
+	ES("Authenticateion error") },
+	{ BSM_ERRNO_ENEEDAUTH,
+#ifdef ENEEDAUTH
+	ENEEDAUTH,
+#else
+	ERRNO_NO_LOCAL_MAPPING,
+#endif

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907190727.n6J7RZpE001391>