PERFORCE change 128783 for review
Peter Wemm
peter at FreeBSD.org
Wed Nov 7 11:49:25 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=128783
Change 128783 by peter at peter_overcee on 2007/11/07 19:48:54
IFC @128780
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#127 integrate
.. //depot/projects/hammer/ObsoleteFiles.inc#38 integrate
.. //depot/projects/hammer/bin/mv/mv.1#7 integrate
.. //depot/projects/hammer/bin/ps/extern.h#11 integrate
.. //depot/projects/hammer/bin/ps/keyword.c#18 integrate
.. //depot/projects/hammer/bin/ps/print.c#17 integrate
.. //depot/projects/hammer/bin/ps/ps.c#21 integrate
.. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#8 integrate
.. //depot/projects/hammer/contrib/libreadline/complete.c#8 integrate
.. //depot/projects/hammer/contrib/libreadline/display.c#9 integrate
.. //depot/projects/hammer/contrib/libreadline/input.c#6 integrate
.. //depot/projects/hammer/contrib/libreadline/isearch.c#5 integrate
.. //depot/projects/hammer/contrib/libreadline/misc.c#5 integrate
.. //depot/projects/hammer/contrib/libreadline/readline.c#7 integrate
.. //depot/projects/hammer/contrib/libreadline/text.c#5 integrate
.. //depot/projects/hammer/contrib/libreadline/vi_mode.c#8 integrate
.. //depot/projects/hammer/contrib/openbsm/HISTORY#6 integrate
.. //depot/projects/hammer/contrib/openbsm/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openbsm/VERSION#6 integrate
.. //depot/projects/hammer/contrib/openbsm/aclocal.m4#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/audit/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/auditd/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/praudit/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/bin/praudit/praudit.c#3 integrate
.. //depot/projects/hammer/contrib/openbsm/bsm/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openbsm/config/config.h#6 integrate
.. //depot/projects/hammer/contrib/openbsm/config/config.h.in#4 integrate
.. //depot/projects/hammer/contrib/openbsm/config/ltmain.sh#3 integrate
.. //depot/projects/hammer/contrib/openbsm/configure#6 integrate
.. //depot/projects/hammer/contrib/openbsm/configure.ac#6 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_class#3 integrate
.. //depot/projects/hammer/contrib/openbsm/etc/audit_event#7 integrate
.. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_event.c#3 integrate
.. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#6 integrate
.. //depot/projects/hammer/contrib/openbsm/man/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/modules/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/test/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/test/bsm/Makefile.in#2 integrate
.. //depot/projects/hammer/contrib/openbsm/tools/Makefile.in#3 integrate
.. //depot/projects/hammer/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#17 integrate
.. //depot/projects/hammer/contrib/sendmail/INSTALL#2 integrate
.. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#14 integrate
.. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#14 integrate
.. //depot/projects/hammer/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate
.. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#12 integrate
.. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#14 integrate
.. //depot/projects/hammer/contrib/sendmail/contrib/buildvirtuser#4 integrate
.. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#11 integrate
.. //depot/projects/hammer/contrib/sendmail/editmap/editmap.c#3 integrate
.. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#12 integrate
.. //depot/projects/hammer/contrib/sendmail/include/sm/ldap.h#5 integrate
.. //depot/projects/hammer/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#11 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#11 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/main.c#7 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/hammer/contrib/sendmail/libmilter/smfi.c#6 integrate
.. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#10 integrate
.. //depot/projects/hammer/contrib/sendmail/libsm/mpeix.c#2 integrate
.. //depot/projects/hammer/contrib/sendmail/makemap/makemap.c#6 integrate
.. //depot/projects/hammer/contrib/sendmail/praliases/praliases.c#4 integrate
.. //depot/projects/hammer/contrib/sendmail/src/Makefile.m4#6 integrate
.. //depot/projects/hammer/contrib/sendmail/src/conf.c#14 integrate
.. //depot/projects/hammer/contrib/sendmail/src/deliver.c#13 integrate
.. //depot/projects/hammer/contrib/sendmail/src/envelope.c#8 integrate
.. //depot/projects/hammer/contrib/sendmail/src/headers.c#13 integrate
.. //depot/projects/hammer/contrib/sendmail/src/macro.c#4 integrate
.. //depot/projects/hammer/contrib/sendmail/src/main.c#12 integrate
.. //depot/projects/hammer/contrib/sendmail/src/map.c#11 integrate
.. //depot/projects/hammer/contrib/sendmail/src/milter.c#12 integrate
.. //depot/projects/hammer/contrib/sendmail/src/mime.c#9 integrate
.. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#12 integrate
.. //depot/projects/hammer/contrib/sendmail/src/queue.c#14 integrate
.. //depot/projects/hammer/contrib/sendmail/src/readcf.c#11 integrate
.. //depot/projects/hammer/contrib/sendmail/src/recipient.c#8 integrate
.. //depot/projects/hammer/contrib/sendmail/src/sendmail.8#6 integrate
.. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#13 integrate
.. //depot/projects/hammer/contrib/sendmail/src/sm_resolve.c#6 integrate
.. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#14 integrate
.. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#11 integrate
.. //depot/projects/hammer/contrib/sendmail/src/util.c#10 integrate
.. //depot/projects/hammer/contrib/sendmail/src/version.c#14 integrate
.. //depot/projects/hammer/contrib/sendmail/vacation/vacation.c#7 integrate
.. //depot/projects/hammer/etc/Makefile#59 integrate
.. //depot/projects/hammer/etc/namedb/named.root#5 integrate
.. //depot/projects/hammer/etc/network.subr#20 integrate
.. //depot/projects/hammer/etc/sendmail/freebsd.mc#10 integrate
.. //depot/projects/hammer/etc/sendmail/freebsd.submit.mc#6 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#70 integrate
.. //depot/projects/hammer/games/fortune/fortune/fortune.6#4 integrate
.. //depot/projects/hammer/games/fortune/fortune/fortune.c#7 integrate
.. //depot/projects/hammer/include/_ctype.h#4 integrate
.. //depot/projects/hammer/include/pthread.h#13 integrate
.. //depot/projects/hammer/include/pthread_np.h#5 integrate
.. //depot/projects/hammer/lib/Makefile#64 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#13 integrate
.. //depot/projects/hammer/lib/libc/gen/valloc.3#6 integrate
.. //depot/projects/hammer/lib/libc/locale/mblocal.h#6 integrate
.. //depot/projects/hammer/lib/libc/net/ethers.3#6 integrate
.. //depot/projects/hammer/lib/libc/sys/minherit.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/sctp_peeloff.2#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_acquire_cred.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_add_cred.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_add_oid_set_member.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_canonicalize_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_compare_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_context_time.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_create_empty_oid_set.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_delete_sec_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_display_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_display_status.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_duplicate_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_export_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_export_sec_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_get_mic.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_import_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_import_sec_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_context.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred_by_mech.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_mechs_for_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_names_for_mech.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_process_context_token.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_buffer.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_cred.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_name.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_oid_set.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_test_oid_set_member.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_unwrap.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_verify_mic.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_wrap.3#3 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_wrap_size_limit.3#3 integrate
.. //depot/projects/hammer/lib/libkse/thread/thr_mutex.c#2 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#37 integrate
.. //depot/projects/hammer/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#4 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#27 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#34 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#36 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#6 integrate
.. //depot/projects/hammer/libexec/Makefile#33 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate
.. //depot/projects/hammer/release/scripts/package-split.py#9 integrate
.. //depot/projects/hammer/rescue/rescue/Makefile#35 integrate
.. //depot/projects/hammer/sbin/geom/Makefile#2 integrate
.. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.c#19 integrate
.. //depot/projects/hammer/sbin/gpt/boot.c#2 integrate
.. //depot/projects/hammer/sbin/gpt/gpt.c#13 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifbridge.c#7 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#46 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#31 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#60 integrate
.. //depot/projects/hammer/sbin/rcorder/ealloc.c#2 integrate
.. //depot/projects/hammer/sbin/rcorder/ealloc.h#2 integrate
.. //depot/projects/hammer/sbin/rcorder/hash.c#2 integrate
.. //depot/projects/hammer/sbin/rcorder/hash.h#2 integrate
.. //depot/projects/hammer/sbin/rcorder/rcorder.c#6 integrate
.. //depot/projects/hammer/sbin/route/route.8#12 integrate
.. //depot/projects/hammer/sbin/route/route.c#13 integrate
.. //depot/projects/hammer/sbin/setkey/parse.y#4 integrate
.. //depot/projects/hammer/sbin/setkey/setkey.c#3 integrate
.. //depot/projects/hammer/sbin/setkey/test-pfkey.c#3 integrate
.. //depot/projects/hammer/sbin/setkey/token.l#4 integrate
.. //depot/projects/hammer/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/hammer/share/man/man3/queue.3#10 integrate
.. //depot/projects/hammer/share/man/man4/mac.4#7 integrate
.. //depot/projects/hammer/share/man/man4/md.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ng_car.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#13 integrate
.. //depot/projects/hammer/share/man/man4/nxge.4#2 integrate
.. //depot/projects/hammer/share/man/man5/bluetooth.device.conf.5#3 integrate
.. //depot/projects/hammer/share/man/man5/quota.user.5#4 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#83 integrate
.. //depot/projects/hammer/share/man/man5/xfs.5#2 integrate
.. //depot/projects/hammer/share/man/man8/rc.subr.8#12 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#72 integrate
.. //depot/projects/hammer/share/man/man9/kproc.9#2 integrate
.. //depot/projects/hammer/share/man/man9/kthread.9#7 integrate
.. //depot/projects/hammer/share/man/man9/uio.9#8 integrate
.. //depot/projects/hammer/share/misc/bsd-family-tree#39 integrate
.. //depot/projects/hammer/share/misc/committers-doc.dot#3 integrate
.. //depot/projects/hammer/share/misc/committers-ports.dot#7 integrate
.. //depot/projects/hammer/share/misc/pci_vendors#16 integrate
.. //depot/projects/hammer/share/mk/sys.mk#25 integrate
.. //depot/projects/hammer/share/zoneinfo/asia#12 integrate
.. //depot/projects/hammer/share/zoneinfo/northamerica#12 integrate
.. //depot/projects/hammer/share/zoneinfo/pacificnew#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#78 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#161 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#43 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#164 integrate
.. //depot/projects/hammer/sys/amd64/conf/DEFAULTS#9 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#103 integrate
.. //depot/projects/hammer/sys/amd64/include/pc/bios.h#3 integrate
.. //depot/projects/hammer/sys/arm/arm/cpufunc.c#15 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#43 integrate
.. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#10 integrate
.. //depot/projects/hammer/sys/arm/at91/ohci_atmelarm.c#4 integrate
.. //depot/projects/hammer/sys/arm/include/cpuconf.h#8 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#12 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#22 integrate
.. //depot/projects/hammer/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate
.. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#5 integrate
.. //depot/projects/hammer/sys/boot/arm/at91/boot2/boot2.c#6 integrate
.. //depot/projects/hammer/sys/boot/common/ufsread.c#8 integrate
.. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#21 integrate
.. //depot/projects/hammer/sys/boot/i386/gptboot/Makefile#2 integrate
.. //depot/projects/hammer/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosmem.c#5 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#12 integrate
.. //depot/projects/hammer/sys/bsm/audit.h#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#32 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#13 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#16 integrate
.. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#9 integrate
.. //depot/projects/hammer/sys/conf/NOTES#128 integrate
.. //depot/projects/hammer/sys/conf/files#162 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#62 integrate
.. //depot/projects/hammer/sys/conf/options.arm#13 integrate
.. //depot/projects/hammer/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/hammer/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#18 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#12 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#15 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.c#11 integrate
.. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.c#12 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#34 integrate
.. //depot/projects/hammer/sys/ddb/db_examine.c#6 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#41 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_cam.c#19 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#39 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#25 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#36 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#81 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#43 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#38 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#11 integrate
.. //depot/projects/hammer/sys/dev/ciss/ciss.c#47 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#20 integrate
.. //depot/projects/hammer/sys/dev/mii/e1000phy.c#11 integrate
.. //depot/projects/hammer/sys/dev/mii/e1000phyreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/hammer/sys/dev/mii/miidevs#19 integrate
.. //depot/projects/hammer/sys/dev/mii/rgephy.c#8 integrate
.. //depot/projects/hammer/sys/dev/mii/rgephyreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/mpt/mpt.c#22 integrate
.. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#7 integrate
.. //depot/projects/hammer/sys/dev/nxge/if_nxge.c#4 integrate
.. //depot/projects/hammer/sys/dev/nxge/if_nxge.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/build-version.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/version.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xge-debug.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xge-defs.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xge-list.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xge-os-pal.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xge-os-template.h#2 delete
.. //depot/projects/hammer/sys/dev/nxge/include/xge-queue.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-channel.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-config.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-device.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-driver.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-event.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-fifo.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mm.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-regs.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-ring.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-stats.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal-types.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/include/xgehal.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xge-osdep.h#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xge-queue.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate
.. //depot/projects/hammer/sys/dev/nxge/xgell-version.h#2 integrate
.. //depot/projects/hammer/sys/dev/ral/rt2560.c#11 integrate
.. //depot/projects/hammer/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/hammer/sys/dev/safe/safe.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#14 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/atiixp.h#4 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#28 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/ac97_patch.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/if_rum.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/if_ural.c#26 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zydfw.h#2 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#21 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#89 integrate
.. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/hammer/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/hammer/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#14 integrate
.. //depot/projects/hammer/sys/i386/conf/DEFAULTS#9 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#93 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#24 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#79 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#97 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#14 integrate
.. //depot/projects/hammer/sys/i386/include/pc/bios.h#6 integrate
.. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#64 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#62 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#17 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#42 integrate
.. //depot/projects/hammer/sys/kern/imgact_gzip.c#10 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#48 integrate
.. //depot/projects/hammer/sys/kern/kern_cpu.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#73 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#69 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#66 integrate
.. //depot/projects/hammer/sys/kern/kern_idle.c#21 integrate
.. //depot/projects/hammer/sys/kern/kern_intr.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#38 integrate
.. //depot/projects/hammer/sys/kern/kern_kthread.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#60 integrate
.. //depot/projects/hammer/sys/kern/kern_shutdown.c#47 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#83 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#39 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#99 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#53 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#83 integrate
.. //depot/projects/hammer/sys/modules/Makefile#117 integrate
.. //depot/projects/hammer/sys/modules/geom/Makefile#16 integrate
.. //depot/projects/hammer/sys/modules/nxge/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/hammer/sys/net/if_bridge.c#38 integrate
.. //depot/projects/hammer/sys/net/if_bridgevar.h#13 integrate
.. //depot/projects/hammer/sys/net/if_disc.c#23 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#69 integrate
.. //depot/projects/hammer/sys/net/if_loop.c#31 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.h#14 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#14 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#13 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ht.h#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#40 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#35 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#20 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.c#43 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.h#25 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_output.c#32 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#31 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#19 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan_ap.c#2 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_var.h#31 integrate
.. //depot/projects/hammer/sys/netatalk/aarp.c#21 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#20 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#19 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#50 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#40 integrate
.. //depot/projects/hammer/sys/netinet/igmp.c#15 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#44 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.h#17 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#89 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#18 integrate
.. //depot/projects/hammer/sys/netinet/ip_icmp.c#38 integrate
.. //depot/projects/hammer/sys/netinet/sctp_constants.h#16 integrate
.. //depot/projects/hammer/sys/netinet/sctp_output.c#18 integrate
.. //depot/projects/hammer/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/hammer/sys/netinet/sctp_pcb.h#13 integrate
.. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#18 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.c#20 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.h#12 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#34 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#50 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs.h#14 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#28 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#46 integrate
.. //depot/projects/hammer/sys/pc98/pc98/machdep.c#19 integrate
.. //depot/projects/hammer/sys/pci/agp.c#22 integrate
.. //depot/projects/hammer/sys/pci/agp_ali.c#14 integrate
.. //depot/projects/hammer/sys/pci/agp_amd.c#14 integrate
.. //depot/projects/hammer/sys/pci/agp_amd64.c#13 integrate
.. //depot/projects/hammer/sys/pci/agp_ati.c#4 integrate
.. //depot/projects/hammer/sys/pci/agp_i810.c#25 integrate
.. //depot/projects/hammer/sys/pci/agp_intel.c#20 integrate
.. //depot/projects/hammer/sys/pci/agp_nvidia.c#8 integrate
.. //depot/projects/hammer/sys/pci/agp_sis.c#18 integrate
.. //depot/projects/hammer/sys/pci/agp_via.c#20 integrate
.. //depot/projects/hammer/sys/pci/agppriv.h#5 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#46 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate
.. //depot/projects/hammer/sys/security/audit/audit.c#11 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#7 integrate
.. //depot/projects/hammer/sys/security/audit/audit_pipe.c#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#8 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet.c#6 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/hammer/sys/security/mac/mac_internal.h#13 integrate
.. //depot/projects/hammer/sys/security/mac/mac_net.c#16 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#9 integrate
.. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#45 integrate
.. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#28 integrate
.. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#14 integrate
.. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#33 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#43 integrate
.. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#14 integrate
.. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#14 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#27 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#45 integrate
.. //depot/projects/hammer/sys/sparc64/isa/isa.c#16 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#51 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#47 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/hammer/sys/sun4v/sun4v/pmap.c#4 integrate
.. //depot/projects/hammer/sys/sys/kthread.h#4 integrate
.. //depot/projects/hammer/sys/sys/proc.h#109 integrate
.. //depot/projects/hammer/sys/sys/signalvar.h#21 integrate
.. //depot/projects/hammer/sys/vm/phys_pager.c#14 integrate
.. //depot/projects/hammer/sys/vm/pmap.h#29 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#55 integrate
.. //depot/projects/hammer/sys/vm/vm_extern.h#18 integrate
.. //depot/projects/hammer/sys/vm/vm_glue.c#49 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#65 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#63 integrate
.. //depot/projects/hammer/tools/build/options/makeman#4 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/init-a.t#3 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/init.t#4 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/integrity-copy.t#3 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/integrity-data.t#3 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/integrity-hmac.t#3 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/onetime-a.t#3 integrate
.. //depot/projects/hammer/tools/regression/geom_eli/onetime.t#4 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/main.c#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/statfoo.c#2 integrate
.. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/hammer/tools/tools/nxge/Makefile#2 integrate
.. //depot/projects/hammer/tools/tools/nxge/xge_cmn.h#2 integrate
.. //depot/projects/hammer/tools/tools/nxge/xge_info.c#2 integrate
.. //depot/projects/hammer/tools/tools/nxge/xge_info.h#2 integrate
.. //depot/projects/hammer/tools/tools/nxge/xge_log.c#2 integrate
.. //depot/projects/hammer/tools/tools/nxge/xge_log.h#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#58 integrate
.. //depot/projects/hammer/usr.bin/calendar/io.c#4 integrate
.. //depot/projects/hammer/usr.bin/du/du.c#15 integrate
.. //depot/projects/hammer/usr.bin/file2c/file2c.1#5 integrate
.. //depot/projects/hammer/usr.bin/file2c/file2c.c#4 integrate
.. //depot/projects/hammer/usr.bin/fstat/Makefile#4 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#20 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.h#5 integrate
.. //depot/projects/hammer/usr.bin/fstat/zfs/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/fstat/zfs/zfs.c#1 branch
.. //depot/projects/hammer/usr.bin/lockf/lockf.1#9 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#31 integrate
.. //depot/projects/hammer/usr.bin/mklocale/ldef.h#4 integrate
.. //depot/projects/hammer/usr.bin/msgs/msgs.c#6 integrate
.. //depot/projects/hammer/usr.bin/passwd/passwd.1#9 integrate
.. //depot/projects/hammer/usr.bin/tail/read.c#5 integrate
.. //depot/projects/hammer/usr.bin/tail/reverse.c#5 integrate
.. //depot/projects/hammer/usr.bin/tail/tail.c#5 integrate
.. //depot/projects/hammer/usr.bin/tftp/tftp.1#8 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#20 integrate
.. //depot/projects/hammer/usr.bin/xstr/xstr.1#6 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/search.c#5 integrate
.. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/bootparamd.c#4 integrate
.. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/main.c#3 integrate
.. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/callbootd.c#3 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.c#6 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/cron.h#5 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/database.c#3 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/do_command.c#7 integrate
.. //depot/projects/hammer/usr.sbin/cron/cron/externs.h#2 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#7 integrate
.. //depot/projects/hammer/usr.sbin/cron/lib/entry.c#6 integrate
.. //depot/projects/hammer/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate
.. //depot/projects/hammer/usr.sbin/crunch/crunchide/crunchide.c#3 integrate
.. //depot/projects/hammer/usr.sbin/devinfo/devinfo.c#6 integrate
.. //depot/projects/hammer/usr.sbin/faithd/faithd.c#3 integrate
.. //depot/projects/hammer/usr.sbin/faithd/faithd.h#3 integrate
.. //depot/projects/hammer/usr.sbin/faithd/ftp.c#5 integrate
.. //depot/projects/hammer/usr.sbin/faithd/prefix.c#4 integrate
.. //depot/projects/hammer/usr.sbin/faithd/prefix.h#2 integrate
.. //depot/projects/hammer/usr.sbin/faithd/tcp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#14 integrate
.. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.8#5 integrate
.. //depot/projects/hammer/usr.sbin/ip6addrctl/ip6addrctl.c#4 integrate
.. //depot/projects/hammer/usr.sbin/keyserv/keyserv.c#3 integrate
.. //depot/projects/hammer/usr.sbin/keyserv/keyserv.h#4 integrate
.. //depot/projects/hammer/usr.sbin/keyserv/setkey.c#2 integrate
.. //depot/projects/hammer/usr.sbin/lpr/lpd/lpd.c#6 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#22 integrate
.. //depot/projects/hammer/usr.sbin/mtree/mtree.c#8 integrate
.. //depot/projects/hammer/usr.sbin/ndp/ndp.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pccard/pccardc/enabler.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/cap.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/pciconf.8#9 integrate
.. //depot/projects/hammer/usr.sbin/pciconf/pciconf.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#20 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/main.c#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/main.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#10 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/extern.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/gzip.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/pgp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/sign/stand.h#3 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/pathnames.h#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#12 integrate
.. //depot/projects/hammer/usr.sbin/pppd/auth.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pppd/cbcp.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ccp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/chap.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/chap.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/chap_ms.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/chap_ms.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/demand.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/eui64.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/fsm.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pppd/fsm.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ipcp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ipcp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ipv6cp.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ipv6cp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/ipxcp.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pppd/lcp.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pppd/lcp.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/magic.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/magic.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/main.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pppd/options.c#3 integrate
.. //depot/projects/hammer/usr.sbin/pppd/pppd.h#3 integrate
.. //depot/projects/hammer/usr.sbin/pppd/sys-bsd.c#6 integrate
.. //depot/projects/hammer/usr.sbin/pppd/upap.c#2 integrate
.. //depot/projects/hammer/usr.sbin/pppd/upap.h#2 integrate
.. //depot/projects/hammer/usr.sbin/pppstats/pppstats.c#2 integrate
.. //depot/projects/hammer/usr.sbin/rip6query/rip6query.c#4 integrate
.. //depot/projects/hammer/usr.sbin/route6d/route6d.c#8 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd.c#8 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate
.. //depot/projects/hammer/usr.sbin/rpc.statd/rpc.statd.8#5 integrate
.. //depot/projects/hammer/usr.sbin/rpc.statd/statd.c#7 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/check_bound.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/pmap_svc.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcb_svc.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcb_svc_4.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcb_svc_com.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.c#10 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/rpcbind.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/util.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rpcbind/warmstart.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rrenumd/lexer.l#2 integrate
.. //depot/projects/hammer/usr.sbin/rrenumd/parser.y#3 integrate
.. //depot/projects/hammer/usr.sbin/rrenumd/rrenumd.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/advcap.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/advcap.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/config.c#11 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/config.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/dump.c#3 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/dump.h#2 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/if.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/if.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/rrenum.h#2 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/rtadvd.c#7 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/rtadvd.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/timer.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtadvd/timer.h#3 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/dump.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/if.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/probe.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsock.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsol.c#4 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsold.c#5 integrate
.. //depot/projects/hammer/usr.sbin/rtsold/rtsold.h#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/config.c#27 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dmenu.c#4 integrate
.. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.c#3 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/correct.c#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/extern.h#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/master.c#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/networkdelta.c#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/slave.c#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timedc/extern.h#2 integrate
.. //depot/projects/hammer/usr.sbin/timed/timedc/timedc.c#4 integrate
.. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#12 integrate
.. //depot/projects/hammer/usr.sbin/wpa/hostapd/hostapd.8#3 integrate
.. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#11 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#127 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -159,7 +159,14 @@
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
+#
+# Avoid running mktemp(1) unless actually needed.
+# It may not be functional, e.g., due to new ABI
+# when in the middle of installing over this system.
+#
+.if make(distributeworld) || make(installworld)
INSTALLTMP!= /usr/bin/mktemp -d -u -t install
+.endif
#
# Building a world goes through the following stages
@@ -265,14 +272,16 @@
.endif
# install stage
+IMAKEENV= ${CROSSENV}
+IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
.if empty(.MAKEFLAGS:M-n)
-IMAKEENV= ${CROSSENV} \
- PATH=${STRICTTMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
+ LD_LIBRARY_PATH=${INSTALLTMP} \
+ PATH_LOCALE=${INSTALLTMP}/locale
+IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh
.else
-IMAKEENV= ${CROSSENV} \
- PATH=${TMPPATH}:${INSTALLTMP}
+IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
.endif
-IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
# kernel stage
KMAKEENV= ${WMAKEENV}
@@ -576,6 +585,14 @@
.endfor
#
+# Required install tools to be saved in a scratch dir for safety.
+#
+ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
+ date echo egrep find grep install-info \
+ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
+ test true uname wc zic
+
+#
# distributeworld
#
# Distributes everything compiled by a `buildworld'.
@@ -586,19 +603,20 @@
#
distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
- for prog in [ awk cap_mkdb cat chflags chmod chown \
- date echo egrep find grep install-info \
- ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic; do \
+ for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \
- cp $$progpath ${INSTALLTMP}; \
+ progs="$$progs $$progpath"; \
else \
- echo "Required install tool $$prog not found" >&2; \
+ echo "Required tool $$prog not found in PATH." >&2; \
exit 1; \
fi; \
- done
- ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
- rm -rf ${INSTALLTMP}
+ done; \
+ cp $$progs ${INSTALLTMP}; \
+ cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \
+ sort -u` ${INSTALLTMP}
+ cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
+ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
+ ${IMAKEENV} rm -rf ${INSTALLTMP}
#
# reinstall
==== //depot/projects/hammer/ObsoleteFiles.inc#38 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -17,6 +17,7 @@
# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
OLD_FILES+=etc/rc.d/nfslocking
# 20070930: rename of cached to nscd
+OLD_FILES+=etc/cached.conf
OLD_FILES+=etc/rc.d/cached
OLD_FILES+=usr/sbin/cached
OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
==== //depot/projects/hammer/bin/mv/mv.1#7 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $
+.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $
.\"
-.Dd July 9, 2002
+.Dd May 12, 2007
.Dt MV 1
.Os
.Sh NAME
==== //depot/projects/hammer/bin/ps/extern.h#11 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.3 (Berkeley) 4/2/94
- * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $
+ * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $
*/
struct kinfo;
@@ -39,7 +39,7 @@
extern int cflag, eval, fscale, nlistread, rawcpu;
extern unsigned long mempages;
extern time_t now;
-extern int sumrusage, termwidth, totwidth;
+extern int showthreads, sumrusage, termwidth, totwidth;
extern STAILQ_HEAD(velisthead, varent) varlist;
__BEGIN_DECLS
@@ -78,6 +78,7 @@
void showkey(void);
void started(KINFO *, VARENT *);
void state(KINFO *, VARENT *);
+void tdnam(KINFO *, VARENT *);
void tdev(KINFO *, VARENT *);
void tname(KINFO *, VARENT *);
void ucomm(KINFO *, VARENT *);
==== //depot/projects/hammer/bin/ps/keyword.c#18 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -186,6 +186,7 @@
{"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid),
UINT, UIDFMT, 0},
{"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0},
+ {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0},
{"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0},
{"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT,
PIDFMT, 0},
==== //depot/projects/hammer/bin/ps/print.c#17 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -129,9 +129,11 @@
v = ve->var;
if (cflag) {
/* If it is the last field, then don't pad */
- if (STAILQ_NEXT(ve, next_ve) == NULL)
+ if (STAILQ_NEXT(ve, next_ve) == NULL) {
(void)printf("%s", k->ki_p->ki_comm);
- else
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ printf("/%s", k->ki_p->ki_ocomm);
+ } else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
return;
}
@@ -178,13 +180,28 @@
VAR *v;
v = ve->var;
- if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */
+ if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */
(void)printf("%s", k->ki_p->ki_comm);
- else
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ printf("/%s", k->ki_p->ki_ocomm);
+ } else
(void)printf("%-*s", v->width, k->ki_p->ki_comm);
}
void
+tdnam(KINFO *k, VARENT *ve)
+{
+ VAR *v;
+
+ v = ve->var;
+ if (showthreads && k->ki_p->ki_numthreads > 1)
+ (void)printf("%-*s", v->width, k->ki_p->ki_ocomm);
+ else
+ (void)printf("%-*s", v->width, " " );
+
+}
+
+void
logname(KINFO *k, VARENT *ve)
{
VAR *v;
==== //depot/projects/hammer/bin/ps/ps.c#21 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -98,6 +98,7 @@
int sumrusage; /* -S */
int termwidth; /* Width of the screen (0 == infinity). */
int totwidth; /* Calculated-width of requested variables. */
+int showthreads; /* will threads be shown? */
struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist);
@@ -175,7 +176,7 @@
char *cols;
int all, ch, elem, flag, _fmt, i, lineno;
int nentries, nkept, nselectors;
- int prtheader, showthreads, wflag, what, xkeep, xkeep_implied;
+ int prtheader, wflag, what, xkeep, xkeep_implied;
char errbuf[_POSIX2_LINE_MAX];
(void) setlocale(LC_ALL, "");
==== //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#8 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.10 2007/04/12 14:45:25 ache Exp $
+# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.11 2007/11/07 04:44:11 ache Exp $
#
# Official patch 001 imported as v5_2_p1
# Official patch 002 imported as v5_2_p2
+# Official patches 003-007 imported as v5_2_p3_p7
#
rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf
==== //depot/projects/hammer/contrib/libreadline/complete.c#8 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.13 2006/12/31 09:22:31 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
/* complete.c -- filename completion for readline. */
/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
@@ -429,7 +429,7 @@
return (1);
if (c == 'n' || c == 'N' || c == RUBOUT)
return (0);
- if (c == ABORT_CHAR)
+ if (c == ABORT_CHAR || c < 0)
_rl_abort_internal ();
if (for_pager && (c == NEWLINE || c == RETURN))
return (2);
==== //depot/projects/hammer/contrib/libreadline/display.c#9 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/libreadline/display.c,v 1.13 2007/04/12 14:45:25 ache Exp $ */
+/* $FreeBSD: src/contrib/libreadline/display.c,v 1.14 2007/11/07 04:42:20 ache Exp $ */
/* display.c -- readline redisplay facility. */
/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
@@ -1519,11 +1519,31 @@
{
/* Non-zero if we're increasing the number of lines. */
int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
+ /* If col_lendiff is > 0, implying that the new string takes up more
+ screen real estate than the old, but lendiff is < 0, meaning that it
+ takes fewer bytes, we need to just output the characters starting
+ from the first difference. These will overwrite what is on the
+ display, so there's no reason to do a smart update. This can really
+ only happen in a multibyte environment. */
+ if (lendiff < 0)
+ {
+ _rl_output_some_chars (nfd, temp);
+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ /* If nfd begins before any invisible characters in the prompt,
+ adjust _rl_last_c_pos to account for wrap_offset and set
+ cpos_adjusted to let the caller know. */
+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ {
+ _rl_last_c_pos -= wrap_offset;
+ cpos_adjusted = 1;
+ }
+ return;
+ }
/* Sometimes it is cheaper to print the characters rather than
use the terminal's capabilities. If we're growing the number
of lines, make sure we actually cause the new line to wrap
around on auto-wrapping terminals. */
- if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
+ else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
{
/* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
_rl_horizontal_scroll_mode == 1, inserting the characters with
@@ -1599,8 +1619,22 @@
temp = nls - nfd;
if (temp > 0)
{
+ /* If nfd begins at the prompt, or before the invisible
+ characters in the prompt, we need to adjust _rl_last_c_pos
+ in a multibyte locale to account for the wrap offset and
+ set cpos_adjusted accordingly. */
_rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ {
+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+ {
+ _rl_last_c_pos -= wrap_offset;
+ cpos_adjusted = 1;
+ }
+ }
+ else
+ _rl_last_c_pos += temp;
}
}
/* Otherwise, print over the existing material. */
@@ -1608,8 +1642,20 @@
{
if (temp > 0)
{
+ /* If nfd begins at the prompt, or before the invisible
+ characters in the prompt, we need to adjust _rl_last_c_pos
+ in a multibyte locale to account for the wrap offset and
+ set cpos_adjusted accordingly. */
_rl_output_some_chars (nfd, temp);
_rl_last_c_pos += col_temp; /* XXX */
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list