PERFORCE change 136467 for review

Kip Macy kmacy at FreeBSD.org
Fri Feb 29 19:48:20 UTC 2008


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

Change 136467 by kmacy at pandemonium:kmacy:xen31 on 2008/02/28 22:59:38

	IFC	#136462

Affected files ...

.. //depot/projects/xen31/Makefile.inc1#5 integrate
.. //depot/projects/xen31/ObsoleteFiles.inc#10 integrate
.. //depot/projects/xen31/UPDATING#5 integrate
.. //depot/projects/xen31/bin/sh/cd.c#2 integrate
.. //depot/projects/xen31/bin/sh/mksyntax.c#2 integrate
.. //depot/projects/xen31/contrib/tcpdump/print-802_11.c#2 integrate
.. //depot/projects/xen31/contrib/traceroute/as.c#1 branch
.. //depot/projects/xen31/contrib/traceroute/as.h#1 branch
.. //depot/projects/xen31/contrib/traceroute/traceroute.8#2 integrate
.. //depot/projects/xen31/contrib/traceroute/traceroute.c#2 integrate
.. //depot/projects/xen31/games/fortune/datfiles/fortunes#8 integrate
.. //depot/projects/xen31/games/fortune/strfile/strfile.c#2 integrate
.. //depot/projects/xen31/gnu/lib/libgcc/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate
.. //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/xen31/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/man/manpath/manpath.c#2 integrate
.. //depot/projects/xen31/include/unistd.h#4 integrate
.. //depot/projects/xen31/lib/libarchive/archive_endian.h#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_entry_strmode.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_platform.h#3 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_open_filename.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_ar.c#3 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_mtree.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_read_support_format_zip.c#5 integrate
.. //depot/projects/xen31/lib/libarchive/archive_write_disk.c#4 integrate
.. //depot/projects/xen31/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate
.. //depot/projects/xen31/lib/libarchive/config_freebsd.h#2 integrate
.. //depot/projects/xen31/lib/libarchive/test/main.c#3 integrate
.. //depot/projects/xen31/lib/libarchive/test/test.h#3 integrate
.. //depot/projects/xen31/lib/libc/db/test/btree.tests/main.c#2 integrate
.. //depot/projects/xen31/lib/libc/db/test/dbtest.c#2 integrate
.. //depot/projects/xen31/lib/libc/gen/sysconf.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/flt_rounds.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetmask.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetround.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/fpsetmask.c#2 integrate
.. //depot/projects/xen31/lib/libc/powerpc/gen/fpsetround.c#2 integrate
.. //depot/projects/xen31/lib/libc/regex/grot/main.c#2 integrate
.. //depot/projects/xen31/lib/libc/stdio/fdopen.c#2 integrate
.. //depot/projects/xen31/lib/libc/stdio/fopen.c#2 integrate
.. //depot/projects/xen31/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/xen31/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/xen31/lib/libc/sys/clock_gettime.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_close.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_getattr.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_notify.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_open.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_receive.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_send.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/mq_setattr.2#2 integrate
.. //depot/projects/xen31/lib/libc/sys/readlink.2#3 integrate
.. //depot/projects/xen31/lib/msun/Makefile#5 integrate
.. //depot/projects/xen31/lib/msun/Symbol.map#6 integrate
.. //depot/projects/xen31/lib/msun/bsdsrc/b_exp.c#2 integrate
.. //depot/projects/xen31/lib/msun/bsdsrc/b_log.c#2 integrate
.. //depot/projects/xen31/lib/msun/bsdsrc/b_tgamma.c#2 integrate
.. //depot/projects/xen31/lib/msun/ld80/k_tanl.c#2 integrate
.. //depot/projects/xen31/lib/msun/man/j0.3#2 integrate
.. //depot/projects/xen31/lib/msun/man/lgamma.3#2 integrate
.. //depot/projects/xen31/lib/msun/powerpc/fenv.h#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_acos.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_acosf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_acosh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_acoshf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_asin.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_asinf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_atan2.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_atan2f.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_atanh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_atanhf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_cosh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_coshf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_exp.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/e_expf.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/e_fmod.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_fmodf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_gamma.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_gamma_r.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_gammaf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_gammaf_r.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_j0.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_j0f.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_j1.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_j1f.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_jn.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_jnf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_lgamma.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_lgamma_r.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_lgammaf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_lgammaf_r.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_log.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_log10.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_log10f.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_logf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_rem_pio2.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/e_rem_pio2f.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/e_scalb.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_scalbf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_sinh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/e_sinhf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/k_cos.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/k_cosf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/k_rem_pio2.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/k_sin.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/k_sinf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/k_tan.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/k_tanf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/math.h#6 integrate
.. //depot/projects/xen31/lib/msun/src/math_private.h#4 integrate
.. //depot/projects/xen31/lib/msun/src/s_asinh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_asinhf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_atan.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_atanf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_cbrt.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_cbrtf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_ceilf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_copysign.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_copysignf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_cos.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_cosf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_erf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_erff.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_exp2.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_exp2f.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_fabsf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_finite.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_finitef.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_floorf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_frexp.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_frexpf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_ilogb.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_ilogbf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_ilogbl.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_logbf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_modff.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_nextafter.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_nextafterf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_nextafterl.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_nexttoward.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_nexttowardf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_rint.c#4 integrate
.. //depot/projects/xen31/lib/msun/src/s_rintf.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_rintl.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_significand.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_significandf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_sin.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_sinf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_tan.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/s_tanf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_tanh.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_tanhf.c#2 integrate
.. //depot/projects/xen31/lib/msun/src/s_tgammaf.c#1 branch
.. //depot/projects/xen31/lib/msun/src/s_trunc.c#3 integrate
.. //depot/projects/xen31/lib/msun/src/w_cabs.c#3 integrate
.. //depot/projects/xen31/release/Makefile#6 integrate
.. //depot/projects/xen31/sbin/fsck_ffs/pass1.c#2 integrate
.. //depot/projects/xen31/sbin/fsck_ffs/pass2.c#2 integrate
.. //depot/projects/xen31/sbin/fsck_ffs/setup.c#2 integrate
.. //depot/projects/xen31/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/xen31/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/xen31/sbin/mount_nfs/mount_nfs.c#3 integrate
.. //depot/projects/xen31/sbin/ping6/ping6.c#3 integrate
.. //depot/projects/xen31/sbin/sconfig/sconfig.c#2 integrate
.. //depot/projects/xen31/secure/usr.bin/bdes/bdes.c#2 integrate
.. //depot/projects/xen31/share/man/man4/Makefile#7 integrate
.. //depot/projects/xen31/share/man/man4/geom_linux_lvm.4#1 branch
.. //depot/projects/xen31/share/man/man4/geom_lvm.4#2 delete
.. //depot/projects/xen31/share/man/man4/ip6.4#2 integrate
.. //depot/projects/xen31/share/man/man4/uscanner.4#2 integrate
.. //depot/projects/xen31/share/man/man9/Makefile#7 integrate
.. //depot/projects/xen31/share/man/man9/VOP_LOCK.9#5 integrate
.. //depot/projects/xen31/share/man/man9/insmntque.9#1 branch
.. //depot/projects/xen31/share/man/man9/lock.9#5 integrate
.. //depot/projects/xen31/share/man/man9/vfs_mountedfrom.9#1 branch
.. //depot/projects/xen31/share/man/man9/vgone.9#2 integrate
.. //depot/projects/xen31/share/man/man9/vhold.9#2 integrate
.. //depot/projects/xen31/share/man/man9/vput.9#2 integrate
.. //depot/projects/xen31/share/man/man9/vref.9#2 integrate
.. //depot/projects/xen31/share/man/man9/vrefcnt.9#1 branch
.. //depot/projects/xen31/share/man/man9/vrele.9#2 integrate
.. //depot/projects/xen31/share/misc/bsd-family-tree#5 integrate
.. //depot/projects/xen31/share/misc/committers-doc.dot#3 integrate
.. //depot/projects/xen31/share/misc/committers-ports.dot#4 integrate
.. //depot/projects/xen31/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/xen31/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/xen31/sys/arm/include/_bus.h#2 integrate
.. //depot/projects/xen31/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/xen31/sys/boot/common/bootstrap.h#2 integrate
.. //depot/projects/xen31/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/xen31/sys/boot/i386/boot2/boot2.c#4 integrate
.. //depot/projects/xen31/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptboot.c#3 integrate
.. //depot/projects/xen31/sys/boot/i386/libi386/biosdisk.c#5 integrate
.. //depot/projects/xen31/sys/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/btx/btx/btx.S#2 integrate
.. //depot/projects/xen31/sys/boot/powerpc/Makefile#3 integrate
.. //depot/projects/xen31/sys/boot/powerpc/ofw/Makefile#4 integrate
.. //depot/projects/xen31/sys/boot/powerpc/uboot/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/powerpc/uboot/conf.c#2 integrate
.. //depot/projects/xen31/sys/boot/powerpc/uboot/metadata.c#2 integrate
.. //depot/projects/xen31/sys/boot/powerpc/uboot/start.S#2 integrate
.. //depot/projects/xen31/sys/boot/uboot/common/main.c#2 integrate
.. //depot/projects/xen31/sys/boot/uboot/lib/Makefile#2 integrate
.. //depot/projects/xen31/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/xen31/sys/boot/uboot/lib/glue.c#2 integrate
.. //depot/projects/xen31/sys/boot/uboot/lib/glue.h#1 branch
.. //depot/projects/xen31/sys/cam/cam_xpt.c#5 integrate
.. //depot/projects/xen31/sys/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_misc.c#4 integrate
.. //depot/projects/xen31/sys/compat/linux/linux_misc.h#2 integrate
.. //depot/projects/xen31/sys/conf/NOTES#11 integrate
.. //depot/projects/xen31/sys/conf/files#17 integrate
.. //depot/projects/xen31/sys/conf/files.powerpc#7 integrate
.. //depot/projects/xen31/sys/conf/ldscript.powerpc#2 integrate
.. //depot/projects/xen31/sys/conf/options#9 integrate
.. //depot/projects/xen31/sys/conf/options.powerpc#3 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/xen31/sys/dev/atkbdc/psm.c#2 integrate
.. //depot/projects/xen31/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/xen31/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/xen31/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/bin2h.pl#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.c#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.h#3 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_multiq.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_offload.c#3 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/sys/cxgb_support.c#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/sys/mbufq.h#3 integrate
.. //depot/projects/xen31/sys/dev/cxgb/sys/mvec.h#5 integrate
.. //depot/projects/xen31/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/xen31/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/xen31/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/t3cdev.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete
.. //depot/projects/xen31/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch
.. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch
.. //depot/projects/xen31/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/xen31/sys/dev/md/md.c#4 integrate
.. //depot/projects/xen31/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/xen31/sys/dev/usb/ubsa.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/ucom.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/xen31/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/xen31/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/xen31/sys/fs/coda/TODO#3 integrate
.. //depot/projects/xen31/sys/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/xen31/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/xen31/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/xen31/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/xen31/sys/fs/nwfs/nwfs_node.c#4 integrate
.. //depot/projects/xen31/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate
.. //depot/projects/xen31/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/xen31/sys/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate
.. //depot/projects/xen31/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/xen31/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/xen31/sys/geom/linux_lvm/g_linux_lvm.c#1 branch
.. //depot/projects/xen31/sys/geom/linux_lvm/g_linux_lvm.h#1 branch
.. //depot/projects/xen31/sys/geom/lvm/g_lvm.c#2 delete
.. //depot/projects/xen31/sys/geom/lvm/g_lvm.h#2 delete
.. //depot/projects/xen31/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/xen31/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate
.. //depot/projects/xen31/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_descrip.c#6 integrate
.. //depot/projects/xen31/sys/kern/kern_ktrace.c#5 integrate
.. //depot/projects/xen31/sys/kern/kern_lock.c#7 integrate
.. //depot/projects/xen31/sys/kern/uipc_syscalls.c#6 integrate
.. //depot/projects/xen31/sys/kern/vfs_cache.c#4 integrate
.. //depot/projects/xen31/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/xen31/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/xen31/sys/kern/vfs_mount.c#8 integrate
.. //depot/projects/xen31/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/xen31/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/xen31/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/xen31/sys/libkern/cmpdi2.c#1 branch
.. //depot/projects/xen31/sys/libkern/quad.h#2 integrate
.. //depot/projects/xen31/sys/modules/cxgb/Makefile#3 integrate
.. //depot/projects/xen31/sys/modules/cxgb/cxgb/Makefile#4 integrate
.. //depot/projects/xen31/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/xen31/sys/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/xen31/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/xen31/sys/modules/geom/geom_eli/Makefile#2 integrate
.. //depot/projects/xen31/sys/modules/geom/geom_linux_lvm/Makefile#1 branch
.. //depot/projects/xen31/sys/modules/geom/geom_lvm/Makefile#2 delete
.. //depot/projects/xen31/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/xen31/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/xen31/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/xen31/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/xen31/sys/netinet/ip_dummynet.c#5 integrate
.. //depot/projects/xen31/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/xen31/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/xen31/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/xen31/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/xen31/sys/netncp/ncp_conn.c#3 integrate
.. //depot/projects/xen31/sys/netsmb/smb_conn.c#3 integrate
.. //depot/projects/xen31/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/xen31/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/xen31/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/xen31/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/xen31/sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/xen31/sys/powerpc/conf/NOTES#5 integrate
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_add.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_arith.h#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_compare.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_div.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_emu.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_emu.h#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_explode.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_extern.h#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_implode.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_instr.h#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_mul.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_sqrt.c#1 branch
.. //depot/projects/xen31/sys/powerpc/fpu/fpu_subr.c#1 branch
.. //depot/projects/xen31/sys/powerpc/include/bootinfo.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/float.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/metadata.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/xen31/sys/security/audit/audit.c#6 integrate
.. //depot/projects/xen31/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/xen31/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/xen31/sys/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/xen31/sys/security/audit/audit_private.h#2 integrate
.. //depot/projects/xen31/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/xen31/sys/sys/buf.h#4 integrate
.. //depot/projects/xen31/sys/sys/ktrace.h#2 integrate
.. //depot/projects/xen31/sys/sys/lockmgr.h#6 integrate
.. //depot/projects/xen31/sys/sys/param.h#13 integrate
.. //depot/projects/xen31/sys/sys/vnode.h#3 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/xen31/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/xen31/sys/vm/vm_object.c#5 integrate
.. //depot/projects/xen31/tools/regression/bin/sh/builtins/cd1.0#1 branch
.. //depot/projects/xen31/tools/regression/fsx/fsx.c#2 integrate
.. //depot/projects/xen31/usr.bin/Makefile#4 integrate
.. //depot/projects/xen31/usr.bin/ar/Makefile#1 branch
.. //depot/projects/xen31/usr.bin/ar/ar.1#1 branch
.. //depot/projects/xen31/usr.bin/ar/ar.c#1 branch
.. //depot/projects/xen31/usr.bin/ar/ar.h#1 branch
.. //depot/projects/xen31/usr.bin/ar/read.c#1 branch
.. //depot/projects/xen31/usr.bin/ar/util.c#1 branch
.. //depot/projects/xen31/usr.bin/ar/write.c#1 branch
.. //depot/projects/xen31/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.dutch#2 integrate
.. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#6 integrate
.. //depot/projects/xen31/usr.bin/du/du.1#2 integrate
.. //depot/projects/xen31/usr.bin/du/du.c#3 integrate
.. //depot/projects/xen31/usr.bin/find/extern.h#2 integrate
.. //depot/projects/xen31/usr.bin/find/find.1#2 integrate
.. //depot/projects/xen31/usr.bin/find/find.h#2 integrate
.. //depot/projects/xen31/usr.bin/find/function.c#2 integrate
.. //depot/projects/xen31/usr.bin/find/option.c#2 integrate
.. //depot/projects/xen31/usr.bin/kdump/kdump.1#2 integrate
.. //depot/projects/xen31/usr.bin/kdump/kdump.c#4 integrate
.. //depot/projects/xen31/usr.bin/kdump/mksubr#3 integrate
.. //depot/projects/xen31/usr.bin/ktrace/ktrace.1#2 integrate
.. //depot/projects/xen31/usr.bin/ktrace/ktrace.h#2 integrate
.. //depot/projects/xen31/usr.bin/ktrace/subr.c#2 integrate
.. //depot/projects/xen31/usr.bin/ncplogin/ncplogin.c#2 integrate
.. //depot/projects/xen31/usr.bin/tar/write.c#2 integrate
.. //depot/projects/xen31/usr.sbin/cdcontrol/cdcontrol.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pkg_install/add/main.c#3 integrate
.. //depot/projects/xen31/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/xen31/usr.sbin/powerd/powerd.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pw/pw.8#3 integrate
.. //depot/projects/xen31/usr.sbin/pw/pw.c#2 integrate
.. //depot/projects/xen31/usr.sbin/pw/pw_group.c#2 integrate
.. //depot/projects/xen31/usr.sbin/sa/db.c#3 integrate
.. //depot/projects/xen31/usr.sbin/syslogd/syslogd.c#4 integrate
.. //depot/projects/xen31/usr.sbin/traceroute/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate
.. //depot/projects/xen31/usr.sbin/zic/zdump.c#2 integrate

Differences ...

==== //depot/projects/xen31/Makefile.inc1#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -872,6 +872,14 @@
 .endif
 .endif
 
+.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
+_ar=		usr.bin/ar
+.endif
+
+.if ${BOOTSTRAPPING} < 800013
+_mklocale=	usr.bin/mklocale
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -881,18 +889,15 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} < 800013
-_mklocale=	usr.bin/mklocale
-.endif
-
 bootstrap-tools:
 .for _tool in \
-    ${_mklocale} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
+    ${_ar} \
     usr.bin/lorder \
     usr.bin/makewhatis \
+    ${_mklocale} \
     usr.bin/rpcgen \
     usr.bin/xinstall \
     ${_gensnmptree} \
@@ -967,6 +972,10 @@
 .endif
 .endif
 
+.if make(cross-tools) && ${BOOTSTRAPPING} < 700044
+.MAKEFLAGS+=	-D_WITH_GNUAR
+.endif
+
 cross-tools:
 .for _tool in \
     gnu/usr.bin/binutils \

==== //depot/projects/xen31/ObsoleteFiles.inc#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.130 2008/02/06 19:45:25 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa 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.
 #
 
+# 20080220: geom_lvm rename to geom_linux_lvm
+OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz

==== //depot/projects/xen31/UPDATING#5 (text+ko) ====

@@ -22,6 +22,10 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20080220:
+	The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4),
+	likewise the kernel option is now GEOM_LINUX_LVM.
+
 20080211:
 	The default NFS mount mode has changed from UDP to TCP for
 	increased reliability.  If you rely on (insecurely) NFS
@@ -979,4 +983,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.519 2008/02/11 23:23:20 kris Exp $
+$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $

==== //depot/projects/xen31/bin/sh/cd.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -68,7 +68,9 @@
 STATIC int cdphysical(char *);
 STATIC int docd(char *, int, int);
 STATIC char *getcomponent(void);
-STATIC int updatepwd(char *);
+STATIC char *findcwd(char *);
+STATIC void updatepwd(char *);
+STATIC char *getpwd2(char *, size_t);
 
 STATIC char *curdir = NULL;	/* current working directory */
 STATIC char *prevdir;		/* previous working directory */
@@ -201,10 +203,11 @@
 	}
 
 	INTOFF;
-	if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) {
+	if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) {
 		INTON;
 		return (-1);
 	}
+	updatepwd(p);
 	INTON;
 	return (0);
 }
@@ -212,12 +215,14 @@
 STATIC int
 cdphysical(char *dest)
 {
+	char *p;
 
 	INTOFF;
-	if (chdir(dest) < 0 || updatepwd(NULL) < 0) {
+	if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) {
 		INTON;
 		return (-1);
 	}
+	updatepwd(p);
 	INTON;
 	return (0);
 }
@@ -247,38 +252,20 @@
 }
 
 
-/*
- * Update curdir (the name of the current directory) in response to a
- * cd command.  We also call hashcd to let the routines in exec.c know
- * that the current directory has changed.
- */
-STATIC int
-updatepwd(char *dir)
+STATIC char *
+findcwd(char *dir)
 {
 	char *new;
 	char *p;
 
-	hashcd();				/* update command hash table */
-
 	/*
 	 * If our argument is NULL, we don't know the current directory
 	 * any more because we traversed a symbolic link or something
 	 * we couldn't stat().
 	 */
 	if (dir == NULL || curdir == NULL)  {
-		if (prevdir)
-			ckfree(prevdir);
-		INTOFF;
-		prevdir = curdir;
-		curdir = NULL;
-		if (getpwd() == NULL) {
-			INTON;
-			return (-1);
-		}
-		setvar("PWD", curdir, VEXPORT);
-		setvar("OLDPWD", prevdir, VEXPORT);
-		INTON;
-		return (0);
+		p = stalloc(PATH_MAX);
+		return getpwd2(p, PATH_MAX);
 	}
 	cdcomppath = stalloc(strlen(dir) + 1);
 	scopy(dir, cdcomppath);
@@ -302,16 +289,25 @@
 	if (new == stackblock())
 		STPUTC('/', new);
 	STACKSTRNUL(new);
-	INTOFF;
+	return stackblock();
+}
+
+/*
+ * Update curdir (the name of the current directory) in response to a
+ * cd command.  We also call hashcd to let the routines in exec.c know
+ * that the current directory has changed.
+ */
+STATIC void
+updatepwd(char *dir)
+{
+	hashcd();				/* update command hash table */
+
 	if (prevdir)
 		ckfree(prevdir);
 	prevdir = curdir;
-	curdir = savestr(stackblock());
+	curdir = savestr(dir);
 	setvar("PWD", curdir, VEXPORT);
 	setvar("OLDPWD", prevdir, VEXPORT);
-	INTON;
-
-	return (0);
 }
 
 int
@@ -355,17 +351,31 @@
 }
 
 /*
- * Find out what the current directory is. If we already know the current
- * directory, this routine returns immediately.
+ * Get the current directory and cache the result in curdir.
  */
 char *
 getpwd(void)
 {
 	char buf[PATH_MAX];
+	char *p;
 
 	if (curdir)
 		return curdir;
-	if (getcwd(buf, sizeof(buf)) == NULL) {
+
+	p = getpwd2(buf, sizeof(buf));
+	if (p != NULL)
+		curdir = savestr(p);
+
+	return curdir;
+}
+
+/*
+ * Return the current directory.
+ */
+STATIC char *
+getpwd2(char *buf, size_t size)
+{
+	if (getcwd(buf, size) == NULL) {
 		char *pwd = getenv("PWD");
 		struct stat stdot, stpwd;
 
@@ -373,12 +383,9 @@
 		    stat(pwd, &stpwd) != -1 &&
 		    stdot.st_dev == stpwd.st_dev &&
 		    stdot.st_ino == stpwd.st_ino) {
-			curdir = savestr(pwd);
-			return curdir;
+			return pwd;
 		}
 		return NULL;
 	}
-	curdir = savestr(buf);
-
-	return curdir;
+	return buf;
 }

==== //depot/projects/xen31/bin/sh/mksyntax.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.24 2005/08/13 15:47:13 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.25 2008/02/18 20:01:33 marcel Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
@@ -139,10 +139,7 @@
 
 	/* Determine the characteristics of chars. */
 	c = -1;
-	if (c < 0)
-		sign = 1;
-	else
-		sign = 0;
+	sign = (c > 0) ? 0 : 1;
 	for (nbits = 1 ; ; nbits++) {
 		d = (1 << nbits) - 1;
 		if (d == c)

==== //depot/projects/xen31/contrib/tcpdump/print-802_11.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */
+/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */
 /*
  * Copyright (c) 2001
  *	Fortress Technologies, Inc.  All rights reserved.
@@ -1186,9 +1186,9 @@
 		break;
 	case IEEE80211_RADIOTAP_RATE:
 		if (u.u8 & 0x80)
+			PRINT_HT_RATE("", u.u8, " Mb/s ");
+		else
 			PRINT_RATE("", u.u8, " Mb/s ");
-		else
-			PRINT_HT_RATE("", u.u8, " Mb/s ");
 		break;
 	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
 		printf("%ddB signal ", u.i8);

==== //depot/projects/xen31/contrib/traceroute/traceroute.8#2 (text+ko) ====

@@ -14,9 +14,9 @@
 .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .\"	$Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\"	$FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $
+.\"	$FreeBSD: src/contrib/traceroute/traceroute.8,v 1.17 2008/02/20 23:29:52 rpaulo Exp $
 .\"
-.TH TRACEROUTE 8 "21 September 2000"
+.TH TRACEROUTE 8 "19 February 2008"
 .UC 6
 .SH NAME
 traceroute \- print the route packets take to network host
@@ -24,7 +24,7 @@
 .na
 .B traceroute
 [
-.B \-dDeFISnrvx
+.B \-adDeFISnrvx
 ] [
 .B \-f
 .I first_ttl
@@ -71,6 +71,9 @@
 .B \-w
 .I waittime
 ] [
+.B \-A
+.I as_server
+] [
 .B \-z
 .I pausemsecs
 ]
@@ -98,6 +101,13 @@
 .PP
 Other options are:
 .TP
+.B \-a
+Turn on AS# lookups for each hop encountered.
+.TP
+.B -A
+Turn  on  AS#  lookups  and  use the given server instead of the
+default.
+.TP
 .B \-e
 Firewall evasion mode.
 Use fixed destination ports for UDP and TCP probes.
@@ -443,3 +453,7 @@
 router that's filtering packets), but this is not implemented yet.
 .PP
 Please send bug reports to traceroute at ee.lbl.gov.
+.PP
+The AS number capability reports information that may sometimes be
+inaccurate due to discrepancies between the contents of the
+routing database server and the current state of the Internet.

==== //depot/projects/xen31/contrib/traceroute/traceroute.c#2 (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.34 2007/07/01 12:08:05 gnn Exp $";
+    "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $";
 #endif
 
 /*
@@ -263,6 +263,7 @@
 
 #include "findsaddr.h"
 #include "ifaddrlist.h"
+#include "as.h"
 #include "traceroute.h"
 
 /* Maximum number of gateways (include room for one noop) */
@@ -350,6 +351,9 @@
 int verbose;
 int waittime = 5;		/* time to wait for response (in seconds) */
 int nflag;			/* print addresses numerically */
+int as_path;			/* print as numbers for each hop */
+char *as_server = NULL;
+void *asn;
 #ifdef CANT_HACK_IPCKSUM
 int doipcksum = 0;		/* don't calculate ip checksums by default */
 #else
@@ -535,9 +539,17 @@
 		prog = argv[0];
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
+	while ((op = getopt(argc, argv, "aA:edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
 		switch (op) {
-
+		case 'a':
+			as_path = 1;
+			break;
+			
+		case 'A':
+			as_path = 1;
+			as_server = optarg;
+			break;
+			    
 		case 'd':
 			options |= SO_DEBUG;
 			break;
@@ -913,6 +925,16 @@
 		exit (1);
 	}
 
+	if (as_path) {
+		asn = as_setup(as_server);
+		if (asn == NULL) {
+			Fprintf(stderr, "%s: as_setup failed, AS# lookups"
+			    " disabled\n", prog);
+			(void)fflush(stderr);
+			as_path = 0;
+		}
+	}
+	
 #if	defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
 	if (setpolicy(sndsock, "in bypass") < 0)
 		errx(1, "%s", ipsec_strerror());
@@ -1118,6 +1140,8 @@
 		    (unreachable > 0 && unreachable >= nprobes - 1))
 			break;
 	}
+	if (as_path)
+		as_shutdown(asn);
 	exit(0);
 }
 
@@ -1458,6 +1482,9 @@
 	hlen = ip->ip_hl << 2;
 	cc -= hlen;
 
+	if (as_path)
+		Printf(" [AS%d]", as_lookup(asn, &from->sin_addr));
+
 	if (nflag)
 		Printf(" %s", inet_ntoa(from->sin_addr));
 	else
@@ -1764,8 +1791,8 @@
 
 	Fprintf(stderr, "Version %s\n", version);
 	Fprintf(stderr,
-	    "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n"
+	    "Usage: %s [-adDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n"
 	    "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n"
-	    "\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog);
+	    "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog);
 	exit(1);
 }

==== //depot/projects/xen31/games/fortune/datfiles/fortunes#8 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $
 %
 =======================================================================
 ||								     ||
@@ -15979,6 +15979,9 @@
 %
 Don't mind him; politicians always sound like that.
 %
+Don't patch bad code -- rewrite it.
+		-- "The Elements of Programming Style", Kernighan and Plauger
+%
 Don't plan any hasty moves.
 You'll be evicted soon anyway.
 %
@@ -31243,7 +31246,7 @@
 		-- Charles Dickens
 %
 Let the machine do the dirty work.
-		-- "Elements of Programming Style", Kernighan and Ritchie
+		-- "The Elements of Programming Style", Kernighan and Plauger
 %
 Let the meek inherit the earth -- they have it coming to them.
 		-- James Thurber

==== //depot/projects/xen31/games/fortune/strfile/strfile.c#2 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.28 2005/02/17 18:06:37 ru Exp $");
+__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.29 2008/02/19 07:09:17 ru Exp $");
 
 # include	<sys/param.h>
 # include	<sys/endian.h>
@@ -270,7 +270,7 @@
 {
 	int	ch;
 
-	while ((ch = getopt(argc, argv, "Cc:iorsx")) != EOF)
+	while ((ch = getopt(argc, argv, "Cc:iorsx")) != -1)
 		switch(ch) {
 		case 'C':			/* embedded comments */
 			Cflag++;

==== //depot/projects/xen31/gnu/lib/libgcc/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.58 2007/08/14 20:49:57 kan Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.59 2008/02/24 19:22:52 raj Exp $
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
@@ -122,7 +122,7 @@
 
 .if ${TARGET_ARCH} == "powerpc"
 #	from config/rs6000/t-ppccomm
-LIB2FUNCS_EXTRA = tramp.asm darwin-ldouble.c
+LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 

==== //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#2 (text+ko) ====

@@ -1,9 +1,17 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.13 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
+.if !defined(_WITH_GNUAR)
+PROGNAME= gnu-ar
+MAN=   gnu-ar.1
+gnu-ar.1: ar.1
+	cat ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gnu-ar.1
+.endif
+
 PROG=	ar
 SRCS=	ar.c not-ranlib.c
 CFLAGS+= -D_GNU_SOURCE

==== //depot/projects/xen31/gnu/usr.bin/binutils/ranlib/Makefile#2 (text+ko) ====

@@ -1,9 +1,17 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.14 2004/12/21 09:59:41 ru Exp $

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


More information about the p4-projects mailing list