PERFORCE change 126587 for review

Andrew Thompson thompsa at FreeBSD.org
Tue Sep 18 19:34:51 PDT 2007


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

Change 126587 by thompsa at thompsa_heff on 2007/09/19 02:34:12

	IFC

Affected files ...

.. //depot/projects/wifi/ObsoleteFiles.inc#23 integrate
.. //depot/projects/wifi/bin/ps/print.c#3 integrate
.. //depot/projects/wifi/bin/ps/ps.c#5 integrate
.. //depot/projects/wifi/contrib/less/main.c#8 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#32 integrate
.. //depot/projects/wifi/etc/namedb/named.conf#7 integrate
.. //depot/projects/wifi/etc/rc.d/Makefile#20 integrate
.. //depot/projects/wifi/etc/rc.d/ftp-proxy#1 branch
.. //depot/projects/wifi/etc/rc.d/lockd#2 integrate
.. //depot/projects/wifi/etc/rc.d/mdconfig#3 integrate
.. //depot/projects/wifi/etc/rc.d/nfslocking#4 integrate
.. //depot/projects/wifi/etc/rc.d/statd#2 integrate
.. //depot/projects/wifi/etc/services#5 integrate
.. //depot/projects/wifi/gnu/lib/libdialog/dialog.h#2 integrate
.. //depot/projects/wifi/gnu/lib/libstdc++/Makefile#8 integrate
.. //depot/projects/wifi/gnu/usr.bin/cc/cc_int/Makefile#7 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#6 integrate
.. //depot/projects/wifi/include/arpa/inet.h#6 integrate
.. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#22 integrate
.. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#8 integrate
.. //depot/projects/wifi/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate
.. //depot/projects/wifi/lib/libarchive/test/test_write_disk.c#4 integrate
.. //depot/projects/wifi/lib/libc/gen/fts-compat.c#1 branch
.. //depot/projects/wifi/lib/libc/gen/fts-compat.h#1 branch
.. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#12 integrate
.. //depot/projects/wifi/lib/libc/stdlib/getenv.c#6 integrate
.. //depot/projects/wifi/lib/libc/sys/Makefile.inc#11 integrate
.. //depot/projects/wifi/lib/libc/sys/Symbol.map#7 integrate
.. //depot/projects/wifi/lib/libc/sys/kqueue.2#4 integrate
.. //depot/projects/wifi/lib/libc/sys/ntp_adjtime.2#3 integrate
.. //depot/projects/wifi/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/wifi/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/wifi/lib/libelf/elf_update.c#2 integrate
.. //depot/projects/wifi/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/wifi/lib/libkvm/kvm_proc.c#10 integrate
.. //depot/projects/wifi/lib/libutil/Makefile#7 integrate
.. //depot/projects/wifi/lib/libutil/expand_number.3#1 branch
.. //depot/projects/wifi/lib/libutil/expand_number.c#1 branch
.. //depot/projects/wifi/lib/libutil/humanize_number.3#5 integrate
.. //depot/projects/wifi/lib/libutil/libutil.h#5 integrate
.. //depot/projects/wifi/release/Makefile#21 integrate
.. //depot/projects/wifi/release/doc/Makefile#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/readme/article.sgml#5 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#18 integrate
.. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#25 integrate
.. //depot/projects/wifi/release/doc/share/sgml/release.ent#8 integrate
.. //depot/projects/wifi/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/wifi/sbin/camcontrol/camcontrol.8#6 integrate
.. //depot/projects/wifi/sbin/camcontrol/camcontrol.c#5 integrate
.. //depot/projects/wifi/sbin/geom/class/eli/geli.8#8 integrate
.. //depot/projects/wifi/sbin/ipfw/ipfw2.c#21 integrate
.. //depot/projects/wifi/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/wifi/sbin/quotacheck/quotacheck.c#6 integrate
.. //depot/projects/wifi/sbin/reboot/boot_i386.8#10 integrate
.. //depot/projects/wifi/sbin/sysctl/sysctl.8#8 integrate
.. //depot/projects/wifi/share/examples/cvsup/cvs-supfile#4 integrate
.. //depot/projects/wifi/share/examples/cvsup/doc-supfile#2 integrate
.. //depot/projects/wifi/share/examples/cvsup/gnats-supfile#2 integrate
.. //depot/projects/wifi/share/examples/cvsup/ports-supfile#7 integrate
.. //depot/projects/wifi/share/examples/cvsup/stable-supfile#5 integrate
.. //depot/projects/wifi/share/examples/cvsup/standard-supfile#3 integrate
.. //depot/projects/wifi/share/examples/cvsup/www-supfile#2 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#42 integrate
.. //depot/projects/wifi/share/man/man4/aac.4#8 integrate
.. //depot/projects/wifi/share/man/man4/ata.4#16 integrate
.. //depot/projects/wifi/share/man/man4/coretemp.4#1 branch
.. //depot/projects/wifi/share/man/man4/ichwd.4#1 branch
.. //depot/projects/wifi/share/man/man4/if_bridge.4#10 integrate
.. //depot/projects/wifi/share/man/man4/nfe.4#7 integrate
.. //depot/projects/wifi/share/man/man4/ral.4#10 integrate
.. //depot/projects/wifi/share/man/man4/rum.4#3 integrate
.. //depot/projects/wifi/share/man/man4/snd_emu10kx.4#3 integrate
.. //depot/projects/wifi/share/man/man4/umodem.4#5 integrate
.. //depot/projects/wifi/share/man/man4/ural.4#13 integrate
.. //depot/projects/wifi/share/man/man4/wlan.4#7 integrate
.. //depot/projects/wifi/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/wifi/share/man/man4/zyd.4#1 branch
.. //depot/projects/wifi/share/man/man5/Makefile#12 integrate
.. //depot/projects/wifi/share/man/man5/ar.5#1 branch
.. //depot/projects/wifi/share/man/man5/elf.5#6 integrate
.. //depot/projects/wifi/share/man/man5/msdosfs.5#3 integrate
.. //depot/projects/wifi/share/man/man5/rc.conf.5#32 integrate
.. //depot/projects/wifi/share/man/man5/src.conf.5#8 integrate
.. //depot/projects/wifi/share/man/man7/ports.7#11 integrate
.. //depot/projects/wifi/share/man/man9/Makefile#23 integrate
.. //depot/projects/wifi/share/man/man9/suser.9#8 integrate
.. //depot/projects/wifi/share/misc/committers-ports.dot#9 integrate
.. //depot/projects/wifi/share/zoneinfo/africa#7 integrate
.. //depot/projects/wifi/share/zoneinfo/antarctica#6 integrate
.. //depot/projects/wifi/share/zoneinfo/australasia#7 integrate
.. //depot/projects/wifi/share/zoneinfo/europe#8 integrate
.. //depot/projects/wifi/share/zoneinfo/leapseconds#9 integrate
.. //depot/projects/wifi/share/zoneinfo/northamerica#8 integrate
.. //depot/projects/wifi/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/wifi/sys/amd64/amd64/cpu_switch.S#8 integrate
.. //depot/projects/wifi/sys/amd64/amd64/genassym.c#8 integrate
.. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#17 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/wifi/sys/amd64/amd64/support.S#8 integrate
.. //depot/projects/wifi/sys/amd64/amd64/uma_machdep.c#4 integrate
.. //depot/projects/wifi/sys/amd64/include/asm.h#3 integrate
.. //depot/projects/wifi/sys/amd64/include/asmacros.h#5 integrate
.. //depot/projects/wifi/sys/amd64/isa/clock.c#15 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux.h#7 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux32_proto.h#9 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux32_syscall.h#9 integrate
.. //depot/projects/wifi/sys/amd64/linux32/linux32_sysent.c#9 integrate
.. //depot/projects/wifi/sys/amd64/linux32/syscalls.master#9 integrate
.. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#22 integrate
.. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#19 integrate
.. //depot/projects/wifi/sys/arm/at91/at91_mci.c#4 integrate
.. //depot/projects/wifi/sys/arm/at91/at91_pmc.c#3 integrate
.. //depot/projects/wifi/sys/arm/include/endian.h#7 integrate
.. //depot/projects/wifi/sys/arm/sa11x0/uart_dev_sa1110.c#6 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/i80321.c#7 integrate
.. //depot/projects/wifi/sys/boot/arm/at91/boot2/boot2.c#4 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#18 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_misc.c#21 integrate
.. //depot/projects/wifi/sys/compat/linux/linux_stats.c#12 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/wifi/sys/conf/NOTES#48 integrate
.. //depot/projects/wifi/sys/conf/options#41 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/wifi/sys/contrib/pf/net/pf.c#18 integrate
.. //depot/projects/wifi/sys/ddb/db_ps.c#6 integrate
.. //depot/projects/wifi/sys/dev/aac/aac_pci.c#12 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi.c#30 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#12 integrate
.. //depot/projects/wifi/sys/dev/an/if_an.c#18 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#29 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-pci.h#21 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#15 integrate
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#151 integrate
.. //depot/projects/wifi/sys/dev/awi/awi.c#19 integrate
.. //depot/projects/wifi/sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_common.h#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_adapter.h#8 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_ioctl.h#4 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.c#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_l2t.h#2 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_lro.c#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#11 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.c#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#11 integrate
.. //depot/projects/wifi/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete
.. //depot/projects/wifi/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch
.. //depot/projects/wifi/sys/dev/dcons/dcons_os.c#12 integrate
.. //depot/projects/wifi/sys/dev/drm/i915_dma.c#6 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.c#28 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.h#13 integrate
.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#25 integrate
.. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#19 integrate
.. //depot/projects/wifi/sys/dev/isp/isp_freebsd.h#14 integrate
.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#56 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe.h#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_82598.c#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_api.c#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_api.h#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_common.c#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_common.h#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_phy.c#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_phy.h#2 integrate
.. //depot/projects/wifi/sys/dev/ixgbe/ixgbe_type.h#2 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfi.c#9 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfi_pci.c#6 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfireg.h#5 integrate
.. //depot/projects/wifi/sys/dev/mfi/mfivar.h#7 integrate
.. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#12 integrate
.. //depot/projects/wifi/sys/dev/mxge/eth_z8e.h#2 integrate
.. //depot/projects/wifi/sys/dev/mxge/ethp_z8e.h#2 integrate
.. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#17 integrate
.. //depot/projects/wifi/sys/dev/mxge/if_mxge_var.h#8 integrate
.. //depot/projects/wifi/sys/dev/mxge/mxge_mcp.h#6 integrate
.. //depot/projects/wifi/sys/dev/nfe/if_nfe.c#6 integrate
.. //depot/projects/wifi/sys/dev/ral/rt2560.c#26 integrate
.. //depot/projects/wifi/sys/dev/ral/rt2661.c#17 integrate
.. //depot/projects/wifi/sys/dev/ray/if_ray.c#14 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/emu10kx-pcm.c#8 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/emu10kx.c#7 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/emu10kx.h#4 integrate
.. //depot/projects/wifi/sys/dev/usb/if_rum.c#8 integrate
.. //depot/projects/wifi/sys/dev/usb/if_ural.c#35 integrate
.. //depot/projects/wifi/sys/dev/usb/if_zyd.c#1 branch
.. //depot/projects/wifi/sys/dev/usb/if_zydfw.h#1 branch
.. //depot/projects/wifi/sys/dev/usb/if_zydreg.h#1 branch
.. //depot/projects/wifi/sys/dev/usb/usbdevs#33 integrate
.. //depot/projects/wifi/sys/dev/wi/if_wi.c#43 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/direntry.h#5 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_conv.c#10 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_lookup.c#7 integrate
.. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate
.. //depot/projects/wifi/sys/fs/procfs/procfs_status.c#9 integrate
.. //depot/projects/wifi/sys/geom/eli/g_eli.h#6 integrate
.. //depot/projects/wifi/sys/geom/eli/g_eli_crypto.c#4 integrate
.. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate
.. //depot/projects/wifi/sys/i386/acpica/madt.c#11 integrate
.. //depot/projects/wifi/sys/i386/i386/genassym.c#8 integrate
.. //depot/projects/wifi/sys/i386/i386/geode.c#5 integrate
.. //depot/projects/wifi/sys/i386/i386/local_apic.c#20 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#26 integrate
.. //depot/projects/wifi/sys/i386/i386/support.s#7 integrate
.. //depot/projects/wifi/sys/i386/i386/swtch.s#8 integrate
.. //depot/projects/wifi/sys/i386/include/asm.h#2 integrate
.. //depot/projects/wifi/sys/i386/include/asmacros.h#4 integrate
.. //depot/projects/wifi/sys/i386/isa/isa.c#6 integrate
.. //depot/projects/wifi/sys/i386/linux/linux.h#8 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_proto.h#9 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_ptrace.c#5 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_syscall.h#9 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_sysent.c#9 integrate
.. //depot/projects/wifi/sys/i386/linux/syscalls.master#9 integrate
.. //depot/projects/wifi/sys/ia64/ia64/uma_machdep.c#4 integrate
.. //depot/projects/wifi/sys/kern/init_main.c#21 integrate
.. //depot/projects/wifi/sys/kern/kern_acct.c#16 integrate
.. //depot/projects/wifi/sys/kern/kern_clock.c#16 integrate
.. //depot/projects/wifi/sys/kern/kern_cpu.c#11 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/wifi/sys/kern/kern_kse.c#19 integrate
.. //depot/projects/wifi/sys/kern/kern_ktrace.c#14 integrate
.. //depot/projects/wifi/sys/kern/kern_proc.c#18 integrate
.. //depot/projects/wifi/sys/kern/kern_switch.c#21 integrate
.. //depot/projects/wifi/sys/kern/kern_synch.c#18 integrate
.. //depot/projects/wifi/sys/kern/kern_sysctl.c#13 integrate
.. //depot/projects/wifi/sys/kern/kern_thread.c#24 integrate
.. //depot/projects/wifi/sys/kern/kern_timeout.c#11 integrate
.. //depot/projects/wifi/sys/kern/sched_4bsd.c#18 integrate
.. //depot/projects/wifi/sys/kern/sched_ule.c#29 integrate
.. //depot/projects/wifi/sys/kern/subr_kdb.c#8 integrate
.. //depot/projects/wifi/sys/kern/subr_lock.c#7 integrate
.. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#15 integrate
.. //depot/projects/wifi/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/wifi/sys/kern/subr_trap.c#14 integrate
.. //depot/projects/wifi/sys/kern/sys_process.c#13 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#27 integrate
.. //depot/projects/wifi/sys/kern/vfs_aio.c#19 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#35 integrate
.. //depot/projects/wifi/sys/kern/vfs_subr.c#44 integrate
.. //depot/projects/wifi/sys/kern/vfs_syscalls.c#26 integrate
.. //depot/projects/wifi/sys/modules/cxgb/Makefile#6 integrate
.. //depot/projects/wifi/sys/modules/ixgbe/Makefile#1 branch
.. //depot/projects/wifi/sys/modules/sound/driver/emu10kx/Makefile#3 integrate
.. //depot/projects/wifi/sys/modules/zyd/Makefile#1 branch
.. //depot/projects/wifi/sys/net/bpf.c#26 integrate
.. //depot/projects/wifi/sys/net/bpf_filter.c#5 integrate
.. //depot/projects/wifi/sys/net/bridgestp.c#14 integrate
.. //depot/projects/wifi/sys/net/if_bridge.c#17 integrate
.. //depot/projects/wifi/sys/net/if_ethersubr.c#26 integrate
.. //depot/projects/wifi/sys/net/if_lagg.c#8 integrate
.. //depot/projects/wifi/sys/net/if_media.h#12 integrate
.. //depot/projects/wifi/sys/net/rtsock.c#15 integrate
.. //depot/projects/wifi/sys/net80211/_ieee80211.h#26 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211.c#57 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211.h#25 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#30 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#33 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_ht.h#5 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#111 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#83 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#44 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#97 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#50 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#78 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_power.c#10 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#62 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#40 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#8 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#61 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#10 integrate
.. //depot/projects/wifi/sys/netgraph/ng_base.c#26 integrate
.. //depot/projects/wifi/sys/netgraph/ng_ppp.c#12 integrate
.. //depot/projects/wifi/sys/netinet/ip_fw2.c#31 integrate
.. //depot/projects/wifi/sys/netinet/sctp.h#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_asconf.c#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_asconf.h#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_auth.c#11 integrate
.. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#10 integrate
.. //depot/projects/wifi/sys/netinet/sctp_cc_functions.c#3 integrate
.. //depot/projects/wifi/sys/netinet/sctp_cc_functions.h#2 integrate
.. //depot/projects/wifi/sys/netinet/sctp_constants.h#17 integrate
.. //depot/projects/wifi/sys/netinet/sctp_header.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/wifi/sys/netinet/sctp_input.c#21 integrate
.. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_os.h#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#16 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.h#7 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.c#22 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.h#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#11 integrate
.. //depot/projects/wifi/sys/netinet/sctp_structs.h#13 integrate
.. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#9 integrate
.. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_timer.c#15 integrate
.. //depot/projects/wifi/sys/netinet/sctp_timer.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_uio.h#14 integrate
.. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#19 integrate
.. //depot/projects/wifi/sys/netinet/sctp_var.h#10 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.c#21 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.h#14 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#32 integrate
.. //depot/projects/wifi/sys/netinet/tcp_subr.c#36 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timer.c#18 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timer.h#9 integrate
.. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#29 integrate
.. //depot/projects/wifi/sys/netinet/tcp_var.h#24 integrate
.. //depot/projects/wifi/sys/netinet/udp_usrreq.c#25 integrate
.. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#18 integrate
.. //depot/projects/wifi/sys/netinet6/sctp6_var.h#7 integrate
.. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/wifi/sys/netipsec/ipsec_input.c#7 integrate
.. //depot/projects/wifi/sys/pci/agp_i810.c#8 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/uma_machdep.c#3 integrate
.. //depot/projects/wifi/sys/security/mac/mac_framework.h#6 integrate
.. //depot/projects/wifi/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/wifi/sys/security/mac/mac_vfs.c#10 integrate
.. //depot/projects/wifi/sys/security/mac_biba/mac_biba.c#14 integrate
.. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate
.. //depot/projects/wifi/sys/security/mac_lomac/mac_lomac.c#12 integrate
.. //depot/projects/wifi/sys/security/mac_mls/mac_mls.c#13 integrate
.. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#15 integrate
.. //depot/projects/wifi/sys/security/mac_test/mac_test.c#14 integrate
.. //depot/projects/wifi/sys/sparc64/fhc/fhc.c#9 integrate
.. //depot/projects/wifi/sys/sparc64/include/bus_common.h#3 integrate
.. //depot/projects/wifi/sys/sparc64/include/intr_machdep.h#5 integrate
.. //depot/projects/wifi/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/wifi/sys/sparc64/pci/psychoreg.h#7 integrate
.. //depot/projects/wifi/sys/sparc64/sbus/sbus.c#14 integrate
.. //depot/projects/wifi/sys/sparc64/sbus/sbusreg.h#4 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/exception.S#7 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/genassym.c#7 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/intr_machdep.c#7 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/tick.c#7 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/upa.c#5 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/vm_machdep.c#9 integrate
.. //depot/projects/wifi/sys/sun4v/mdesc/mdesc_init.c#2 integrate
.. //depot/projects/wifi/sys/sun4v/sun4v/vm_machdep.c#4 integrate
.. //depot/projects/wifi/sys/sys/callout.h#5 integrate
.. //depot/projects/wifi/sys/sys/lock_profile.h#6 integrate
.. //depot/projects/wifi/sys/sys/mbuf.h#26 integrate
.. //depot/projects/wifi/sys/sys/mount.h#22 integrate
.. //depot/projects/wifi/sys/sys/proc.h#35 integrate
.. //depot/projects/wifi/sys/sys/socket.h#11 integrate
.. //depot/projects/wifi/sys/sys/user.h#9 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#15 integrate
.. //depot/projects/wifi/sys/vm/device_pager.c#6 integrate
.. //depot/projects/wifi/sys/vm/phys_pager.c#7 integrate
.. //depot/projects/wifi/sys/vm/vm_glue.c#16 integrate
.. //depot/projects/wifi/sys/vm/vm_map.c#20 integrate
.. //depot/projects/wifi/sys/vm/vm_map.h#5 integrate
.. //depot/projects/wifi/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/wifi/sys/vm/vm_pageout.c#20 integrate
.. //depot/projects/wifi/tools/build/options/WITHOUT_ZONEINFO#1 branch
.. //depot/projects/wifi/tools/regression/geom_eli/init-a.t#2 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/init.t#3 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/integrity-copy.t#2 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/integrity-data.t#2 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/integrity-hmac.t#2 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/onetime-a.t#2 integrate
.. //depot/projects/wifi/tools/regression/geom_eli/onetime.t#3 integrate
.. //depot/projects/wifi/tools/regression/priv/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/priv/main.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/main.h#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_acct.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_adjtime.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_audit_control.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_audit_getaudit.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_audit_setaudit.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_audit_submit.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_clock_settime.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_cred.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_io.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_kenv_set.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_kenv_unset.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_msgbuf.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_netinet_raw.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_proc_setlogin.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_proc_setrlimit.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_sched_rtprio.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_sched_setpriority.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_settimeofday.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_sysctl_write.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_admin.c#2 delete
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_chflags.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_chmod.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_chown.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_chroot.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_clearsugid.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_extattr_system.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_fhopen.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_fhstat.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_fhstatfs.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_generation.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_getfh.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_read_write.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_setgid.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_stickyfile.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vfs_utimes.c#1 branch
.. //depot/projects/wifi/tools/regression/priv/priv_vm_madv_protect.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vm_mlock.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/priv_vm_munlock.c#2 integrate
.. //depot/projects/wifi/tools/regression/priv/test_utimes.c#2 delete
.. //depot/projects/wifi/tools/tools/tinybsd/conf/bridge/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/firewall/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/minimal/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/wireless/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/conf/wrap/TINYBSD#2 integrate
.. //depot/projects/wifi/tools/tools/tinybsd/tinybsd#2 integrate
.. //depot/projects/wifi/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#4 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.computer#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.dutch#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.holiday#7 integrate
.. //depot/projects/wifi/usr.bin/netstat/sctp.c#5 integrate
.. //depot/projects/wifi/usr.bin/rpcgen/rpc_main.c#6 integrate
.. //depot/projects/wifi/usr.bin/rpcgen/rpc_svcout.c#7 integrate
.. //depot/projects/wifi/usr.bin/systat/pigs.c#5 integrate
.. //depot/projects/wifi/usr.bin/tar/bsdtar.c#13 integrate
.. //depot/projects/wifi/usr.bin/top/machine.c#9 integrate
.. //depot/projects/wifi/usr.bin/top/top.local.1#2 integrate
.. //depot/projects/wifi/usr.sbin/kbdmap/kbdmap.c#5 integrate
.. //depot/projects/wifi/usr.sbin/periodic/periodic.8#5 integrate
.. //depot/projects/wifi/usr.sbin/pkg_install/add/extract.c#4 integrate
.. //depot/projects/wifi/usr.sbin/wpa/ndis_events/ndis_events.8#5 integrate

Differences ...

==== //depot/projects/wifi/ObsoleteFiles.inc#23 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.94 2007/06/05 01:10:47 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -399,6 +399,10 @@
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
+OLD_FILES+=rescue/ipfs
+OLD_FILES+=rescue/ipfstat
+OLD_FILES+=rescue/ipmon
+OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
@@ -430,6 +434,7 @@
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
+OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
@@ -2898,7 +2903,6 @@
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
-OLD_FILES+=usr/share/man/man5/ar.5.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz

==== //depot/projects/wifi/bin/ps/print.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -197,14 +197,13 @@
 void
 state(KINFO *k, VARENT *ve)
 {
-	int flag, sflag, tdflags;
+	int flag, tdflags;
 	char *cp;
 	VAR *v;
 	char buf[16];
 
 	v = ve->var;
 	flag = k->ki_p->ki_flag;
-	sflag = k->ki_p->ki_sflag;
 	tdflags = k->ki_p->ki_tdflags;	/* XXXKSE */
 	cp = buf;
 
@@ -242,7 +241,7 @@
 		*cp = '?';
 	}
 	cp++;
-	if (!(sflag & PS_INMEM))
+	if (!(flag & P_INMEM))
 		*cp++ = 'W';
 	if (k->ki_p->ki_nice < NZERO)
 		*cp++ = '<';
@@ -591,7 +590,7 @@
 #define	fxtofl(fixpt)	((double)(fixpt) / fscale)
 
 	/* XXX - I don't like this */
-	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	if (rawcpu)
 		return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@@ -619,7 +618,7 @@
 	if (failure)
 		return (0.0);
 
-	if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if ((k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	/* XXX want pmap ptpages, segtab, etc. (per architecture) */
 	/* XXX don't have info about shared */

==== //depot/projects/wifi/bin/ps/ps.c#5 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -994,13 +994,13 @@
 	return (s);
 }
 
-#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
+#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_flag & P_INMEM))
 
 static void
 saveuser(KINFO *ki)
 {
 
-	if (ki->ki_p->ki_sflag & PS_INMEM) {
+	if (ki->ki_p->ki_flag & P_INMEM) {
 		/*
 		 * The u-area might be swapped out, and we can't get
 		 * at it because we have a crashdump and no swap.

==== //depot/projects/wifi/contrib/less/main.c#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/main.c,v 1.11 2007/08/13 16:15:26 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.12 2007/09/04 13:54:09 delphij Exp $ */
 /*
  * Copyright (C) 1984-2007  Mark Nudelman
  *
@@ -244,7 +244,7 @@
 		quit(QUIT_OK);
 	}
 
-	if (missing_cap && !know_dumb)
+	if (missing_cap && !know_dumb && !less_is_more)
 		error("WARNING: terminal is not fully functional", NULL_PARG);
 	init_mark();
 	open_getchr();

==== //depot/projects/wifi/etc/defaults/rc.conf#32 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.316 2007/06/12 17:33:23 gshapiro Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -154,6 +154,8 @@
 pflog_logfile="/var/log/pflog"	# where pflogd should store the logfile
 pflog_program="/sbin/pflogd"	# where the pflogd program lives
 pflog_flags=""			# additional flags for pflogd
+ftpproxy_enable="NO"		# Set to YES to enable ftp-proxy(8) for pf
+ftpproxy_flags=""		# additional flags for ftp-proxy(8)
 pfsync_enable="NO"		# Expose pf state to other hosts for syncing
 pfsync_syncdev=""		# Interface for pfsync to work through
 pfsync_syncpeer=""		# IP address of pfsync peer host

==== //depot/projects/wifi/etc/namedb/named.conf#7 (text+ko) ====

@@ -1,4 +1,4 @@
-// $FreeBSD: src/etc/namedb/named.conf,v 1.25 2007/08/02 09:18:53 dougb Exp $
+// $FreeBSD: src/etc/namedb/named.conf,v 1.26 2007/08/17 04:37:02 dougb Exp $
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
 // in /usr/share/doc/bind9 for more details.
@@ -68,6 +68,12 @@
 	2. No spurious traffic will be sent from your network to the roots
 	3. Greater resilience to any potential root server failure/DDoS
 
+	On the other hand, this method requires more monitoring than the
+	hints file to be sure that an unexpected failure mode has not
+	incapacitated your server.  Name servers that are serving a lot
+	of clients will benefit more from this approach than individual
+	hosts.  Use with caution.
+
 	To use this mechanism, uncomment the entries below, and comment
 	the hint zone above.
 */
@@ -76,9 +82,7 @@
 	type slave;
 	file "slave/root.slave";
 	masters {
-		192.33.4.12;	// C.ROOT-SERVERS.NET.
-		192.112.36.4;	// G.ROOT-SERVERS.NET.
-		193.0.14.129;	// K.ROOT-SERVERS.NET.
+		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
@@ -86,9 +90,7 @@
 	type slave;
 	file "slave/arpa.slave";
 	masters {
-		192.33.4.12;	// C.ROOT-SERVERS.NET.
-		192.112.36.4;	// G.ROOT-SERVERS.NET.
-		193.0.14.129;	// K.ROOT-SERVERS.NET.
+		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
@@ -96,9 +98,7 @@
 	type slave;
 	file "slave/in-addr.arpa.slave";
 	masters {
-		192.33.4.12;	// C.ROOT-SERVERS.NET.
-		192.112.36.4;	// G.ROOT-SERVERS.NET.
-		193.0.14.129;	// K.ROOT-SERVERS.NET.
+		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
 	notify no;
 };
@@ -155,9 +155,9 @@
 // TEST-NET for Documentation (RFC 3330)
 zone "2.0.192.in-addr.arpa"	{ type master; file "master/empty.db"; };
 
-// Router Benchmark Testing (RFC 2544)
-zone "18.192.in-addr.arpa"	{ type master; file "master/empty.db"; };
-zone "19.192.in-addr.arpa"	{ type master; file "master/empty.db"; };
+// Router Benchmark Testing (RFC 3330)
+zone "18.198.in-addr.arpa"	{ type master; file "master/empty.db"; };
+zone "19.198.in-addr.arpa"	{ type master; file "master/empty.db"; };
 
 // IANA Reserved - Old Class E Space
 zone "240.in-addr.arpa"		{ type master; file "master/empty.db"; };

==== //depot/projects/wifi/etc/rc.d/Makefile#20 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.81 2007/04/09 19:21:27 pjd Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 	devd devfs dhclient \
 	dmesg dumpon \
 	early.sh encswap \
-	fsck ftpd \
+	fsck ftp-proxy ftpd \
 	gbde geli geli2 \
 	hcsecd \
 	hostapd hostid hostname \
@@ -20,7 +20,7 @@
 	ipnat ipsec ipxrouted isdnd \
 	jail \
 	kadmind kerberos kernel keyserv kldxref kpasswdd \
-	ldconfig local localpkg lpd \
+	ldconfig local localpkg lockd lpd \
 	mixer motd mountcritlocal mountcritremote mountlate \
 	mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
 	named natd netif netoptions \
@@ -33,7 +33,7 @@
 	random rarpd resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore sdpd securelevel sendmail \
-	serial sppp swap1 \
+	serial sppp statd swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw \

==== //depot/projects/wifi/etc/rc.d/lockd#2 (text+ko) ====

@@ -1,22 +1,28 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD: src/etc/rc.d/lockd,v 1.14 2007/05/17 08:57:14 mtm Exp $
+# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
+# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $
 #
 
-# PROVIDE: nfslocking
-# REQUIRE: nfsserver nfsclient nfsd rpcbind
+# PROVIDE: lockd
+# REQUIRE: nfsserver nfsclient nfsd rpcbind statd
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
-# Save the (one) commandline argument in case it gets clobbered.
-arg=$1
+name="lockd"
+rcvar=rpc_lockd_enable
+command="/usr/sbin/rpc.${name}"
+start_precmd='lockd_precmd'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+status_precmd=$stop_precmd
 
-# Either NFS client or server must be enabled and rpcbind(8) must be started.
+# Make sure that we are either an NFS client or server, and that we get
+# the correct flags from rc.conf(5).
 #
-nfslocking_precmd()
+lockd_precmd()
 {
 	local ret
 	ret=0
@@ -30,34 +36,9 @@
 	then
 		force_depend rpcbind || ret=1
 	fi
-
-	if [ $name = "statd" ] 
-	then
-		rc_flags=${rpc_statd_flags}
-	elif [ $name = "lockd" ]
-	then
-		rc_flags=${rpc_lockd_flags}
-	fi
-
+	rc_flags=${rpc_lockd_flags}
 	return ${ret}
 }
 
-start_precmd="nfslocking_precmd"
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
-status_precmd=$stop_precmd
-
-# rpc.statd
-#
-name="statd"
-rcvar=rpc_statd_enable
-command="/usr/sbin/rpc.${name}"
-load_rc_config $name
-run_rc_command "$arg"
-
-# rpc.lockd
-#
-name="lockd"
-rcvar=rpc_lockd_enable
-command="/usr/sbin/rpc.${name}"
 load_rc_config $name
-run_rc_command "$arg"
+run_rc_command $1

==== //depot/projects/wifi/etc/rc.d/mdconfig#3 (text) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/mdconfig,v 1.4 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/mdconfig,v 1.5 2007/08/25 00:19:17 matteo Exp $
 #
 
 # PROVIDE: mdconfig
@@ -115,6 +115,8 @@
 				fi
 				if [ "${_file}" != "${_file%.uzip}" ]; then
 					load_kld -m g_uzip geom_uzip || return 3
+					# sleep a bit to allow creation of /dev/mdX.uzip
+					sleep 2
 				fi
 			fi
 			if mdconfig -l -u ${_md} >/dev/null 2>&1; then

==== //depot/projects/wifi/etc/rc.d/nfslocking#4 (text+ko) ====

@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD: src/etc/rc.d/nfslocking,v 1.14 2007/05/17 08:57:14 mtm Exp $
+# $FreeBSD: src/etc/rc.d/nfslocking,v 1.15 2007/08/17 07:58:26 mtm Exp $
 #
 
 # PROVIDE: nfslocking
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail nostart
 
 . /etc/rc.subr
 

==== //depot/projects/wifi/etc/rc.d/statd#2 (text+ko) ====

@@ -1,22 +1,28 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD: src/etc/rc.d/statd,v 1.14 2007/05/17 08:57:14 mtm Exp $
+# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
+# $FreeBSD: src/etc/rc.d/statd,v 1.17 2007/08/18 04:08:53 mtm Exp $
 #
 
-# PROVIDE: nfslocking
+# PROVIDE: statd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
-# Save the (one) commandline argument in case it gets clobbered.
-arg=$1
+name="statd"
+rcvar=rpc_statd_enable
+command="/usr/sbin/rpc.${name}"
+start_precmd='statd_precmd'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+status_precmd=$stop_precmd
 
-# Either NFS client or server must be enabled and rpcbind(8) must be started.
+# Make sure that we are either an NFS client or server, and that we get
+# the correct flags from rc.conf(5).
 #
-nfslocking_precmd()
+statd_precmd()
 {
 	local ret
 	ret=0
@@ -30,34 +36,9 @@
 	then
 		force_depend rpcbind || ret=1
 	fi
-
-	if [ $name = "statd" ] 
-	then
-		rc_flags=${rpc_statd_flags}
-	elif [ $name = "lockd" ]
-	then
-		rc_flags=${rpc_lockd_flags}
-	fi
-
+	rc_flags=${rpc_statd_flags}
 	return ${ret}
 }
 
-start_precmd="nfslocking_precmd"
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
-status_precmd=$stop_precmd
-
-# rpc.statd
-#
-name="statd"
-rcvar=rpc_statd_enable
-command="/usr/sbin/rpc.${name}"
 load_rc_config $name
-run_rc_command "$arg"
-
-# rpc.lockd
-#
-name="lockd"
-rcvar=rpc_lockd_enable
-command="/usr/sbin/rpc.${name}"
-load_rc_config $name
-run_rc_command "$arg"
+run_rc_command $1

==== //depot/projects/wifi/etc/services#5 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.110 2007/05/20 03:57:47 grog Exp $
+# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -2186,6 +2186,8 @@
 sj3		3086/tcp   #SJ3 (kanji input)
 vmodem		3141/tcp
 vmodem		3141/udp
+iscsi-target	3260/tcp   # iSCSI port
+iscsi-target	3260/udp   # iSCSI port
 ccmail		3264/tcp   #cc:mail/lotus
 ccmail		3264/udp   #cc:mail/lotus
 dec-notes	3333/tcp   #DEC Notes
@@ -2326,6 +2328,10 @@
 montage-lm	6147/udp   #Montage License Manager
 ricardo-lm	6148/tcp   #Ricardo North America License Manager
 ricardo-lm	6148/udp   #Ricardo North America License Manager
+sge_qmaster	6444/tcp   #Grid Engine Qmaster Service
+sge_qmaster	6444/udp   #Grid Engine Qmaster Service
+sge_execd	6445/tcp   #Grid Engine Execution Service
+sge_execd	6445/upd   #Grid Engine Execution Service
 xdsxdm		6558/tcp
 xdsxdm		6558/udp
 ircd		6667/tcp   #Internet Relay Chat (unoffical)

==== //depot/projects/wifi/gnu/lib/libdialog/dialog.h#2 (text+ko) ====

@@ -22,7 +22,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.22 2000/12/14 02:35:22 jkh Exp $
+ * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.23 2007/08/24 16:26:24 ache Exp $
  *
  */
 
@@ -74,7 +74,7 @@
 } dialogMenuItem;
 
 #define VERSION "0.4"
-#define MAX_LEN 2048
+#define MAX_LEN 4096
 
 #ifndef TRUE
 #define TRUE (1)

==== //depot/projects/wifi/gnu/lib/libstdc++/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.60 2007/05/19 15:41:01 kan Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -143,10 +143,10 @@
 		stdio_filebuf.h stdio_sync_filebuf.h functional \
 		hash_map hash_set hash_fun.h hashtable.h iterator \
 		malloc_allocator.h memory mt_allocator.h new_allocator.h \
-		numeric pod_char_traits.h pool_allocator.h rb_tree rope \
-		ropeimpl.h slist throw_allocator.h typelist.h type_traits.h \
-		rc_string_base.h sso_string_base.h vstring.h vstring.tcc \
-		vstring_fwd.h vstring_util.h
+		numeric numeric_traits.h pod_char_traits.h pool_allocator.h \
+		rb_tree rope ropeimpl.h slist throw_allocator.h typelist.h \
+		type_traits.h rc_string_base.h sso_string_base.h vstring.h \
+		vstring.tcc vstring_fwd.h vstring_util.h
 
 EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
 EXTHDRSDIR=	${CXXINCLUDEDIR}/ext

==== //depot/projects/wifi/gnu/usr.bin/cc/cc_int/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
@@ -75,6 +75,10 @@
 # Target specific, C specific object file
 C_TARGET_OBJS=
 
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END
+.endif
+
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \

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


More information about the p4-projects mailing list