PERFORCE change 154679 for review
Sam Leffler
sam at FreeBSD.org
Sun Dec 14 19:30:40 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=154679
Change 154679 by sam at sam_ebb on 2008/12/15 03:30:08
IFC @ 154678
Affected files ...
.. //depot/projects/vap/UPDATING#25 integrate
.. //depot/projects/vap/contrib/binutils/bfd/config.bfd#3 integrate
.. //depot/projects/vap/contrib/binutils/gas/config/tc-mips.c#2 integrate
.. //depot/projects/vap/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch
.. //depot/projects/vap/etc/regdomain.xml#8 integrate
.. //depot/projects/vap/gnu/usr.bin/binutils/as/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch
.. //depot/projects/vap/gnu/usr.bin/binutils/libbfd/bfd.h#3 integrate
.. //depot/projects/vap/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch
.. //depot/projects/vap/gnu/usr.bin/cc/libiberty/config.h#3 integrate
.. //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate
.. //depot/projects/vap/gnu/usr.bin/sort/config.h#5 integrate
.. //depot/projects/vap/include/arpa/nameser.h#3 integrate
.. //depot/projects/vap/include/resolv.h#3 integrate
.. //depot/projects/vap/include/string.h#4 integrate
.. //depot/projects/vap/kerberos5/include/config.h#4 integrate
.. //depot/projects/vap/lib/bind/bind/port_after.h#3 integrate
.. //depot/projects/vap/lib/libarchive/test/main.c#9 integrate
.. //depot/projects/vap/lib/libc/include/isc/eventlib.h#3 integrate
.. //depot/projects/vap/lib/libc/include/isc/platform.h#1 branch
.. //depot/projects/vap/lib/libc/inet/inet_net_pton.c#3 integrate
.. //depot/projects/vap/lib/libc/net/rcmd.3#3 integrate
.. //depot/projects/vap/lib/libc/resolv/res_debug.c#3 integrate
.. //depot/projects/vap/lib/libc/resolv/res_mkquery.c#3 integrate
.. //depot/projects/vap/lib/libc/resolv/res_query.c#3 integrate
.. //depot/projects/vap/lib/libc/resolv/res_send.c#3 integrate
.. //depot/projects/vap/lib/libc/stdio/vfprintf.c#5 integrate
.. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#7 integrate
.. //depot/projects/vap/lib/libc/string/strdup.3#4 integrate
.. //depot/projects/vap/lib/libmagic/config.h#4 integrate
.. //depot/projects/vap/lib/libpmc/pmc.core.3#3 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#7 integrate
.. //depot/projects/vap/lib/libutil/Makefile#8 integrate
.. //depot/projects/vap/lib/libutil/kinfo_getfile.3#1 branch
.. //depot/projects/vap/lib/libutil/kinfo_getvmmap.3#1 branch
.. //depot/projects/vap/sbin/atacontrol/atacontrol.8#5 integrate
.. //depot/projects/vap/sbin/devd/devd.cc#3 integrate
.. //depot/projects/vap/sbin/devd/devd.conf.5#3 integrate
.. //depot/projects/vap/sbin/geom/misc/subr.c#4 integrate
.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#34 integrate
.. //depot/projects/vap/sbin/ifconfig/ifvlan.c#9 integrate
.. //depot/projects/vap/sbin/ifconfig/regdomain.c#12 integrate
.. //depot/projects/vap/sbin/ifconfig/regdomain.h#4 integrate
.. //depot/projects/vap/sbin/newfs/newfs.c#5 integrate
.. //depot/projects/vap/share/man/man4/acpi_aiboost.4#2 integrate
.. //depot/projects/vap/share/man/man4/cxgb.4#3 integrate
.. //depot/projects/vap/share/man/man4/ddb.4#15 integrate
.. //depot/projects/vap/share/man/man4/man4.powerpc/Makefile#4 integrate
.. //depot/projects/vap/share/man/man4/man4.powerpc/pmu.4#1 branch
.. //depot/projects/vap/share/man/man9/Makefile#18 integrate
.. //depot/projects/vap/share/man/man9/VOP_VPTOCNP.9#1 branch
.. //depot/projects/vap/share/man/man9/ifnet.9#3 integrate
.. //depot/projects/vap/sys/amd64/amd64/exception.S#9 integrate
.. //depot/projects/vap/sys/amd64/amd64/genassym.c#9 integrate
.. //depot/projects/vap/sys/amd64/amd64/identcpu.c#15 integrate
.. //depot/projects/vap/sys/amd64/amd64/local_apic.c#12 integrate
.. //depot/projects/vap/sys/amd64/include/apicreg.h#4 integrate
.. //depot/projects/vap/sys/amd64/include/apicvar.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/specialreg.h#13 integrate
.. //depot/projects/vap/sys/boot/Makefile#10 integrate
.. //depot/projects/vap/sys/boot/forth/support.4th#6 integrate
.. //depot/projects/vap/sys/boot/i386/boot0/boot0.S#8 integrate
.. //depot/projects/vap/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate
.. //depot/projects/vap/sys/boot/zfs/zfs.c#2 integrate
.. //depot/projects/vap/sys/boot/zfs/zfsimpl.c#2 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#18 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_signal.h#3 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate
.. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#18 integrate
.. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#15 integrate
.. //depot/projects/vap/sys/conf/files#62 integrate
.. //depot/projects/vap/sys/conf/options#35 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf_if.c#10 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf_subr.c#8 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf_table.c#5 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi_smbat.c#3 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ah_internal.h#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate
.. //depot/projects/vap/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#130 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#42 integrate
.. //depot/projects/vap/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/vap/sys/dev/dc/if_dc.c#7 integrate
.. //depot/projects/vap/sys/dev/dc/if_dcreg.h#5 integrate
.. //depot/projects/vap/sys/dev/e1000/if_em.c#4 integrate
.. //depot/projects/vap/sys/dev/fxp/if_fxp.c#9 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#11 integrate
.. //depot/projects/vap/sys/dev/mfi/mfi_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/pccbb/pccbb.c#8 integrate
.. //depot/projects/vap/sys/dev/pccbb/pccbb_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/re/if_re.c#18 integrate
.. //depot/projects/vap/sys/dev/sis/if_sis.c#3 integrate
.. //depot/projects/vap/sys/dev/sis/if_sisreg.h#2 integrate
.. //depot/projects/vap/sys/dev/snp/snp.c#11 integrate
.. //depot/projects/vap/sys/dev/usb/ucom.c#12 integrate
.. //depot/projects/vap/sys/dev/usb/ucomvar.h#9 integrate
.. //depot/projects/vap/sys/dev/usb/uftdi.c#8 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#36 integrate
.. //depot/projects/vap/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/at91dci.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/ehci2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/ehci2_pci.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/musb2_otg.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/ohci2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/uhci2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/usb2_controller.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/controller/uss820dci.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_busdma.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_busdma.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_config_td.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_config_td.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_core.h#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_debug.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.h#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_device.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_device.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_dynamic.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_dynamic.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_error.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_generic.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_handle_request.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_hid.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_hub.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_hub.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_lookup.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_mbuf.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.h#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_parse.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_process.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_process.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_request.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_request.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_transfer.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_transfer.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/core/usb2_util.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_aue2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_axe2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_cue2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_kue2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_rue2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/if_udav2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/image/uscanner2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/include/usb2_devid.h#3 integrate
.. //depot/projects/vap/sys/dev/usb2/include/usb2_devtable.h#3 integrate
.. //depot/projects/vap/sys/dev/usb2/input/uhid2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/input/ukbd2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/input/ums2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/misc/udbp2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/misc/ufm2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uark2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ubsa2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ubser2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uchcom2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ucycom2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ufoma2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uftdi2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ugensa2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uipaq2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/ulpt2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/umct2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/umodem2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/umoscom2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uplcom2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/usb2_serial.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/usb2_serial.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uvisor2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/serial/uvscom2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/sound/uaudio2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/sound/uaudio2.h#2 integrate
.. //depot/projects/vap/sys/dev/usb2/storage/ata-usb2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/storage/umass2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/storage/urio2.c#3 integrate
.. //depot/projects/vap/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/template/usb2_template.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/wlan/if_rum2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/wlan/if_ural2.c#2 integrate
.. //depot/projects/vap/sys/dev/usb2/wlan/if_zyd2.c#2 integrate
.. //depot/projects/vap/sys/dev/vr/if_vr.c#4 integrate
.. //depot/projects/vap/sys/fs/deadfs/dead_vnops.c#6 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/vap/sys/fs/procfs/procfs_map.c#8 integrate
.. //depot/projects/vap/sys/geom/geom_subr.c#11 integrate
.. //depot/projects/vap/sys/i386/i386/exception.s#7 integrate
.. //depot/projects/vap/sys/i386/i386/genassym.c#8 integrate
.. //depot/projects/vap/sys/i386/i386/identcpu.c#15 integrate
.. //depot/projects/vap/sys/i386/i386/local_apic.c#13 integrate
.. //depot/projects/vap/sys/i386/include/apicreg.h#3 integrate
.. //depot/projects/vap/sys/i386/include/apicvar.h#8 integrate
.. //depot/projects/vap/sys/i386/include/specialreg.h#12 integrate
.. //depot/projects/vap/sys/kern/kern_jail.c#17 integrate
.. //depot/projects/vap/sys/kern/kern_linker.c#14 integrate
.. //depot/projects/vap/sys/kern/kern_mbuf.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_poll.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_proc.c#18 integrate
.. //depot/projects/vap/sys/kern/kern_prot.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_rwlock.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_sysctl.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_vimage.c#1 branch
.. //depot/projects/vap/sys/kern/subr_param.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_prf.c#8 integrate
.. //depot/projects/vap/sys/kern/subr_trap.c#11 integrate
.. //depot/projects/vap/sys/kern/subr_witness.c#23 integrate
.. //depot/projects/vap/sys/kern/tty.c#18 integrate
.. //depot/projects/vap/sys/kern/tty_pts.c#9 integrate
.. //depot/projects/vap/sys/kern/uipc_socket.c#18 integrate
.. //depot/projects/vap/sys/kern/vfs_aio.c#10 integrate
.. //depot/projects/vap/sys/kern/vfs_cache.c#16 integrate
.. //depot/projects/vap/sys/kern/vfs_default.c#13 integrate
.. //depot/projects/vap/sys/kern/vfs_export.c#11 integrate
.. //depot/projects/vap/sys/kern/vnode_if.src#11 integrate
.. //depot/projects/vap/sys/mips/adm5120/adm5120_machdep.c#2 integrate
.. //depot/projects/vap/sys/modules/Makefile#49 integrate
.. //depot/projects/vap/sys/modules/aio/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/ath/Makefile#11 integrate
.. //depot/projects/vap/sys/net/if.c#22 integrate
.. //depot/projects/vap/sys/net/if_bridge.c#11 integrate
.. //depot/projects/vap/sys/net/if_ethersubr.c#16 integrate
.. //depot/projects/vap/sys/net/if_gif.c#14 integrate
.. //depot/projects/vap/sys/net/if_gif.h#7 integrate
.. //depot/projects/vap/sys/net/if_tun.c#13 integrate
.. //depot/projects/vap/sys/net/if_var.h#15 integrate
.. //depot/projects/vap/sys/net/pfil.h#5 integrate
.. //depot/projects/vap/sys/net/radix.c#6 integrate
.. //depot/projects/vap/sys/net/radix.h#4 integrate
.. //depot/projects/vap/sys/net/raw_cb.h#5 integrate
.. //depot/projects/vap/sys/net/route.c#17 integrate
.. //depot/projects/vap/sys/net/route.h#11 integrate
.. //depot/projects/vap/sys/net/rtsock.c#16 integrate
.. //depot/projects/vap/sys/net/vnet.h#3 integrate
.. //depot/projects/vap/sys/net80211/_ieee80211.h#14 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.c#55 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#33 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.h#5 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#31 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#36 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#71 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#54 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.h#33 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#66 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#17 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#31 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#58 integrate
.. //depot/projects/vap/sys/netgraph/netgraph.h#14 integrate
.. //depot/projects/vap/sys/netgraph/ng_base.c#26 integrate
.. //depot/projects/vap/sys/netgraph/ng_bridge.c#6 integrate
.. //depot/projects/vap/sys/netgraph/ng_eiface.c#11 integrate
.. //depot/projects/vap/sys/netgraph/ng_iface.c#12 integrate
.. //depot/projects/vap/sys/netgraph/ng_ipfw.c#6 integrate
.. //depot/projects/vap/sys/netgraph/ng_tty.c#8 integrate
.. //depot/projects/vap/sys/netinet/icmp6.h#5 integrate
.. //depot/projects/vap/sys/netinet/icmp_var.h#5 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.c#25 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.h#17 integrate
.. //depot/projects/vap/sys/netinet/in_proto.c#8 integrate
.. //depot/projects/vap/sys/netinet/in_rmx.c#12 integrate
.. //depot/projects/vap/sys/netinet/in_var.h#9 integrate
.. //depot/projects/vap/sys/netinet/ip_divert.c#13 integrate
.. //depot/projects/vap/sys/netinet/ip_dummynet.c#9 integrate
.. //depot/projects/vap/sys/netinet/ip_fw.h#15 integrate
.. //depot/projects/vap/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/vap/sys/netinet/ip_fw_nat.c#5 integrate
.. //depot/projects/vap/sys/netinet/ip_fw_pfil.c#9 integrate
.. //depot/projects/vap/sys/netinet/ip_input.c#15 integrate
.. //depot/projects/vap/sys/netinet/ip_output.c#15 integrate
.. //depot/projects/vap/sys/netinet/ip_var.h#8 integrate
.. //depot/projects/vap/sys/netinet/libalias/alias_db.c#9 integrate
.. //depot/projects/vap/sys/netinet/raw_ip.c#17 integrate
.. //depot/projects/vap/sys/netinet/sctp_os_bsd.h#11 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.c#14 integrate
.. //depot/projects/vap/sys/netinet/tcp_input.c#20 integrate
.. //depot/projects/vap/sys/netinet/tcp_sack.c#12 integrate
.. //depot/projects/vap/sys/netinet/tcp_subr.c#19 integrate
.. //depot/projects/vap/sys/netinet/tcp_syncache.h#6 integrate
.. //depot/projects/vap/sys/netinet/tcp_var.h#13 integrate
.. //depot/projects/vap/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/vap/sys/netinet/udp_var.h#5 integrate
.. //depot/projects/vap/sys/netinet/vinet.h#4 integrate
.. //depot/projects/vap/sys/netinet6/in6_ifattach.c#13 integrate
.. //depot/projects/vap/sys/netinet6/in6_proto.c#12 integrate
.. //depot/projects/vap/sys/netinet6/in6_rmx.c#12 integrate
.. //depot/projects/vap/sys/netinet6/in6_var.h#7 integrate
.. //depot/projects/vap/sys/netinet6/ip6_input.c#14 integrate
.. //depot/projects/vap/sys/netinet6/ip6_var.h#11 integrate
.. //depot/projects/vap/sys/netinet6/nd6.c#11 integrate
.. //depot/projects/vap/sys/netinet6/nd6.h#8 integrate
.. //depot/projects/vap/sys/netinet6/nd6_rtr.c#11 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.h#4 integrate
.. //depot/projects/vap/sys/netinet6/tcp6_var.h#4 integrate
.. //depot/projects/vap/sys/netinet6/vinet6.h#4 integrate
.. //depot/projects/vap/sys/netipsec/ipip_var.h#3 integrate
.. //depot/projects/vap/sys/netipsec/ipsec.c#13 integrate
.. //depot/projects/vap/sys/netipsec/vipsec.h#4 integrate
.. //depot/projects/vap/sys/netipx/ipx_usrreq.c#6 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_fha.c#2 integrate
.. //depot/projects/vap/sys/pci/if_rlreg.h#17 integrate
.. //depot/projects/vap/sys/powerpc/conf/NOTES#9 integrate
.. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.c#8 integrate
.. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.h#4 integrate
.. //depot/projects/vap/sys/powerpc/powermac/cuda.c#4 integrate
.. //depot/projects/vap/sys/powerpc/powermac/cudavar.h#3 integrate
.. //depot/projects/vap/sys/powerpc/powermac/macgpio.c#2 integrate
.. //depot/projects/vap/sys/powerpc/powermac/macgpiovar.h#2 integrate
.. //depot/projects/vap/sys/powerpc/powermac/pmu.c#3 integrate
.. //depot/projects/vap/sys/powerpc/powermac/pmuvar.h#2 integrate
.. //depot/projects/vap/sys/sys/aio.h#5 integrate
.. //depot/projects/vap/sys/sys/kernel.h#14 integrate
.. //depot/projects/vap/sys/sys/param.h#36 integrate
.. //depot/projects/vap/sys/sys/pmc.h#10 integrate
.. //depot/projects/vap/sys/sys/resource.h#6 integrate
.. //depot/projects/vap/sys/sys/rwlock.h#8 integrate
.. //depot/projects/vap/sys/sys/sysctl.h#13 integrate
.. //depot/projects/vap/sys/sys/ttyhook.h#2 integrate
.. //depot/projects/vap/sys/sys/vimage.h#4 integrate
.. //depot/projects/vap/sys/sys/vnode.h#20 integrate
.. //depot/projects/vap/sys/sys/vtoc.h#2 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_quota.c#7 integrate
.. //depot/projects/vap/tools/tools/ath/athdebug/Makefile#4 integrate
.. //depot/projects/vap/tools/tools/ath/athstats/Makefile#8 integrate
.. //depot/projects/vap/usr.bin/cpuset/cpuset.1#6 integrate
.. //depot/projects/vap/usr.bin/fetch/fetch.1#4 integrate
.. //depot/projects/vap/usr.bin/fetch/fetch.c#4 integrate
.. //depot/projects/vap/usr.bin/file/config.h#4 integrate
.. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_int.c#3 integrate
.. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate
.. //depot/projects/vap/usr.sbin/fwcontrol/fwcontrol.c#5 integrate
.. //depot/projects/vap/usr.sbin/fwcontrol/fwmpegts.c#3 integrate
.. //depot/projects/vap/usr.sbin/jexec/jexec.c#5 integrate
.. //depot/projects/vap/usr.sbin/jls/jls.c#4 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/cdrom.c#3 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/config.c#5 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/install.c#4 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/label.c#4 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/main.c#5 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/menus.c#7 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.h#7 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/system.c#5 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.8#5 integrate
Differences ...
==== //depot/projects/vap/UPDATING#25 (text+ko) ====
@@ -38,11 +38,11 @@
and thereby the code size); consult ath_hal(4) for details.
20081121:
- __FreeBSD_version 800054 adds memory barriers to
- <machine/atomic.h>, new interfaces to ifnet to facilitate
+ __FreeBSD_version 800054 adds memory barriers to
+ <machine/atomic.h>, new interfaces to ifnet to facilitate
multiple hardware transmit queues for cards that support
them, and a lock-less ring-buffer implementation to
- enable drivers to more efficiently manage queueing of
+ enable drivers to more efficiently manage queueing of
packets.
20081117:
@@ -287,11 +287,11 @@
be recompiled; this includes the hal and xorg-server ports.
20070928:
- The caching daemon (cached) was renamed to nscd. nscd.conf
- configuration file should be used instead of cached.conf and
- nscd_enable, nscd_pidfile and nscd_flags options should be used
- instead of cached_enable, cached_pidfile and cached_flags in
- rc.conf.
+ The caching daemon (cached) was renamed to nscd. nscd.conf
+ configuration file should be used instead of cached.conf and
+ nscd_enable, nscd_pidfile and nscd_flags options should be used
+ instead of cached_enable, cached_pidfile and cached_flags in
+ rc.conf.
20070921:
The getfacl(1) utility now prints owning user and group name
@@ -299,7 +299,7 @@
This is the same behavior as getfacl(1) on Solaris and Linux.
20070704:
- The new IPsec code is now compiled in using the IPSEC option. The
+ The new IPsec code is now compiled in using the IPSEC option. The
IPSEC option now requires "device crypto" be defined in your kernel
configuration. The FAST_IPSEC kernel option is now deprecated.
@@ -602,10 +602,10 @@
If you have such a file, you need old utility to decrypt it.
20060709:
- The interface version of the i4b kernel part has changed. So
- after updating the kernel sources and compiling a new kernel,
- the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
- be rebuilt, and vice versa.
+ The interface version of the i4b kernel part has changed. So
+ after updating the kernel sources and compiling a new kernel,
+ the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
+ be rebuilt, and vice versa.
20060627:
The XBOX kernel now defaults to the nfe(4) driver instead of
@@ -1071,7 +1071,7 @@
<reboot into current>
<do a "native" rebuild/install as described in the previous section>
<maybe install compatibility libraries from ports/misc/compat*>
- <reboot>
+ <reboot>
To upgrade in-place from 5.x-stable to current
@@ -1178,4 +1178,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $
+$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $
==== //depot/projects/vap/contrib/binutils/bfd/config.bfd#3 (text+ko) ====
@@ -768,6 +768,10 @@
targ_defvec=bfd_elf32_littlemips_vec
targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
;;
+ mips*-*-freebsd*)
+ targ_defvec=bfd_elf32_tradbigmips_vec
+ targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+ ;;
mips*-*-netbsd*)
targ_defvec=bfd_elf32_bigmips_vec
targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"
==== //depot/projects/vap/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ====
@@ -281,6 +281,9 @@
#define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI)
+/* True if relocations are stored in-place. */
+#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI)
+
/* We can only have 64bit addresses if the object file format
supports it. */
#define HAVE_32BIT_ADDRESSES \
@@ -13020,6 +13023,26 @@
if (fixp->fx_addsy == NULL)
return 1;
+ /* If symbol SYM is in a mergeable section, relocations of the form
+ SYM + 0 can usually be made section-relative. The mergeable data
+ is then identified by the section offset rather than by the symbol.
+
+ However, if we're generating REL LO16 relocations, the offset is split
+ between the LO16 and parterning high part relocation. The linker will
+ need to recalculate the complete offset in order to correctly identify
+ the merge data.
+
+ The linker has traditionally not looked for the parterning high part
+ relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be
+ placed anywhere. Rather than break backwards compatibility by changing
+ this, it seems better not to force the issue, and instead keep the
+ original symbol. This will work with either linker behavior. */
+ if ((fixp->fx_r_type == BFD_RELOC_LO16
+ || reloc_needs_lo_p (fixp->fx_r_type))
+ && HAVE_IN_PLACE_ADDENDS
+ && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
+ return 0;
+
#ifdef OBJ_ELF
if (OUTPUT_FLAVOR == bfd_target_elf_flavour
&& S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16
==== //depot/projects/vap/etc/regdomain.xml#8 (text+ko) ====
@@ -22,7 +22,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD$
+ $FreeBSD: src/etc/regdomain.xml,v 1.2 2008/12/15 01:18:11 sam Exp $
-->
<regulatory-data>
==== //depot/projects/vap/gnu/usr.bin/binutils/as/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.19 2008/12/11 08:15:14 imp Exp $
# BINDIR
@@ -20,6 +20,10 @@
# DEO: why not used?
#SRCS+= itbl-ops.c
+.if ${TARGET_ARCH} == "mips"
+SRCS+= itbl-ops.c itbl-parse.y itbl-lex.l
+.endif
+
.if ${TARGET_ARCH} == "amd64"
SRCS+= tc-i386.c
.elif ${TARGET_ARCH} == "powerpc"
==== //depot/projects/vap/gnu/usr.bin/binutils/libbfd/bfd.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.5 2008/12/11 08:20:34 imp Exp $ */
/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c",
@@ -57,7 +57,7 @@
#define BFD_ARCH_SIZE 64
-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__)
#define BFD_HOST_64BIT_LONG 0
#define BFD_HOST_64_BIT long long
#define BFD_HOST_U_64_BIT unsigned long long
==== //depot/projects/vap/gnu/usr.bin/cc/libiberty/config.h#3 (text+ko) ====
@@ -1,6 +1,6 @@
/* config.h. Generated by configure. */
/* config.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.2 2008/12/08 21:04:24 kib Exp $ */
/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
This function is required for alloca.c support on those systems. */
@@ -235,7 +235,7 @@
#define HAVE_STRNCASECMP 1
/* Define to 1 if you have the `strndup' function. */
-/* #undef HAVE_STRNDUP */
+#define HAVE_STRNDUP 1
/* Define to 1 if you have the `strrchr' function. */
#define HAVE_STRRCHR 1
==== //depot/projects/vap/gnu/usr.bin/groff/tmac/mdoc.local#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.64 2008/08/06 14:02:05 dfr Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $
.\"
.\" %beginstrip%
.
@@ -69,6 +69,8 @@
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-6.3 6.3
+.ds doc-operating-system-FreeBSD-6.4 6.4
+.ds doc-operating-system-FreeBSD-7.1 7.1
.ds doc-operating-system-FreeBSD-8.0 8.0
.
.ec
==== //depot/projects/vap/gnu/usr.bin/sort/config.h#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.11 2008/12/08 21:04:24 kib Exp $ */
/* config.h. Generated by configure. */
/* config.hin. Generated from configure.ac by autoheader. */
@@ -759,7 +759,7 @@
#define HAVE_STRNCASECMP 1
/* Define to 1 if you have the `strndup' function. */
-/* #undef HAVE_STRNDUP */
+#define HAVE_STRNDUP 1
/* Define to 1 if you have the `strpbrk' function. */
#define HAVE_STRPBRK 1
==== //depot/projects/vap/include/arpa/nameser.h#3 (text+ko) ====
@@ -49,8 +49,8 @@
*/
/*
- * $Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $
- * $FreeBSD: src/include/arpa/nameser.h,v 1.20 2007/06/03 17:20:25 ume Exp $
+ * $Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
+ * $FreeBSD: src/include/arpa/nameser.h,v 1.21 2008/12/14 19:39:53 ume Exp $
*/
#ifndef _ARPA_NAMESER_H_
@@ -424,9 +424,10 @@
#define NS_NXT_MAX 127
/*%
- * EDNS0 extended flags, host order.
+ * EDNS0 extended flags and option codes, host order.
*/
#define NS_OPT_DNSSEC_OK 0x8000U
+#define NS_OPT_NSID 3
/*%
* Inline versions of get/put short/long. Pointer is advanced.
==== //depot/projects/vap/include/resolv.h#3 (text+ko) ====
@@ -50,8 +50,8 @@
/*%
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
- * $Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $
- * $FreeBSD: src/include/resolv.h,v 1.32 2007/06/03 17:20:25 ume Exp $
+ * $Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
+ * $FreeBSD: src/include/resolv.h,v 1.33 2008/12/14 19:39:53 ume Exp $
*/
#ifndef _RESOLV_H_
@@ -245,6 +245,7 @@
#define RES_NOCHECKNAME 0x00008000 /*%< do not check names for sanity. */
#define RES_KEEPTSIG 0x00010000 /*%< do not strip TSIG records */
#define RES_BLAST 0x00020000 /*%< blast all recursive servers */
+#define RES_NSID 0x00040000 /*%< request name server ID */
#define RES_NOTLDQUERY 0x00100000 /*%< don't unqualified name as a tld */
#define RES_USE_DNSSEC 0x00200000 /*%< use DNSSEC using OK bit in OPT */
/* #define RES_DEBUG2 0x00400000 */ /* nslookup internal */
@@ -386,6 +387,7 @@
#define sym_ntos __sym_ntos
#define sym_ston __sym_ston
#define res_nopt __res_nopt
+#define res_nopt_rdata __res_nopt_rdata
#define res_ndestroy __res_ndestroy
#define res_nametoclass __res_nametoclass
#define res_nametotype __res_nametotype
@@ -474,6 +476,8 @@
union res_sockaddr_union *, int);
void res_nclose(res_state);
int res_nopt(res_state, int, u_char *, int, int);
+int res_nopt_rdata(res_state, int, u_char *, int, u_char *,
+ u_short, u_short, u_char *);
void res_send_setqhook(res_send_qhook);
void res_send_setrhook(res_send_rhook);
int __res_vinit(res_state, int);
==== //depot/projects/vap/include/string.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)string.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $
+ * $FreeBSD: src/include/string.h,v 1.27 2008/12/08 21:04:24 kib Exp $
*/
#ifndef _STRING_H_
@@ -96,6 +96,7 @@
int strncmp(const char *, const char *, size_t) __pure;
char *strncpy(char * __restrict, const char * __restrict, size_t);
#if __BSD_VISIBLE
+char *strndup(const char *, size_t);
char *strnstr(const char *, const char *, size_t) __pure;
#endif
char *strpbrk(const char *, const char *) __pure;
==== //depot/projects/vap/kerberos5/include/config.h#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* include/config.h. Generated from config.h.in by configure. */
/* include/config.h.in. Generated from configure.in by autoheader. */
-/* $FreeBSD: src/kerberos5/include/config.h,v 1.16 2008/05/07 13:53:03 dfr Exp $ */
+/* $FreeBSD: src/kerberos5/include/config.h,v 1.17 2008/12/08 21:04:24 kib Exp $ */
#include <osreldate.h>
@@ -785,7 +785,7 @@
#define HAVE_STRNCASECMP 1
/* Define if you have the function `strndup'. */
-/* #undef HAVE_STRNDUP */
+#define HAVE_STRNDUP 1
/* Define if you have the function `strnlen'. */
/* #undef HAVE_STRNLEN */
==== //depot/projects/vap/lib/bind/bind/port_after.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.3 2006/12/10 07:11:03 dougb Exp $ */
+/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.4 2008/12/08 21:04:24 kib Exp $ */
#ifndef port_after_h
#define port_after_h
@@ -30,7 +30,7 @@
#undef HAS_IN_ADDR6
#define HAVE_SOCKADDR_STORAGE 1
#undef NEED_GETTIMEOFDAY
-#undef HAVE_STRNDUP
+#define HAVE_STRNDUP 1
#undef USE_FIONBIO_IOCTL
#undef USE_SYSERROR_LIST
#undef INNETGR_ARGS
==== //depot/projects/vap/lib/libarchive/test/main.c#9 (text+ko) ====
@@ -45,7 +45,7 @@
#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x))
#define EXTRA_VERSION archive_version()
#define KNOWNREF "test_compat_gtar_1.tgz.uu"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.14 2008/08/31 07:06:02 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.15 2008/12/08 17:22:44 kientzle Exp $");
/*
* "list.h" is simply created by "grep DEFINE_TEST"; it has
@@ -897,6 +897,7 @@
time_t now;
char *refdir_alloc = NULL;
char *progname, *p;
+ char *tmp;
char tmpdir[256];
char tmpdir_timestamp[256];
@@ -916,6 +917,17 @@
testprog = getenv(ENVBASE);
#endif
+ if (getenv("TMPDIR") != NULL)
+ tmp = getenv("TMPDIR");
+ else if (getenv("TMP") != NULL)
+ tmp = getenv("TMP");
+ else if (getenv("TEMP") != NULL)
+ tmp = getenv("TEMP");
+ else if (getenv("TEMPDIR") != NULL)
+ tmp = getenv("TEMPDIR");
+ else
+ tmp = "/tmp";
+
/* Allow -d to be controlled through the environment. */
if (getenv(ENVBASE "_DEBUG") != NULL)
dump_on_failure = 1;
@@ -976,7 +988,8 @@
strftime(tmpdir_timestamp, sizeof(tmpdir_timestamp),
"%Y-%m-%dT%H.%M.%S",
localtime(&now));
- sprintf(tmpdir, "/tmp/%s.%s-%03d", progname, tmpdir_timestamp, i);
+ sprintf(tmpdir, "%s/%s.%s-%03d", tmp, progname,
+ tmpdir_timestamp, i);
if (mkdir(tmpdir,0755) == 0)
break;
if (errno == EEXIST)
==== //depot/projects/vap/lib/libc/include/isc/eventlib.h#3 (text) ====
@@ -18,7 +18,7 @@
/* eventlib.h - exported interfaces for eventlib
* vix 09sep95 [initial]
*
- * $Id: eventlib.h,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $
+ * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
*/
#ifndef _EVENTLIB_H
@@ -29,6 +29,8 @@
#include <sys/time.h>
#include <stdio.h>
+#include <isc/platform.h>
+
#ifndef __P
# define __EVENTLIB_P_DEFINED
# ifdef __STDC__
==== //depot/projects/vap/lib/libc/inet/inet_net_pton.c#3 (text) ====
@@ -16,10 +16,10 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.3 2007/06/03 17:20:26 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.4 2008/12/14 19:39:53 ume Exp $");
#include "port_before.h"
@@ -135,11 +135,11 @@
assert(n >= 0 && n <= 9);
bits *= 10;
bits += n;
+ if (bits > 32)
+ goto enoent;
} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
if (ch != '\0')
goto enoent;
- if (bits > 32)
- goto emsgsize;
}
/* Firey death and destruction unless we prefetched EOS. */
==== //depot/projects/vap/lib/libc/net/rcmd.3#3 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)rcmd.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.26 2007/01/09 00:28:02 imp Exp $
+.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.27 2008/12/14 22:48:48 murray Exp $
.\"
.Dd March 3, 2000
.Dt RCMD 3
@@ -238,6 +238,13 @@
.Fn rcmd_af ,
.Dv PF_UNSPEC
is also allowed.
+.Sh ENVIRONMENT
+.Bl -tag -width RSH
+.It Ev RSH
+When using the
+.Fn rcmd
+function, this variable is used as the program to run instead of
+.Xr rsh 1 .
.Sh DIAGNOSTICS
The
.Fn rcmd
==== //depot/projects/vap/lib/libc/resolv/res_debug.c#3 (text) ====
@@ -91,10 +91,10 @@
#if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $";
+static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.6 2008/04/03 23:15:15 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_debug.c,v 1.5 2007/06/03 17:20:27 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_debug.c,v 1.6 2008/12/14 19:39:53 ume Exp $");
#include "port_before.h"
@@ -187,10 +187,56 @@
p_type(ns_rr_type(rr)),
p_class(ns_rr_class(rr)));
else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
+ u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr);
u_int32_t ttl = ns_rr_ttl(rr);
+
fprintf(file,
"; EDNS: version: %u, udp=%u, flags=%04x\n",
(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
+
+ while (rdatalen >= 4) {
+ const u_char *cp = ns_rr_rdata(rr);
+ int i;
+
+ GETSHORT(optcode, cp);
+ GETSHORT(optlen, cp);
+
+ if (optcode == NS_OPT_NSID) {
+ fputs("; NSID: ", file);
+ if (optlen == 0) {
+ fputs("; NSID\n", file);
+ } else {
+ fputs("; NSID: ", file);
+ for (i = 0; i < optlen; i++)
+ fprintf(file, "%02x ",
+ cp[i]);
+ fputs(" (",file);
+ for (i = 0; i < optlen; i++)
+ fprintf(file, "%c",
+ isprint(cp[i])?
+ cp[i] : '.');
+ fputs(")\n", file);
+ }
+ } else {
+ if (optlen == 0) {
+ fprintf(file, "; OPT=%u\n",
+ optcode);
+ } else {
+ fprintf(file, "; OPT=%u: ",
+ optcode);
+ for (i = 0; i < optlen; i++)
+ fprintf(file, "%02x ",
+ cp[i]);
+ fputs(" (",file);
+ for (i = 0; i < optlen; i++)
+ fprintf(file, "%c",
+ isprint(cp[i]) ?
+ cp[i] : '.');
+ fputs(")\n", file);
+ }
+ }
+ rdatalen -= 4 + optlen;
+ }
} else {
n = ns_sprintrr(handle, &rr, NULL, NULL,
buf, buflen);
@@ -202,7 +248,7 @@
buf = malloc(buflen += 1024);
if (buf == NULL) {
fprintf(file,
- ";; memory allocation failure\n");
+ ";; memory allocation failure\n");
return;
}
continue;
@@ -379,7 +425,7 @@
{ns_s_an, "ANSWER", (char *)0},
{ns_s_ns, "AUTHORITY", (char *)0},
{ns_s_ar, "ADDITIONAL", (char *)0},
- {0, (char *)0, (char *)0}
+ {0, (char *)0, (char *)0}
};
static const struct res_sym __p_update_section_syms[] = {
@@ -387,7 +433,7 @@
{S_PREREQ, "PREREQUISITE", (char *)0},
{S_UPDATE, "UPDATE", (char *)0},
{S_ADDT, "ADDITIONAL", (char *)0},
- {0, (char *)0, (char *)0}
+ {0, (char *)0, (char *)0}
};
const struct res_sym __p_key_syms[] = {
@@ -615,6 +661,7 @@
case RES_USE_INET6: return "inet6";
#ifdef RES_USE_EDNS0 /*%< KAME extension */
case RES_USE_EDNS0: return "edns0";
+ case RES_NSID: return "nsid";
#endif
#ifdef RES_USE_DNAME
case RES_USE_DNAME: return "dname";
==== //depot/projects/vap/lib/libc/resolv/res_mkquery.c#3 (text) ====
@@ -66,10 +66,10 @@
#if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.5 2008/12/14 19:39:53 ume Exp $");
#include "port_before.h"
#include <sys/types.h>
@@ -201,9 +201,6 @@
#ifdef RES_USE_EDNS0
/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-#ifndef T_OPT
-#define T_OPT 41
-#endif
int
res_nopt(res_state statp,
@@ -228,15 +225,16 @@
if ((ep - cp) < 1 + RRFIXEDSZ)
return (-1);
- *cp++ = 0; /*%< "." */
- ns_put16(T_OPT, cp); /*%< TYPE */
+ *cp++ = 0; /*%< "." */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list