Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Jan 2005 20:35:27 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 69080 for review
Message-ID:  <200501152035.j0FKZRVb091757@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=69080

Change 69080 by peter@peter_overcee on 2005/01/15 20:34:26

	IFC @69079

Affected files ...

.. //depot/projects/hammer/UPDATING#71 integrate
.. //depot/projects/hammer/bin/cat/cat.1#5 integrate
.. //depot/projects/hammer/bin/chio/chio.1#6 integrate
.. //depot/projects/hammer/bin/expr/expr.1#7 integrate
.. //depot/projects/hammer/bin/ls/ls.1#16 integrate
.. //depot/projects/hammer/bin/pax/ar_subs.c#5 integrate
.. //depot/projects/hammer/bin/pax/extern.h#4 integrate
.. //depot/projects/hammer/bin/pax/ftree.c#5 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#9 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#29 integrate
.. //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#5 integrate
.. //depot/projects/hammer/etc/periodic/security/100.chksetuid#5 integrate
.. //depot/projects/hammer/etc/rc.d/cleartmp#10 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 integrate
.. //depot/projects/hammer/include/Makefile#36 integrate
.. //depot/projects/hammer/lib/csu/i386/Makefile#2 delete
.. //depot/projects/hammer/lib/csu/i386/c++rt0.c#2 delete
.. //depot/projects/hammer/lib/csu/i386/crt0.c#2 delete
.. //depot/projects/hammer/lib/libarchive/archive_read.3#12 integrate
.. //depot/projects/hammer/lib/libarchive/libarchive.3#6 integrate
.. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#4 integrate
.. //depot/projects/hammer/lib/libc/Makefile#20 integrate
.. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/alpha/stdlib/gdtoa.mk#2 delete
.. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/libc/arm/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libc/arm/stdlib/gdtoa.mk#2 delete
.. //depot/projects/hammer/lib/libc/gdtoa/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/libc/gen/getnetgrent.c#5 integrate
.. //depot/projects/hammer/lib/libc/gen/vis.3#7 integrate
.. //depot/projects/hammer/lib/libc/i386/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/i386/stdlib/gdtoa.mk#2 delete
.. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/ia64/stdlib/gdtoa.mk#2 delete
.. //depot/projects/hammer/lib/libc/locale/mbsrtowcs.3#5 integrate
.. //depot/projects/hammer/lib/libc/locale/nextwctype.3#2 integrate
.. //depot/projects/hammer/lib/libc/locale/rpmatch.3#2 integrate
.. //depot/projects/hammer/lib/libc/net/addr2ascii.3#7 integrate
.. //depot/projects/hammer/lib/libc/net/getprotoent.3#3 integrate
.. //depot/projects/hammer/lib/libc/posix1e/acl_valid.3#4 integrate
.. //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#5 integrate
.. //depot/projects/hammer/lib/libc/powerpc/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libc/powerpc/stdlib/gdtoa.mk#3 delete
.. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libc/sparc64/stdlib/gdtoa.mk#2 delete
.. //depot/projects/hammer/lib/libc/stdio/setbuf.3#5 integrate
.. //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#6 integrate
.. //depot/projects/hammer/lib/libc/stdlib/merge.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdtime/strftime.3#7 integrate
.. //depot/projects/hammer/lib/libc/sys/intro.2#8 integrate
.. //depot/projects/hammer/lib/libc/sys/kse.2#7 integrate
.. //depot/projects/hammer/lib/libc/sys/mlock.2#8 integrate
.. //depot/projects/hammer/lib/libc/sys/pathconf.2#6 integrate
.. //depot/projects/hammer/lib/libc/sys/recv.2#8 integrate
.. //depot/projects/hammer/lib/libc/sys/semctl.2#4 integrate
.. //depot/projects/hammer/lib/libc/sys/semop.2#3 integrate
.. //depot/projects/hammer/lib/libc/sys/sendfile.2#11 integrate
.. //depot/projects/hammer/lib/libc/sys/stat.2#9 integrate
.. //depot/projects/hammer/lib/libutil/fparseln.3#3 integrate
.. //depot/projects/hammer/lib/msun/Makefile#19 integrate
.. //depot/projects/hammer/lib/msun/alpha/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/amd64/e_sqrt.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/amd64/s_llrint.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_lrint.S#1 branch
.. //depot/projects/hammer/lib/msun/arm/fenv.h#3 integrate
.. //depot/projects/hammer/lib/msun/i387/e_atan2f.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/e_log10f.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/e_logf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/e_remainderf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/e_scalbf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/e_sqrtf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/i387/s_ceilf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_copysignf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_cosf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_floorf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_llrint.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_log1p.S#2 delete
.. //depot/projects/hammer/lib/msun/i387/s_logbf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_lrint.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_rintf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_scalbnf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_significandf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_sinf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_tanf.S#1 branch
.. //depot/projects/hammer/lib/msun/ia64/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/man/acos.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/acosh.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/asin.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/atan2.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/atanh.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/ceil.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/cimag.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/cosh.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/exp.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/feclearexcept.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/fegetround.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/fenv.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/floor.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/fmax.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/hypot.3#5 integrate
.. //depot/projects/hammer/lib/msun/man/j0.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/lgamma.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/lrint.3#1 branch
.. //depot/projects/hammer/lib/msun/man/lround.3#1 branch
.. //depot/projects/hammer/lib/msun/man/math.3#5 integrate
.. //depot/projects/hammer/lib/msun/man/rint.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/round.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/sinh.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/sqrt.3#2 integrate
.. //depot/projects/hammer/lib/msun/powerpc/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/sparc64/fenv.h#2 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#24 integrate
.. //depot/projects/hammer/lib/msun/src/s_ceill.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_floorl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_llrint.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_llrintf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_llround.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_llroundf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_lrint.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_lrintf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_lround.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_lroundf.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_round.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_roundf.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-aout/Makefile#3 delete
.. //depot/projects/hammer/libexec/rtld-aout/dynamic.h#3 delete
.. //depot/projects/hammer/libexec/rtld-aout/i386/md-static-funcs.c#2 delete
.. //depot/projects/hammer/libexec/rtld-aout/i386/md.c#2 delete
.. //depot/projects/hammer/libexec/rtld-aout/i386/md.h#2 delete
.. //depot/projects/hammer/libexec/rtld-aout/i386/mdprologue.S#2 delete
.. //depot/projects/hammer/libexec/rtld-aout/md-prologue.c#2 delete
.. //depot/projects/hammer/libexec/rtld-aout/rtld.1aout#4 delete
.. //depot/projects/hammer/libexec/rtld-aout/rtld.c#3 delete
.. //depot/projects/hammer/release/Makefile#67 integrate
.. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#8 integrate
.. //depot/projects/hammer/sbin/geom/class/Makefile#5 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#8 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#6 integrate
.. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#4 integrate
.. //depot/projects/hammer/sbin/geom/class/label/glabel.8#7 integrate
.. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#5 integrate
.. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#5 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#4 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#8 integrate
.. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#8 integrate
.. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#6 integrate
.. //depot/projects/hammer/sbin/geom/class/shsec/Makefile#1 branch
.. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#1 branch
.. //depot/projects/hammer/sbin/geom/class/shsec/gshsec.8#1 branch
.. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#9 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#11 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.8#8 integrate
.. //depot/projects/hammer/sbin/init/Makefile#6 integrate
.. //depot/projects/hammer/sbin/init/init.c#8 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#35 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#36 integrate
.. //depot/projects/hammer/sbin/ldconfig/Makefile#3 integrate
.. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#7 integrate
.. //depot/projects/hammer/sbin/natd/natd.8#7 integrate
.. //depot/projects/hammer/share/examples/Makefile#10 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.1#2 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.3#6 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.4#3 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.9#1 branch
.. //depot/projects/hammer/share/man/man3/tgmath.3#2 integrate
.. //depot/projects/hammer/share/man/man4/altq.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ath.4#22 integrate
.. //depot/projects/hammer/share/man/man4/ath_hal.4#10 integrate
.. //depot/projects/hammer/share/man/man4/axe.4#8 integrate
.. //depot/projects/hammer/share/man/man4/bktr.4#7 integrate
.. //depot/projects/hammer/share/man/man4/ciss.4#8 integrate
.. //depot/projects/hammer/share/man/man4/cm.4#4 integrate
.. //depot/projects/hammer/share/man/man4/cnw.4#2 integrate
.. //depot/projects/hammer/share/man/man4/dc.4#15 integrate
.. //depot/projects/hammer/share/man/man4/divert.4#8 integrate
.. //depot/projects/hammer/share/man/man4/hptmv.4#2 integrate
.. //depot/projects/hammer/share/man/man4/ida.4#4 integrate
.. //depot/projects/hammer/share/man/man4/inet.4#13 integrate
.. //depot/projects/hammer/share/man/man4/ipsec.4#2 integrate
.. //depot/projects/hammer/share/man/man4/mac_biba.4#6 integrate
.. //depot/projects/hammer/share/man/man4/mac_mls.4#8 integrate
.. //depot/projects/hammer/share/man/man4/mac_portacl.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_panasonic.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/pbio.4#2 integrate
.. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#3 integrate
.. //depot/projects/hammer/share/man/man4/mem.4#7 integrate
.. //depot/projects/hammer/share/man/man4/mpt.4#6 integrate
.. //depot/projects/hammer/share/man/man4/netgraph.4#9 integrate
.. //depot/projects/hammer/share/man/man4/ng_device.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ng_netflow.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ngatmbase.4#3 integrate
.. //depot/projects/hammer/share/man/man4/psm.4#7 integrate
.. //depot/projects/hammer/share/man/man4/tdfx.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uplcom.4#8 integrate
.. //depot/projects/hammer/share/man/man4/vge.4#4 integrate
.. //depot/projects/hammer/share/man/man4/vkbd.4#2 integrate
.. //depot/projects/hammer/share/man/man4/wlan.4#7 integrate
.. //depot/projects/hammer/share/man/man4/wlan_acl.4#3 integrate
.. //depot/projects/hammer/share/man/man4/wlan_ccmp.4#3 integrate
.. //depot/projects/hammer/share/man/man4/wlan_tkip.4#3 integrate
.. //depot/projects/hammer/share/man/man4/wlan_wep.4#2 integrate
.. //depot/projects/hammer/share/man/man4/wlan_xauth.4#3 integrate
.. //depot/projects/hammer/share/man/man4/xl.4#10 integrate
.. //depot/projects/hammer/share/man/man5/ethers.5#2 integrate
.. //depot/projects/hammer/share/man/man5/periodic.conf.5#10 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#47 integrate
.. //depot/projects/hammer/share/man/man7/development.7#6 integrate
.. //depot/projects/hammer/share/man/man7/firewall.7#9 integrate
.. //depot/projects/hammer/share/man/man7/hier.7#25 integrate
.. //depot/projects/hammer/share/man/man9/DECLARE_GEOM_CLASS.9#4 integrate
.. //depot/projects/hammer/share/man/man9/DECLARE_MODULE.9#4 integrate
.. //depot/projects/hammer/share/man/man9/MODULE_DEPEND.9#3 integrate
.. //depot/projects/hammer/share/man/man9/VFS_START.9#6 integrate
.. //depot/projects/hammer/share/man/man9/VFS_STATFS.9#6 integrate
.. //depot/projects/hammer/share/man/man9/VFS_SYNC.9#6 integrate
.. //depot/projects/hammer/share/man/man9/VFS_VGET.9#7 integrate
.. //depot/projects/hammer/share/man/man9/bpf.9#3 integrate
.. //depot/projects/hammer/share/man/man9/devclass_get_count.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ifnet.9#17 integrate
.. //depot/projects/hammer/share/man/man9/mbuf_tags.9#5 integrate
.. //depot/projects/hammer/share/man/man9/microtime.9#3 integrate
.. //depot/projects/hammer/share/man/man9/microuptime.9#3 integrate
.. //depot/projects/hammer/share/man/man9/module.9#3 integrate
.. //depot/projects/hammer/share/man/man9/pfil.9#10 integrate
.. //depot/projects/hammer/share/man/man9/physio.9#5 integrate
.. //depot/projects/hammer/share/man/man9/printf.9#3 integrate
.. //depot/projects/hammer/share/man/man9/sleepqueue.9#6 integrate
.. //depot/projects/hammer/share/man/man9/style.9#19 integrate
.. //depot/projects/hammer/share/man/man9/suser.9#8 integrate
.. //depot/projects/hammer/share/man/man9/sx.9#9 integrate
.. //depot/projects/hammer/share/man/man9/taskqueue.9#8 integrate
.. //depot/projects/hammer/share/man/man9/time.9#6 integrate
.. //depot/projects/hammer/share/man/man9/vflush.9#3 integrate
.. //depot/projects/hammer/share/man/man9/vfs_suser.9#2 integrate
.. //depot/projects/hammer/share/man/man9/vm_map.9#6 integrate
.. //depot/projects/hammer/share/man/man9/vm_map_entry_resize_free.9#3 integrate
.. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#16 integrate
.. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#20 integrate
.. //depot/projects/hammer/sys/alpha/include/bus.h#14 integrate
.. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#63 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#45 integrate
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#9 integrate
.. //depot/projects/hammer/sys/arm/conf/IQ31244#6 integrate
.. //depot/projects/hammer/sys/arm/include/bus.h#6 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#3 integrate
.. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_wdog.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch
.. //depot/projects/hammer/sys/arm/xscale/i80321/iq80321.c#3 integrate
.. //depot/projects/hammer/sys/coda/coda_fbsd.c#15 integrate
.. //depot/projects/hammer/sys/coda/coda_venus.c#9 integrate
.. //depot/projects/hammer/sys/coda/coda_venus.h#5 integrate
.. //depot/projects/hammer/sys/coda/coda_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/coda/coda_vnops.c#12 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#26 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#13 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#8 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#20 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_mib.c#6 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#23 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_signal.c#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_socket.c#15 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#15 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#8 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#9 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#22 integrate
.. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#12 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#21 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#21 integrate
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#12 integrate
.. //depot/projects/hammer/sys/conf/NOTES#77 integrate
.. //depot/projects/hammer/sys/conf/files#100 integrate
.. //depot/projects/hammer/sys/conf/newvers.sh#14 integrate
.. //depot/projects/hammer/sys/conf/options#64 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#8 integrate
.. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#9 integrate
.. //depot/projects/hammer/sys/dev/aha/aha.c#12 integrate
.. //depot/projects/hammer/sys/dev/aha/aha_isa.c#11 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#15 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#14 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.h#5 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbusreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#12 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#7 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#8 integrate
.. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#7 integrate
.. //depot/projects/hammer/sys/dev/mse/mse.c#3 integrate
.. //depot/projects/hammer/sys/dev/mse/mse_cbus.c#3 integrate
.. //depot/projects/hammer/sys/dev/mse/mse_isa.c#3 integrate
.. //depot/projects/hammer/sys/dev/mse/msevar.h#3 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#32 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_isa.c#4 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#10 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbreg.h#5 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#8 integrate
.. //depot/projects/hammer/sys/dev/puc/puc.c#13 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_pci.c#7 integrate
.. //depot/projects/hammer/sys/dev/puc/pucvar.h#10 integrate
.. //depot/projects/hammer/sys/dev/usb/ehcivar.h#5 integrate
.. //depot/projects/hammer/sys/dev/usb/ohcivar.h#7 integrate
.. //depot/projects/hammer/sys/dev/usb/uhcivar.h#7 integrate
.. //depot/projects/hammer/sys/fs/deadfs/dead_vnops.c#10 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#13 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#24 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#13 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#28 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#28 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#20 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#20 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#14 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#14 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#12 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs.h#5 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#12 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#9 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#10 integrate
.. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#12 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#7 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#14 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#14 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#19 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#20 integrate
.. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#9 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#15 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#20 integrate
.. //depot/projects/hammer/sys/geom/geom_disk.c#29 integrate
.. //depot/projects/hammer/sys/geom/geom_vfs.c#3 integrate
.. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#1 branch
.. //depot/projects/hammer/sys/geom/shsec/g_shsec.h#1 branch
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#25 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#21 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#7 integrate
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable.c#16 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#39 integrate
.. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#15 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#26 integrate
.. //depot/projects/hammer/sys/ia64/include/bus.h#13 integrate
.. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_umtx.c#17 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#49 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#46 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#31 integrate
.. //depot/projects/hammer/sys/kern/vfs_init.c#15 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#47 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#68 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#38 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#27 integrate
.. //depot/projects/hammer/sys/kern/vnode_if.src#13 integrate
.. //depot/projects/hammer/sys/modules/geom/Makefile#10 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_shsec/Makefile#1 branch
.. //depot/projects/hammer/sys/net/bridge.c#21 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#36 integrate
.. //depot/projects/hammer/sys/net/if_stf.c#17 integrate
.. //depot/projects/hammer/sys/net/net_osdep.h#8 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#11 integrate
.. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#5 integrate
.. //depot/projects/hammer/sys/netgraph/ng_eiface.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/ng_iface.c#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#9 integrate
.. //depot/projects/hammer/sys/netgraph/ng_lmi.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ppp.c#13 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pptpgre.c#11 integrate
.. //depot/projects/hammer/sys/netgraph/ng_tty.c#11 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#19 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#48 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#9 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#28 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#14 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#15 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#30 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#9 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#35 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#34 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#20 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/include/bus.h#9 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#10 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#22 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#12 integrate
.. //depot/projects/hammer/sys/sparc64/include/bus.h#16 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#19 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#19 integrate
.. //depot/projects/hammer/sys/sys/buf.h#21 integrate
.. //depot/projects/hammer/sys/sys/bufobj.h#3 integrate
.. //depot/projects/hammer/sys/sys/linker_set.h#6 integrate
.. //depot/projects/hammer/sys/sys/mount.h#29 integrate
.. //depot/projects/hammer/sys/sys/umtx.h#7 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#42 integrate
.. //depot/projects/hammer/sys/tools/vnode_if.awk#10 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#9 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#11 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#12 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#30 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#20 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#41 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#14 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#10 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#28 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#36 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#48 integrate
.. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#2 integrate
.. //depot/projects/hammer/tools/regression/geom_shsec/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/geom_shsec/runtests.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_shsec/test-1.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_shsec/test-2.sh#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/Makefile#3 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.t#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-lround.c#1 branch
.. //depot/projects/hammer/tools/regression/lib/msun/test-lround.t#1 branch
.. //depot/projects/hammer/tools/regression/sockets/reconnect/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/sockets/reconnect/reconnect.c#1 branch
.. //depot/projects/hammer/usr.bin/c99/c99.c#2 integrate
.. //depot/projects/hammer/usr.bin/column/column.1#4 integrate
.. //depot/projects/hammer/usr.bin/find/find.1#14 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#12 integrate
.. //depot/projects/hammer/usr.bin/getopt/getopt.1#5 integrate
.. //depot/projects/hammer/usr.bin/hexdump/od.1#5 integrate
.. //depot/projects/hammer/usr.bin/locate/locate/locate.1#5 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#16 integrate
.. //depot/projects/hammer/usr.bin/ncal/ncal.1#5 integrate
.. //depot/projects/hammer/usr.bin/nl/nl.1#4 integrate
.. //depot/projects/hammer/usr.bin/rpcgen/rpcgen.1#4 integrate
.. //depot/projects/hammer/usr.bin/sed/sed.1#9 integrate
.. //depot/projects/hammer/usr.bin/sockstat/sockstat.1#4 integrate
.. //depot/projects/hammer/usr.bin/tail/forward.c#6 integrate
.. //depot/projects/hammer/usr.bin/tr/tr.1#9 integrate
.. //depot/projects/hammer/usr.bin/wc/wc.1#5 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/parser.y#3 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#8 integrate
.. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#7 integrate
.. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.8#6 integrate
.. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#6 integrate
.. //depot/projects/hammer/usr.sbin/eeprom/eeprom.8#3 integrate
.. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#11 integrate
.. //depot/projects/hammer/usr.sbin/jail/jail.8#15 integrate
.. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.8#5 integrate
.. //depot/projects/hammer/usr.sbin/moused/moused.8#10 integrate
.. //depot/projects/hammer/usr.sbin/mrouted/mrinfo.8#3 integrate
.. //depot/projects/hammer/usr.sbin/ndiscvt/ndiscvt.8#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#6 integrate
.. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#15 integrate
.. //depot/projects/hammer/usr.sbin/rtprio/rtprio.1#3 integrate
.. //depot/projects/hammer/usr.sbin/setkey/setkey.8#8 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#23 integrate
.. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#10 integrate
.. //depot/projects/hammer/usr.sbin/vidcontrol/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/vidcontrol/decode.c#2 integrate
.. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.c#4 integrate
.. //depot/projects/hammer/usr.sbin/zic/zic.8#4 integrate

Differences ...

==== //depot/projects/hammer/UPDATING#71 (text+ko) ====

@@ -23,6 +23,15 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+
+20050114:
+	Support for abbreviated forms of a number of ipfw options is
+	now deprecated.  Warnings are printed to stderr indicating the
+	correct full form when a match occurs.  Some abbreviations may
+	be supported at a later date based on user feedback.  To be
+	considered for support, abbreviations must be in use prior to
+	this commit and unlikely to be confused with current key words.
+
 20041221:
 	By a popular demand, a lot of NOFOO options were renamed
 	to NO_FOO (see bsd.compat.mk for a full list).  The old
@@ -2000,4 +2009,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.385 2004/12/23 16:03:08 ru Exp $
+$FreeBSD: src/UPDATING,v 1.386 2005/01/15 01:53:49 brooks Exp $

==== //depot/projects/hammer/bin/cat/cat.1#5 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/cat/cat.1,v 1.23 2005/01/10 08:39:20 imp Exp $
+.\" $FreeBSD: src/bin/cat/cat.1,v 1.24 2005/01/15 12:27:59 ru Exp $
 .\"
 .Dd March 21, 2004
 .Dt CAT 1
@@ -107,18 +107,16 @@
 .Ex -std
 .Sh EXAMPLES
 The command:
-.Bd -literal -offset indent
-.Ic cat file1
-.Ed
+.Pp
+.Dl "cat file1"
 .Pp
 will print the contents of
 .Ar file1
 to the standard output.
 .Pp
 The command:
-.Bd -literal -offset indent
-.Ic cat file1 file2 > file3
-.Ed
+.Pp
+.Dl "cat file1 file2 > file3"
 .Pp
 will sequentially print the contents of
 .Ar file1
@@ -134,9 +132,8 @@
 for more information on redirection.
 .Pp
 The command:
-.Bd -literal -offset indent
-.Ic cat file1 - file2 - file3
-.Ed
+.Pp
+.Dl "cat file1 - file2 - file3"
 .Pp
 will print the contents of
 .Ar file1 ,

==== //depot/projects/hammer/bin/chio/chio.1#6 (text+ko) ====

@@ -1,5 +1,4 @@
 .\"	$NetBSD: chio.1,v 1.4 1997/10/02 00:41:25 hubertf Exp $
-
 .\"-
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
 .\" All rights reserved.
@@ -31,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/chio/chio.1,v 1.25 2005/01/10 08:39:20 imp Exp $
+.\" $FreeBSD: src/bin/chio/chio.1,v 1.26 2005/01/13 08:46:19 ru Exp $
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1

==== //depot/projects/hammer/bin/expr/expr.1#7 (text+ko) ====

@@ -1,5 +1,4 @@
 .\" -*- nroff -*-
-
 .\"-
 .\" Copyright (c) 1993 Winning Strategies, Inc.
 .\" All rights reserved.
@@ -29,7 +28,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: src/bin/expr/expr.1,v 1.26 2005/01/10 08:39:22 imp Exp $
+.\" $FreeBSD: src/bin/expr/expr.1,v 1.27 2005/01/13 08:46:19 ru Exp $
 .\"
 .Dd July 12, 2004
 .Dt EXPR 1

==== //depot/projects/hammer/bin/ls/ls.1#16 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.83 2005/01/10 08:39:23 imp Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.84 2005/01/11 08:51:21 joerg Exp $
 .\"
-.Dd May 2, 2004
+.Dd January 11, 2005
 .Dt LS 1
 .Os
 .Sh NAME
@@ -196,7 +196,9 @@
 .Dq ell . )
 List in long format.
 (See below.)
-If the output is to a terminal, a total sum for all the file
+A total sum (in blocks, see the
+.Fl s
+option for the block size unit) for all the file
 sizes is output on a line before the long listing.
 .It Fl m
 Stream output format; list files across the page, separated by commas.
@@ -224,7 +226,7 @@
 .It Fl s
 Display the number of file system blocks actually used by each file, in units
 of 512 bytes, where partial units are rounded up to the next integer value.
-If the output is to a terminal, a total sum for all the file
+A total sum for all the file
 sizes is output on a line before the listing.
 The environment variable
 .Ev BLOCKSIZE

==== //depot/projects/hammer/bin/pax/ar_subs.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/ar_subs.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -400,8 +400,10 @@
 		/*
 		 * check if this file meets user specified options match.
 		 */
-		if (sel_chk(arcn) != 0)
+		if (sel_chk(arcn) != 0) {
+			ftree_notsel();
 			continue;
+		}
 		fd = -1;
 		if (uflag) {
 			/*
@@ -785,8 +787,10 @@
 		/*
 		 * check if this file meets user specified options
 		 */
-		if (sel_chk(arcn) != 0)
+		if (sel_chk(arcn) != 0) {
+			ftree_notsel();
 			continue;
+		}
 
 		/*
 		 * if there is already a file in the destination directory with

==== //depot/projects/hammer/bin/pax/extern.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- * $FreeBSD: src/bin/pax/extern.h,v 1.15 2004/04/06 20:06:48 markm Exp $
+ * $FreeBSD: src/bin/pax/extern.h,v 1.16 2005/01/12 03:25:55 brian Exp $
  */
 
 /*
@@ -155,6 +155,7 @@
 int ftree_start(void);
 int ftree_add(char *, int);
 void ftree_sel(ARCHD *);
+void ftree_notsel(void);
 void ftree_chk(void);
 int next_file(ARCHD *);
 

==== //depot/projects/hammer/bin/pax/ftree.c#5 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.23 2004/04/06 20:06:48 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/ftree.c,v 1.24 2005/01/12 03:25:55 brian Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -214,6 +214,18 @@
 }
 
 /*
+ * ftree_notsel()
+ *	this entry has not been selected by pax.
+ */
+
+void
+ftree_notsel()
+{
+	if (ftent != NULL)
+		(void)fts_set(ftsp, ftent, FTS_SKIP);
+}
+
+/*
  * ftree_chk()
  *	called at end on pax execution. Prints all those file args that did not
  *	have a selected member (reference count still 0)

==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#9 (text+ko) ====

@@ -2501,7 +2501,9 @@
 .    nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c
 .
 .    nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0
+.    nr doc-curr-font \n[.f]
 .    nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0
+.    nr doc-curr-size \n[.ps]
 .    nr doc-fontmode-depth -1
 .  \}
 .  el \

==== //depot/projects/hammer/etc/mtree/BSD.include.dist#29 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.94 2004/12/15 13:58:28 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.96 2005/01/14 14:18:18 dds Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -42,6 +42,8 @@
         ..
         ofw
         ..
+        pbio
+        ..
         ppbus
         ..
         smbus
@@ -94,6 +96,8 @@
         ..
         raid3
         ..
+        shsec
+        ..
         stripe
         ..
     ..

==== //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.18 2005/01/11 02:08:53 brian Exp $
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -51,7 +51,7 @@
 		done
 		cat /var/log/maillog
 	    } |
-		sed -n -E "s/^$start"'.*ruleset=check_[^ \t]+,[ \t]+arg1=<([^@]+@)?([^>,]+).*reject=([^ \t]*)[ \t].*[ \t]([a-zA-Z0-9_.]+)$/\2 (\3... \4)/p' |
+		sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=<?([^@]+@)?([^>,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' |
 		sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l)
 	    [ $rc -gt 0 ] && rc=1
 	fi;;

==== //depot/projects/hammer/etc/periodic/security/100.chksetuid#5 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $
+# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -44,7 +44,7 @@
 	echo ""
 	echo 'Checking setuid files and devices:'
 	# XXX Note that there is the possibility of overrunning the args to ls
-	MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort`
+	MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort`
 	if [ -n "${MP}" ]
 	then
 	    set ${MP}

==== //depot/projects/hammer/etc/rc.d/cleartmp#10 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/cleartmp,v 1.11 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/cleartmp,v 1.12 2005/01/12 07:18:25 anholt Exp $
 #
 
 # PROVIDE: cleartmp
@@ -14,6 +14,7 @@
 rcvar=`set_rcvar clear_tmp`
 start_cmd="cleartmp_start"
 stop_cmd=":"
+x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix"
 
 cleartmp_start()
 {
@@ -31,9 +32,9 @@
 load_rc_config $name
 run_rc_command "$1"
 
-# Remove X lock files, since they will prevent you from
-# restarting X
-#
+# Remove X lock files, since they will prevent you from restarting X.
 rm -f /tmp/.X[0-9]-lock
-rm -fr /tmp/.X11-unix
-mkdir -m 1777 /tmp/.X11-unix
+
+# Create socket directories with correct permissions to avoid security problem.
+rm -fr ${x11_socket_dirs}
+mkdir -m 1777 ${x11_socket_dirs}

==== //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#3 (text+ko) ====

@@ -22,13 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.5 2005/01/13 10:07:51 ru Exp $
 .Dd August 1, 2004
 .Os
 .Dt KGDB 1
 .Sh NAME
 .Nm kgdb
-.Nd The kernel debugger
+.Nd "kernel debugger"
 .Sh SYNOPSIS
 .Nm
 .Op Fl a
@@ -83,8 +83,7 @@
 .El
 .Pp
 The
-.Fl c ,
-.Fl n ,
+.Fl c , n ,
 and
 .Fl r
 options are mutually exclusive.
@@ -101,7 +100,7 @@
 will be opened to allow debugging the currenlty running
 kernel.
 .Sh FILES
-.Bl -tag -width "Pa /var/crash"
+.Bl -tag -width ".Pa /var/crash"
 .It Pa /dev/mem
 Default memory image to open if no core dump file
 has been specified.

==== //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.8 2004/11/15 13:06:01 davidxu Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c,v 1.9 2005/01/11 14:53:16 peadar Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -602,7 +602,8 @@
       return;
     }
 
-  lwp = GET_LWP (inferior_ptid);
+  /* XXX: We've replaced the pid with the lwpid for GDB's benefit. */
+  lwp = GET_PID (inferior_ptid);
 
   if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1)
     error ("Cannot get lwp %d registers: %s\n", lwp, safe_strerror (errno));
@@ -1271,7 +1272,10 @@
   struct cleanup *old_chain;
 
   old_chain = save_inferior_ptid ();
-  inferior_ptid = BUILD_LWP (lwpid, PIDGET (inferior_ptid));
+
+  /* XXX: Target operation isn't lwp aware: replace pid with lwp */
+  inferior_ptid = BUILD_LWP (0, lwpid);
+
   target_fetch_registers (-1);
   fill_gregset (gregset, -1);
   do_cleanups (old_chain);

==== //depot/projects/hammer/include/Makefile#36 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.229 2004/11/17 23:48:17 ru Exp $
+# $FreeBSD: src/include/Makefile,v 1.231 2005/01/14 14:18:18 dds Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -32,13 +32,16 @@
 	netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \
 	pccard posix4 sys vm
 
-LSUBDIRS=	cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \
-	dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \
-	fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
-	fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \
+LSUBDIRS=	cam/scsi \
+	dev/an dev/bktr dev/firewire dev/ic dev/iicbus dev/ofw dev/pbio \
+	dev/ppbus dev/smbus dev/usb dev/wi dev/utopia \
+	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
+	fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \
+	fs/unionfs \
 	geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \
-	geom/stripe \
-	isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
+	geom/shsec geom/stripe \
+	isofs/cd9660 \
+	netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
 	netgraph/atm netgraph/netflow \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \
 	security/mac_mls security/mac_partition \

==== //depot/projects/hammer/lib/libarchive/archive_read.3#12 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.14 2005/01/10 05:11:15 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.16 2005/01/12 05:56:49 kientzle Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_read 3
@@ -50,7 +50,7 @@
 .Nm archive_read_data_into_fd ,
 .Nm archive_read_extract ,
 .Nm archive_read_extract_set_progress_callback ,
-.Nm archive_read_close
+.Nm archive_read_close ,
 .Nm archive_read_finish
 .Nd functions for reading streaming archives
 .Sh SYNOPSIS
@@ -80,9 +80,9 @@
 .Ft int
 .Fn archive_read_open "struct archive *" "void *client_data" "archive_open_archive_callback *" "archive_read_archive_callback *" "archive_close_archive_callback *"
 .Ft int
-.Fn archive_read_open_fd "struct archive *" "int fd"
+.Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size"
 .Ft int
-.Fn archive_read_open_file "struct archive *" "const char *filename"
+.Fn archive_read_open_file "struct archive *" "const char *filename" "size_t block_size"
 .Ft int
 .Fn archive_read_next_header "struct archive *" "struct archive_entry **"
 .Ft ssize_t
@@ -96,7 +96,7 @@
 .Ft int
 .Fn archive_read_data_into_fd "struct archive *" "int fd"
 .Ft int
-.Fn archive_read_extract "struct archive *" "int flags"
+.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags"
 .Ft void
 .Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data"
 .Ft int
@@ -146,7 +146,12 @@
 Freeze the settings, open the archive, and prepare for reading entries.
 This is the most generic version of this call, which accepts
 three callback functions.
-The library invokes these client-provided functions to obtain
+Most clients will want to use
+.Fn archive_read_open_file
+or
+.Fn archive_read_open_fd
+instead.
+The library invokes the client-provided functions to obtain
 raw bytes from the archive.
 Note: The API permits a decompression method to fork and invoke the
 callbacks from another process.
@@ -159,14 +164,14 @@
 .It Fn archive_read_open_fd
 Like
 .Fn archive_read_open ,
-except that it accepts a file descriptor rather than
+except that it accepts a file descriptor and block size rather than
 a trio of function pointers.
 Note that the file descriptor will not be automatically closed at
 end-of-archive.
 .It Fn archive_read_open_file
 Like
 .Fn archive_read_open ,
-except that it accepts a simple filename.
+except that it accepts a simple filename and a block size.
 A NULL filename represents standard input.
 .It Fn archive_read_next_header
 Read the header for the next entry and return a pointer to
@@ -188,6 +193,9 @@
 sparse files, as supported by some archive formats.
 The library gaurantees that offsets will increase and that blocks
 will not overlap.
+Note that the blocks returned from this function can be much larger
+than the block size read from disk, due to compression

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501152035.j0FKZRVb091757>