PERFORCE change 119311 for review
Sepherosa Ziehau
sephe at FreeBSD.org
Sun May 6 01:28:35 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119311
Change 119311 by sephe at sephe_zealot:sam_wifi on 2007/05/06 01:28:14
IFC @ ~119310
Affected files ...
.. //depot/projects/wifi/MAINTAINERS#15 integrate
.. //depot/projects/wifi/ObsoleteFiles.inc#14 integrate
.. //depot/projects/wifi/UPDATING#28 integrate
.. //depot/projects/wifi/bin/df/df.c#6 integrate
.. //depot/projects/wifi/bin/sh/var.c#4 integrate
.. //depot/projects/wifi/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/wifi/contrib/gdb/gdb/ppcfbsd-nat.c#2 integrate
.. //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate
.. //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate
.. //depot/projects/wifi/contrib/sendmail/libmilter/engine.c#5 integrate
.. //depot/projects/wifi/contrib/sendmail/libmilter/listener.c#5 integrate
.. //depot/projects/wifi/contrib/sendmail/libmilter/main.c#3 integrate
.. //depot/projects/wifi/contrib/top/commands.c#5 integrate
.. //depot/projects/wifi/contrib/top/machine.h#4 integrate
.. //depot/projects/wifi/contrib/top/top.X#6 integrate
.. //depot/projects/wifi/contrib/top/top.c#6 integrate
.. //depot/projects/wifi/contrib/traceroute/traceroute.c#6 integrate
.. //depot/projects/wifi/etc/rc.d/netoptions#3 integrate
.. //depot/projects/wifi/etc/rc.d/routing#3 integrate
.. //depot/projects/wifi/etc/rc.d/zfs#3 integrate
.. //depot/projects/wifi/etc/sendmail/freebsd.mc#5 integrate
.. //depot/projects/wifi/etc/sendmail/freebsd.submit.mc#4 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/arch/powerpc/init.c#2 integrate
.. //depot/projects/wifi/include/stdlib.h#6 integrate
.. //depot/projects/wifi/lib/libarchive/Makefile#24 integrate
.. //depot/projects/wifi/lib/libarchive/archive.h.in#16 integrate
.. //depot/projects/wifi/lib/libbsm/Makefile#3 integrate
.. //depot/projects/wifi/lib/libc/Versions.def#2 integrate
.. //depot/projects/wifi/lib/libc/amd64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/arm/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/compat-43/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/db/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/gen/Symbol.map#5 integrate
.. //depot/projects/wifi/lib/libc/gmon/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/i386/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/ia64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/inet/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/locale/isdigit.3#5 integrate
.. //depot/projects/wifi/lib/libc/nameser/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/net/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/nls/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/posix1e/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/powerpc/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/quad/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/regex/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/resolv/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/rpc/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/softfloat/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/sparc64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/stdio/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/stdlib/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/stdlib/getenv.3#5 integrate
.. //depot/projects/wifi/lib/libc/stdlib/getenv.c#3 integrate
.. //depot/projects/wifi/lib/libc/stdlib/putenv.c#3 integrate
.. //depot/projects/wifi/lib/libc/stdlib/setenv.c#3 integrate
.. //depot/projects/wifi/lib/libc/stdtime/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/sys/Makefile.inc#8 integrate
.. //depot/projects/wifi/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/libc/sys/send.2#9 integrate
.. //depot/projects/wifi/lib/libc/uuid/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/xdr/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libc/yp/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libelf/Version.map#2 integrate
.. //depot/projects/wifi/lib/libexpat/expat_config.h#2 integrate
.. //depot/projects/wifi/lib/libfetch/fetch.3#4 integrate
.. //depot/projects/wifi/lib/libfetch/ftp.c#5 integrate
.. //depot/projects/wifi/lib/libgeom/geom_getxml.c#2 integrate
.. //depot/projects/wifi/lib/libpthread/pthread.map#6 integrate
.. //depot/projects/wifi/lib/libpthread/thread/thr_info.c#4 integrate
.. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#8 integrate
.. //depot/projects/wifi/lib/librt/Makefile#2 integrate
.. //depot/projects/wifi/lib/librt/Version.map#1 branch
.. //depot/projects/wifi/lib/libthr/pthread.map#8 integrate
.. //depot/projects/wifi/lib/libthread_db/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/libthread_db/arch/powerpc/libpthread_md.c#2 integrate
.. //depot/projects/wifi/lib/libutil/login_class.c#2 integrate
.. //depot/projects/wifi/lib/msun/Symbol.map#3 integrate
.. //depot/projects/wifi/lib/msun/amd64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/arm/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/bsdsrc/b_tgamma.c#4 integrate
.. //depot/projects/wifi/lib/msun/i387/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/ia64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/powerpc/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/sparc64/Symbol.map#2 integrate
.. //depot/projects/wifi/lib/msun/src/e_lgamma_r.c#3 integrate
.. //depot/projects/wifi/lib/msun/src/e_lgammaf_r.c#3 integrate
.. //depot/projects/wifi/libexec/pppoed/pppoed.c#3 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Makefile#7 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Symbol.map#3 integrate
.. //depot/projects/wifi/libexec/rtld-elf/Versions.def#3 delete
.. //depot/projects/wifi/libexec/rtld-elf/i386/Symbol.map#3 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate
.. //depot/projects/wifi/sbin/fdisk/fdisk.8#3 integrate
.. //depot/projects/wifi/sbin/fdisk/fdisk.c#8 integrate
.. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.8#4 integrate
.. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.c#7 integrate
.. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#9 integrate
.. //depot/projects/wifi/sbin/ipfw/ipfw.8#21 integrate
.. //depot/projects/wifi/sbin/ipfw/ipfw2.c#18 integrate
.. //depot/projects/wifi/sbin/mdmfs/mdmfs.c#10 integrate
.. //depot/projects/wifi/share/examples/Makefile#7 integrate
.. //depot/projects/wifi/share/examples/netgraph/bluetooth/rc.bluetooth#3 delete
.. //depot/projects/wifi/share/man/man4/Makefile#34 integrate
.. //depot/projects/wifi/share/man/man4/led.4#6 integrate
.. //depot/projects/wifi/share/man/man4/uftdi.4#6 integrate
.. //depot/projects/wifi/share/man/man4/vlan.4#12 integrate
.. //depot/projects/wifi/share/man/man9/rman.9#5 integrate
.. //depot/projects/wifi/share/misc/bsd-family-tree#16 integrate
.. //depot/projects/wifi/share/misc/committers-ports.dot#4 integrate
.. //depot/projects/wifi/share/misc/committers-src.dot#4 integrate
.. //depot/projects/wifi/share/misc/organization.dot#2 integrate
.. //depot/projects/wifi/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/wifi/share/mk/version_gen.awk#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#14 integrate
.. //depot/projects/wifi/sys/amd64/amd64/mptable_pci.c#6 integrate
.. //depot/projects/wifi/sys/amd64/amd64/msi.c#4 integrate
.. //depot/projects/wifi/sys/amd64/amd64/nexus.c#11 integrate
.. //depot/projects/wifi/sys/amd64/amd64/pmap.c#18 integrate
.. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#14 integrate
.. //depot/projects/wifi/sys/amd64/include/intr_machdep.h#10 integrate
.. //depot/projects/wifi/sys/amd64/pci/pci_bus.c#9 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#16 integrate
.. //depot/projects/wifi/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/wifi/sys/cam/cam_xpt.c#19 integrate
.. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#13 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#14 integrate
.. //depot/projects/wifi/sys/compat/linprocfs/linprocfs.c#16 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/wifi/sys/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/wifi/sys/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/wifi/sys/conf/files#45 integrate
.. //depot/projects/wifi/sys/conf/kern.pre.mk#15 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#11 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi.c#23 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_pci.c#8 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-disk.c#17 integrate
.. //depot/projects/wifi/sys/dev/ata/atapi-cam.c#12 integrate
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#139 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bce.c#6 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/wifi/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/wifi/sys/dev/bge/if_bge.c#23 integrate
.. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#15 integrate
.. //depot/projects/wifi/sys/dev/ciss/ciss.c#17 integrate
.. //depot/projects/wifi/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/wifi/sys/dev/em/LICENSE#4 integrate
.. //depot/projects/wifi/sys/dev/em/README#7 integrate
.. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82540.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82541.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82541.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82542.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82543.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82543.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82571.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82571.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82575.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_82575.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_api.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_api.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_defines.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_hw.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_mac.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_mac.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_manage.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_manage.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_nvm.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_nvm.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_osdep.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_phy.c#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_phy.h#1 branch
.. //depot/projects/wifi/sys/dev/em/e1000_regs.h#1 branch
.. //depot/projects/wifi/sys/dev/em/if_em.c#21 integrate
.. //depot/projects/wifi/sys/dev/em/if_em.h#11 integrate
.. //depot/projects/wifi/sys/dev/em/if_em_hw.c#6 delete
.. //depot/projects/wifi/sys/dev/em/if_em_hw.h#7 delete
.. //depot/projects/wifi/sys/dev/em/if_em_osdep.h#7 delete
.. //depot/projects/wifi/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/wifi/sys/dev/firewire/firewire.h#3 integrate
.. //depot/projects/wifi/sys/dev/firewire/firewirereg.h#5 integrate
.. //depot/projects/wifi/sys/dev/firewire/fwdev.c#7 integrate
.. //depot/projects/wifi/sys/dev/firewire/fwohci.c#6 integrate
.. //depot/projects/wifi/sys/dev/firewire/fwohcireg.h#4 integrate
.. //depot/projects/wifi/sys/dev/firewire/if_fwip.c#9 integrate
.. //depot/projects/wifi/sys/dev/firewire/sbp.c#8 integrate
.. //depot/projects/wifi/sys/dev/firewire/sbp_targ.c#5 integrate
.. //depot/projects/wifi/sys/dev/gem/if_gem.c#12 integrate
.. //depot/projects/wifi/sys/dev/gem/if_gem_pci.c#7 integrate
.. //depot/projects/wifi/sys/dev/gem/if_gemvar.h#6 integrate
.. //depot/projects/wifi/sys/dev/hme/if_hme.c#14 integrate
.. //depot/projects/wifi/sys/dev/ipmi/ipmi_smbios.c#3 integrate
.. //depot/projects/wifi/sys/dev/led/led.c#4 integrate
.. //depot/projects/wifi/sys/dev/led/led.h#2 integrate
.. //depot/projects/wifi/sys/dev/mii/brgphy.c#14 integrate
.. //depot/projects/wifi/sys/dev/mii/mii.c#9 integrate
.. //depot/projects/wifi/sys/dev/msk/if_msk.c#6 integrate
.. //depot/projects/wifi/sys/dev/msk/if_mskreg.h#3 integrate
.. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#6 integrate
.. //depot/projects/wifi/sys/dev/pci/pci.c#27 integrate
.. //depot/projects/wifi/sys/dev/pci/pci_if.m#6 integrate
.. //depot/projects/wifi/sys/dev/pci/pci_pci.c#12 integrate
.. //depot/projects/wifi/sys/dev/pci/pci_private.h#7 integrate
.. //depot/projects/wifi/sys/dev/pci/pcib_if.m#6 integrate
.. //depot/projects/wifi/sys/dev/pci/pcib_private.h#6 integrate
.. //depot/projects/wifi/sys/dev/pci/pcireg.h#15 integrate
.. //depot/projects/wifi/sys/dev/pci/pcivar.h#9 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/emu10kx.c#5 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#7 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac_private.h#4 integrate
.. //depot/projects/wifi/sys/dev/sound/pci/ich.c#14 integrate
.. //depot/projects/wifi/sys/dev/stge/if_stge.c#5 integrate
.. //depot/projects/wifi/sys/dev/stge/if_stgereg.h#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_kbd_sun.c#10 integrate
.. //depot/projects/wifi/sys/dev/usb/if_axe.c#15 integrate
.. //depot/projects/wifi/sys/dev/usb/if_axereg.h#9 integrate
.. //depot/projects/wifi/sys/dev/usb/if_ural.c#23 integrate
.. //depot/projects/wifi/sys/dev/usb/uftdi.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_devs.c#12 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#33 integrate
.. //depot/projects/wifi/sys/fs/procfs/procfs_ioctl.c#5 integrate
.. //depot/projects/wifi/sys/fs/procfs/procfs_map.c#5 integrate
.. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate
.. //depot/projects/wifi/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/wifi/sys/geom/uzip/g_uzip.c#7 integrate
.. //depot/projects/wifi/sys/i386/i386/local_apic.c#17 integrate
.. //depot/projects/wifi/sys/i386/i386/mptable_pci.c#6 integrate
.. //depot/projects/wifi/sys/i386/i386/msi.c#4 integrate
.. //depot/projects/wifi/sys/i386/i386/nexus.c#10 integrate
.. //depot/projects/wifi/sys/i386/i386/pmap.c#22 integrate
.. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#13 integrate
.. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#21 integrate
.. //depot/projects/wifi/sys/i386/include/intr_machdep.h#11 integrate
.. //depot/projects/wifi/sys/i386/pci/pci_bus.c#9 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#25 integrate
.. //depot/projects/wifi/sys/kern/kern_linker.c#8 integrate
.. //depot/projects/wifi/sys/kern/kern_time.c#12 integrate
.. //depot/projects/wifi/sys/kern/kern_uuid.c#6 integrate
.. //depot/projects/wifi/sys/kern/subr_rman.c#12 integrate
.. //depot/projects/wifi/sys/kern/sys_generic.c#15 integrate
.. //depot/projects/wifi/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/wifi/sys/kern/uipc_sockbuf.c#4 integrate
.. //depot/projects/wifi/sys/kern/uipc_socket.c#27 integrate
.. //depot/projects/wifi/sys/kern/uipc_syscalls.c#23 integrate
.. //depot/projects/wifi/sys/kern/vfs_bio.c#23 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/wifi/sys/kern/vfs_syscalls.c#22 integrate
.. //depot/projects/wifi/sys/modules/em/Makefile#3 integrate
.. //depot/projects/wifi/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/wifi/sys/net/if.h#10 integrate
.. //depot/projects/wifi/sys/net/if_lagg.c#2 integrate
.. //depot/projects/wifi/sys/net/if_lagg.h#2 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/wifi/sys/netgraph/ng_l2tp.c#4 integrate
.. //depot/projects/wifi/sys/netgraph/ng_mppc.c#5 integrate
.. //depot/projects/wifi/sys/netinet/in_pcb.c#14 integrate
.. //depot/projects/wifi/sys/netinet/in_pcb.h#9 integrate
.. //depot/projects/wifi/sys/netinet/ip_divert.c#13 integrate
.. //depot/projects/wifi/sys/netinet/ip_fw.h#13 integrate
.. //depot/projects/wifi/sys/netinet/ip_fw2.c#25 integrate
.. //depot/projects/wifi/sys/netinet/libalias/alias_proxy.c#6 integrate
.. //depot/projects/wifi/sys/netinet/raw_ip.c#14 integrate
.. //depot/projects/wifi/sys/netinet/sctp.h#3 integrate
.. //depot/projects/wifi/sys/netinet/sctp_auth.c#5 integrate
.. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#4 integrate
.. //depot/projects/wifi/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_header.h#3 integrate
.. //depot/projects/wifi/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_indata.h#3 integrate
.. //depot/projects/wifi/sys/netinet/sctp_input.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_pcb.h#4 integrate
.. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_structs.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_uio.h#6 integrate
.. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/wifi/sys/netinet/sctputil.h#6 integrate
.. //depot/projects/wifi/sys/netinet/tcp_debug.c#3 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#23 integrate
.. //depot/projects/wifi/sys/netinet/tcp_subr.c#27 integrate
.. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#24 integrate
.. //depot/projects/wifi/sys/netinet/tcp_var.h#18 integrate
.. //depot/projects/wifi/sys/netinet/udp_usrreq.c#17 integrate
.. //depot/projects/wifi/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/wifi/sys/netinet6/in6_src.c#10 integrate
.. //depot/projects/wifi/sys/netinet6/nd6.c#12 integrate
.. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#12 integrate
.. //depot/projects/wifi/sys/netinet6/route6.c#4 integrate
.. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#6 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#17 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#25 integrate
.. //depot/projects/wifi/sys/nfsserver/nfs_syscalls.c#10 integrate
.. //depot/projects/wifi/sys/pci/if_vr.c#14 integrate
.. //depot/projects/wifi/sys/pci/if_vrreg.h#8 integrate
.. //depot/projects/wifi/sys/security/audit/audit_ioctl.h#3 integrate
.. //depot/projects/wifi/sys/security/mac/mac_framework.h#4 integrate
.. //depot/projects/wifi/sys/security/mac/mac_inet.c#4 integrate
.. //depot/projects/wifi/sys/security/mac/mac_net.c#4 integrate
.. //depot/projects/wifi/sys/security/mac/mac_pipe.c#4 integrate
.. //depot/projects/wifi/sys/security/mac/mac_policy.h#4 integrate
.. //depot/projects/wifi/sys/security/mac/mac_process.c#6 integrate
.. //depot/projects/wifi/sys/security/mac/mac_socket.c#5 integrate
.. //depot/projects/wifi/sys/security/mac/mac_system.c#5 integrate
.. //depot/projects/wifi/sys/security/mac/mac_vfs.c#9 integrate
.. //depot/projects/wifi/sys/security/mac_biba/mac_biba.c#13 integrate
.. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate
.. //depot/projects/wifi/sys/security/mac_ifoff/mac_ifoff.c#4 integrate
.. //depot/projects/wifi/sys/security/mac_lomac/mac_lomac.c#10 integrate
.. //depot/projects/wifi/sys/security/mac_mls/mac_mls.c#11 integrate
.. //depot/projects/wifi/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/wifi/sys/security/mac_portacl/mac_portacl.c#7 integrate
.. //depot/projects/wifi/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate
.. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#13 integrate
.. //depot/projects/wifi/sys/security/mac_test/mac_test.c#12 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#13 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/upa.c#4 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#12 integrate
.. //depot/projects/wifi/sys/sys/ioctl_compat.h#4 integrate
.. //depot/projects/wifi/sys/sys/mount.h#21 integrate
.. //depot/projects/wifi/sys/sys/param.h#26 integrate
.. //depot/projects/wifi/sys/sys/proc.h#28 integrate
.. //depot/projects/wifi/sys/sys/socketvar.h#13 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#20 integrate
.. //depot/projects/wifi/sys/vm/swap_pager.c#16 integrate
.. //depot/projects/wifi/sys/vm/vm_map.c#15 integrate
.. //depot/projects/wifi/tools/regression/netinet6/inet6_rth/Makefile#1 branch
.. //depot/projects/wifi/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch
.. //depot/projects/wifi/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch
.. //depot/projects/wifi/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch
.. //depot/projects/wifi/tools/sched/schedgraph.py#6 integrate
.. //depot/projects/wifi/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate
.. //depot/projects/wifi/tools/tools/recoverdisk/recoverdisk.c#4 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#22 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.usholiday#2 integrate
.. //depot/projects/wifi/usr.bin/du/du.c#5 integrate
.. //depot/projects/wifi/usr.bin/env/env.c#3 integrate
.. //depot/projects/wifi/usr.bin/lastcomm/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/lastcomm/lastcomm.c#5 integrate
.. //depot/projects/wifi/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/wifi/usr.bin/login/login.c#5 integrate
.. //depot/projects/wifi/usr.bin/netstat/inet.c#8 integrate
.. //depot/projects/wifi/usr.bin/quota/quota.c#6 integrate
.. //depot/projects/wifi/usr.bin/stat/stat.1#4 integrate
.. //depot/projects/wifi/usr.bin/su/su.c#5 integrate
.. //depot/projects/wifi/usr.bin/tar/write.c#15 integrate
.. //depot/projects/wifi/usr.sbin/pciconf/cap.c#2 integrate
.. //depot/projects/wifi/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.8#6 integrate
.. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#11 integrate
.. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.h#3 integrate
.. //depot/projects/wifi/usr.sbin/pstat/pstat.c#8 integrate
.. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.8#5 integrate
.. //depot/projects/wifi/usr.sbin/rpcbind/rpcbind.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sade/main.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sade/variable.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/main.c#4 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/variable.c#2 integrate
.. //depot/projects/wifi/usr.sbin/traceroute6/traceroute6.c#3 integrate
.. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 integrate
Differences ...
==== //depot/projects/wifi/MAINTAINERS#15 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $
+$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -128,6 +128,7 @@
usr.sbin/bluetooth emax Pre-commit review preferred.
gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports.
+usb core Please contact core@ before any major changes
Following are the entries from the Makefiles, and a few other sources.
Please remove stale entries from both their origin, and this file.
==== //depot/projects/wifi/ObsoleteFiles.inc#14 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.80 2007/04/20 23:47:30 brueffer Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20070423: rc.bluetooth (examples) removed
+OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
# 20070421: worm.4 removed
OLD_FILES+=usr/share/man/man4/worm.4.gz
# 20070417: trunk(4) renamed to lagg(4)
==== //depot/projects/wifi/UPDATING#28 (text+ko) ====
@@ -21,6 +21,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20070423:
+ The ABI breakage in sendmail(8)'s libmilter has been repaired
+ so it is no longer necessary to recompile mail filters (aka,
+ milters). If you recompiled mail filters after the 20070408
+ note, it is not necessary to recompile them again.
+
20070417:
The new trunk(4) driver has been renamed to lagg(4) as it better
reflects its purpose. ifconfig will need to be recompiled.
@@ -767,4 +773,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $
+$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $
==== //depot/projects/wifi/bin/df/df.c#6 (text+ko) ====
@@ -44,7 +44,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.70 2007/05/01 16:02:44 ache Exp $");
#include <sys/param.h>
#include <sys/stat.h>
==== //depot/projects/wifi/bin/sh/var.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.32 2006/06/15 07:00:49 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.35 2007/05/01 16:02:43 ache Exp $");
#include <unistd.h>
#include <stdlib.h>
==== //depot/projects/wifi/compat/opensolaris/misc/fsshare.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.1 2007/04/06 01:08:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $");
#include <sys/param.h>
#include <stdio.h>
@@ -99,21 +99,30 @@
/*
* Function translate options to a format acceptable by exports(5), eg.
*
- * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0
+ * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org 69.147.83.54
*
* Accepted input formats:
*
- * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0
- * ro network=192.168.0.0 mask=255.255.255.0 maproot=0
- * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0
- * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0
+ * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0,freefall.freebsd.org
+ * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 freefall.freebsd.org
+ * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0,freefall.freebsd.org
+ * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org
+ *
+ * Recognized keywords:
+ *
+ * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet
+ *
*/
+static const char *known_opts[] = { "ro", "maproot", "mapall", "mask",
+ "network", "alldirs", "public", "webnfs", "index", "quiet", NULL };
static char *
translate_opts(const char *shareopts)
{
static char newopts[OPTSSIZE];
- char oldopts[OPTSSIZE], opt[64];
+ char oldopts[OPTSSIZE];
char *o, *s = NULL;
+ unsigned int i;
+ size_t len;
strlcpy(oldopts, shareopts, sizeof(oldopts));
newopts[0] = '\0';
@@ -121,8 +130,16 @@
while ((o = strsep(&s, "-, ")) != NULL) {
if (o[0] == '\0')
continue;
- snprintf(opt, sizeof(opt), "-%s ", o);
- strlcat(newopts, opt, sizeof(newopts));
+ for (i = 0; known_opts[i] != NULL; i++) {
+ len = strlen(known_opts[i]);
+ if (strncmp(known_opts[i], o, len) == 0 &&
+ (o[len] == '\0' || o[len] == '=')) {
+ strlcat(newopts, "-", sizeof(newopts));
+ break;
+ }
+ }
+ strlcat(newopts, o, sizeof(newopts));
+ strlcat(newopts, " ", sizeof(newopts));
}
return (newopts);
}
==== //depot/projects/wifi/contrib/gdb/gdb/ppcfbsd-nat.c#2 (text+ko) ====
@@ -143,11 +143,23 @@
}
void
+supply_gregset (char *regs)
+{
+ ppcfbsd_supply_reg (regs, -1);
+}
+
+void
fill_fpregset (char *fpregs, int regnum)
{
ppcfbsd_fill_fpreg (fpregs, regnum);
}
+void
+supply_fpregset (char *fpregs)
+{
+ ppcfbsd_supply_fpreg (fpregs, -1);
+}
+
/* Provide a prototype to silence -Wmissing-prototypes. */
void _initialize_ppcfbsd_nat (void);
==== //depot/projects/wifi/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ====
@@ -932,11 +932,11 @@
if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6)
(void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)",
- zio_checksum_table[doi.doi_checksum].ci_name);
+ zio_checksum_table[doi.doi_checksum].ci_name);
if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6)
(void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)",
- zio_compress_table[doi.doi_compress].ci_name);
+ zio_compress_table[doi.doi_compress].ci_name);
(void) printf("%10lld %3u %5s %5s %5s %5s %s%s\n",
(u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize,
@@ -1441,7 +1441,7 @@
(u_longlong_t)zb->zb_objset,
(u_longlong_t)zb->zb_object,
(u_longlong_t)blkid2offset(bc->bc_dnode,
- zb->zb_level, zb->zb_blkid),
+ zb->zb_level, zb->zb_blkid),
blkbuf);
}
@@ -1951,8 +1951,8 @@
spa_close(spa, (void *)zdb_read_block);
error = spa_open(spa_name, spap, (void *)zdb_read_block);
if (error)
- fatal("Failed to open pool '%s': errno = %d\n",
- spa_name, error);
+ fatal("Failed to open pool '%s': %s",
+ spa_name, strerror(error));
spa = *spap;
}
@@ -2156,7 +2156,7 @@
}
if (error)
- fatal("can't open %s: error %d", argv[0], error);
+ fatal("can't open %s: %s", argv[0], strerror(error));
argv++;
if (--argc > 0) {
==== //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 (text+ko) ====
@@ -339,22 +339,15 @@
changelist_free(prop_changelist_t *clp)
{
prop_changenode_t *cn;
- uu_list_walk_t *walk;
+ void *cookie;
if (clp->cl_list) {
- verify((walk = uu_list_walk_start(clp->cl_list,
- UU_WALK_ROBUST)) != NULL);
-
- while ((cn = uu_list_walk_next(walk)) != NULL) {
-
- uu_list_remove(clp->cl_list, cn);
-
+ cookie = NULL;
+ while ((cn = uu_list_teardown(clp->cl_list, &cookie)) != NULL) {
zfs_close(cn->cn_handle);
free(cn);
}
- uu_list_walk_end(walk);
-
uu_list_destroy(clp->cl_list);
}
if (clp->cl_pool)
@@ -418,7 +411,7 @@
} else {
ASSERT(!clp->cl_alldependents);
verify(uu_list_insert_before(clp->cl_list,
- uu_list_first(clp->cl_list), cn) == 0);
+ uu_list_first(clp->cl_list), cn) == 0);
}
if (!clp->cl_alldependents)
==== //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 (text+ko) ====
@@ -74,22 +74,16 @@
namespace_clear(libzfs_handle_t *hdl)
{
if (hdl->libzfs_ns_avl) {
- uu_avl_walk_t *walk;
config_node_t *cn;
+ void *cookie = NULL;
- if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl,
- UU_WALK_ROBUST)) == NULL)
- return;
-
- while ((cn = uu_avl_walk_next(walk)) != NULL) {
- uu_avl_remove(hdl->libzfs_ns_avl, cn);
+ while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl,
+ &cookie)) != NULL) {
nvlist_free(cn->cn_config);
free(cn->cn_name);
free(cn);
}
- uu_avl_walk_end(walk);
-
uu_avl_destroy(hdl->libzfs_ns_avl);
hdl->libzfs_ns_avl = NULL;
}
@@ -110,7 +104,7 @@
config_node_t *cn;
nvpair_t *elem;
zfs_cmd_t zc = { 0 };
- uu_avl_walk_t *walk;
+ void *cookie;
if (hdl->libzfs_ns_gen == 0) {
/*
@@ -172,21 +166,13 @@
/*
* Clear out any existing configuration information.
*/
- if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl,
- UU_WALK_ROBUST)) == NULL) {
- nvlist_free(config);
- return (no_memory(hdl));
- }
-
- while ((cn = uu_avl_walk_next(walk)) != NULL) {
- uu_avl_remove(hdl->libzfs_ns_avl, cn);
+ cookie = NULL;
+ while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, &cookie)) != NULL) {
nvlist_free(cn->cn_config);
free(cn->cn_name);
free(cn);
}
- uu_avl_walk_end(walk);
-
elem = NULL;
while ((elem = nvlist_next_nvpair(config, elem)) != NULL) {
nvlist_t *child;
@@ -222,7 +208,7 @@
}
/*
- * Retrive the configuration for the given pool. The configuration is a nvlist
+ * Retrieve the configuration for the given pool. The configuration is a nvlist
* describing the vdevs, as well as the statistics associated with each one.
*/
nvlist_t *
==== //depot/projects/wifi/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ====
@@ -220,7 +220,7 @@
&state) == 0 && state == POOL_STATE_SPARE &&
nvlist_lookup_uint64(config, ZPOOL_CONFIG_GUID, &vdev_guid) == 0) {
if ((ne = zfs_alloc(hdl, sizeof (name_entry_t))) == NULL)
- return (-1);
+ return (-1);
if ((ne->ne_name = zfs_strdup(hdl, path)) == NULL) {
free(ne);
@@ -748,7 +748,6 @@
zpool_find_import(libzfs_handle_t *hdl, int argc, char **argv)
{
int i;
- DIR *dirp;
char path[MAXPATHLEN];
nvlist_t *ret = NULL, *config;
int fd;
@@ -824,7 +823,6 @@
free(ne);
}
-
return (ret);
}
==== //depot/projects/wifi/contrib/sendmail/libmilter/engine.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -855,6 +855,7 @@
;
if (g->a_ctx->ctx_smfi != NULL &&
+ g->a_ctx->ctx_smfi->xxfi_version > 4 &&
(fi_negotiate = g->a_ctx->ctx_smfi->xxfi_negotiate) != NULL)
{
int r;
@@ -1177,6 +1178,7 @@
if (g == NULL)
return _SMFIS_ABORT;
if (g->a_ctx->ctx_smfi != NULL &&
+ g->a_ctx->ctx_smfi->xxfi_version > 3 &&
(fi_data = g->a_ctx->ctx_smfi->xxfi_data) != NULL)
return (*fi_data)(g->a_ctx);
return SMFIS_CONTINUE;
@@ -1310,6 +1312,7 @@
if (g == NULL)
return _SMFIS_ABORT;
if (g->a_ctx->ctx_smfi != NULL &&
+ g->a_ctx->ctx_smfi->xxfi_version > 2 &&
(fi_unknown = g->a_ctx->ctx_smfi->xxfi_unknown) != NULL)
return (*fi_unknown)(g->a_ctx, (const char *) g->a_buf);
return SMFIS_CONTINUE;
==== //depot/projects/wifi/contrib/sendmail/libmilter/listener.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -927,9 +927,9 @@
ctx->ctx_pflags |= SMFIP_NOEOH;
if (smfi->xxfi_body == NULL)
ctx->ctx_pflags |= SMFIP_NOBODY;
- if (smfi->xxfi_data == NULL)
+ if (smfi->xxfi_version <= 3 || smfi->xxfi_data == NULL)
ctx->ctx_pflags |= SMFIP_NODATA;
- if (smfi->xxfi_unknown == NULL)
+ if (smfi->xxfi_version <= 2 || smfi->xxfi_unknown == NULL)
ctx->ctx_pflags |= SMFIP_NOUNKNOWN;
#if _FFR_WORKERS_POOL
==== //depot/projects/wifi/contrib/sendmail/libmilter/main.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006, 2007 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -52,7 +52,10 @@
(void) sm_strlcpy(smfi->xxfi_name, smfilter.xxfi_name, len);
/* compare milter version with hard coded version */
- if (smfi->xxfi_version != SMFI_VERSION)
+ if (smfi->xxfi_version != SMFI_VERSION &&
+ smfi->xxfi_version != 2 &&
+ smfi->xxfi_version != 3 &&
+ smfi->xxfi_version != 4)
{
/* hard failure for now! */
smi_log(SMI_LOG_ERR,
==== //depot/projects/wifi/contrib/top/commands.c#5 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/commands.c,v 1.13 2007/04/17 03:12:39 rafan Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.15 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -73,7 +73,7 @@
e - list errors generated by last \"kill\" or \"renice\" command\n\
H - toggle the displaying of threads\n\
i or I - toggle the displaying of idle processes\n\
-j - toggle the displaying of jail id\n\
+j - toggle the displaying of jail ID\n\
k - kill processes; send a signal to a list of processes\n\
m - toggle the display between 'cpu' and 'io' modes\n\
n or # - change number of processes to display\n", stdout);
@@ -89,6 +89,7 @@
r - renice a process\n\
s - change number of seconds to delay between updates\n\
S - toggle the displaying of system processes\n\
+a - toggle the displaying of process titles\n\
t - toggle the display of this process\n\
u - display processes for only one user (+ selects all users)\n\
\n\
==== //depot/projects/wifi/contrib/top/machine.h#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/machine.h,v 1.8 2007/04/17 03:12:39 rafan Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -62,7 +62,7 @@
int thread; /* show threads */
int uid; /* only this uid (unless uid == -1) */
int wcpu; /* show weighted cpu */
- int jail; /* show jail id */
+ int jail; /* show jail ID */
char *command; /* only this command (unless == NULL) */
};
==== //depot/projects/wifi/contrib/top/top.X#6 (text+ko) ====
@@ -1,6 +1,6 @@
.\" NOTE: changes to the manual page for "top" should be made in the
.\" file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.18 2007/04/17 03:12:39 rafan Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $
.nr N %topn%
.nr D %delay%
.TH TOP 1 Local
@@ -105,7 +105,7 @@
.B \-j
Display the
.IR jail (8)
-id.
+ID.
.TP
.B \-t
Do not display the
@@ -255,6 +255,9 @@
.B S
Toggle the display of system processes.
.TP
+.B a
+Toggle the display of process titles.
+.TP
.B k
Send a signal (\*(lqkill\*(rq by default) to a list of processes. This
acts similarly to the command
@@ -291,7 +294,7 @@
.B j
Toggle the display of
.IR jail (8)
-id.
+ID.
.TP
.B t
Toggle the display of the
==== //depot/projects/wifi/contrib/top/top.c#6 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -1064,7 +1064,7 @@
case CMD_jidtog:
ps.jail = !ps.jail;
new_message(MT_standout | MT_delayed,
- " %sisplaying jail id.",
+ " %sisplaying jail ID.",
ps.jail ? "D" : "Not d");
header_text = format_header(uname_field);
reset_display();
==== //depot/projects/wifi/contrib/traceroute/traceroute.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.33 2007/04/30 19:08:12 maxim Exp $";
#endif
/*
@@ -630,7 +630,7 @@
case 'w':
waittime = str2val(optarg, "wait time",
- 2, 24 * 60 * 60);
+ 1, 24 * 60 * 60);
break;
case 'z':
==== //depot/projects/wifi/etc/rc.d/netoptions#3 (text+ko) ====
@@ -1,17 +1,17 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.142 2007/04/09 10:09:39 des Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $
#
# PROVIDE: netoptions
-# REQUIRE: localpkg
+# REQUIRE: FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
load_rc_config 'XXX'
-echo -n 'Additional TCP options:'
+echo -n 'Additional IP options:'
case ${log_in_vain} in
[Nn][Oo] | '')
log_in_vain=0
@@ -32,4 +32,46 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list