PERFORCE change 109405 for review

John Birrell jb at FreeBSD.org
Mon Nov 6 23:47:26 UTC 2006


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

Change 109405 by jb at jb_freebsd8 on 2006/11/06 23:45:25

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate
.. //depot/projects/dtrace/ports/MOVED#30 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.php.mk#6 integrate
.. //depot/projects/dtrace/ports/UPDATING#23 integrate
.. //depot/projects/dtrace/src/bin/sh/expand.c#4 integrate
.. //depot/projects/dtrace/src/bin/sh/parser.c#5 integrate
.. //depot/projects/dtrace/src/bin/sh/parser.h#4 integrate
.. //depot/projects/dtrace/src/etc/amd.map#4 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#20 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libiberty/config.h#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#3 integrate
.. //depot/projects/dtrace/src/lib/libarchive/Makefile#6 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write.3#4 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/net/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/lib/libc/amd64/net/htonl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/amd64/net/htons.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/amd64/net/ntohl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/amd64/net/ntohs.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/arm/arith.h#4 integrate
.. //depot/projects/dtrace/src/lib/libc/arm/net/htonl.S#5 delete
.. //depot/projects/dtrace/src/lib/libc/arm/net/htons.S#5 delete
.. //depot/projects/dtrace/src/lib/libc/arm/net/ntohl.S#5 delete
.. //depot/projects/dtrace/src/lib/libc/arm/net/ntohs.S#5 delete
.. //depot/projects/dtrace/src/lib/libc/i386/net/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/lib/libc/i386/net/htonl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/i386/net/htons.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/i386/net/ntohl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/i386/net/ntohs.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/byte_swap_2.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/byte_swap_4.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/htonl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/htons.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/ntohl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/ia64/net/ntohs.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#6 integrate
.. //depot/projects/dtrace/src/lib/libc/net/ntoh.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/powerpc/net/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/lib/libc/powerpc/net/htonl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/powerpc/net/htons.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/powerpc/net/ntohl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/powerpc/net/ntohs.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/sparc64/net/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/lib/libc/sparc64/net/htonl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/sparc64/net/htons.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/sparc64/net/ntohl.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/sparc64/net/ntohs.S#4 delete
.. //depot/projects/dtrace/src/lib/libc/sys/extattr_get_file.2#4 integrate
.. //depot/projects/dtrace/src/lib/libstand/Makefile#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_ok.3#4 integrate
.. //depot/projects/dtrace/src/sbin/devfs/devfs.8#4 integrate
.. //depot/projects/dtrace/src/sbin/routed/main.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/ips.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man8/nanobsd.8#3 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#11 integrate
.. //depot/projects/dtrace/src/share/man/man9/priv.9#1 branch
.. //depot/projects/dtrace/src/share/man/man9/suser.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/bsd-family-tree#9 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.endian.mk#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/io.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_uid16.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#5 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#7 integrate
.. //depot/projects/dtrace/src/sys/conf/files#39 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cdnr.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_hfsc.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_priq.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_red.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_rio.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/if_pfsync.c#6 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_main.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/an/if_an.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/arl/if_arl.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/asr/asr.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cnw/if_cnw.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ctau/if_ct.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cx/if_cx.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/dcons/dcons_os.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/fdc/fdc.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/fxp/if_fxp.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/kbd/kbd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/null/null.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/random/randomdev.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sbsh/if_sbsh.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/si/si.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/syscons/sysmouse.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/wl/if_wl.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/zs/zs.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_rule.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs_ioctl.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/umapfs/umap_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/io.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/vm86.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_sysi86.c#4 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/i4b/driver/i4b_ipr.c#4 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#5 integrate
.. //depot/projects/dtrace/src/sys/isofs/cd9660/cd9660_vfsops.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_acct.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_environment.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_ntptime.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_priv.c#1 branch
.. //depot/projects/dtrace/src/sys/kern/kern_prot.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_time.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_xxx.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_acl_posix1e.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_firmware.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_prf.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_ipc.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/sysv_msg.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/tty.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_cons.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pts.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pty.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#8 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#8 integrate
.. //depot/projects/dtrace/src/sys/net/if_ppp.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_sl.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_tap.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#8 integrate
.. //depot/projects/dtrace/src/sys/net/ppp_tty.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/dtrace/src/sys/netatalk/at_control.c#4 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_pcb.c#5 integrate
.. //depot/projects/dtrace/src/sys/netatm/atm_usrreq.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tty.c#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/in.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#10 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_output.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet6/ipsec.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#9 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec_osdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_usrreq.c#6 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_conn.c#4 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_mod.c#4 integrate
.. //depot/projects/dtrace/src/sys/netncp/ncp_subr.h#4 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_conn.c#5 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_subr.h#4 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#6 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/fdc.c#7 integrate
.. //depot/projects/dtrace/src/sys/posix4/p1003_1b.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_internal.h#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac/mac_priv.c#1 branch
.. //depot/projects/dtrace/src/sys/security/mac/mac_system.c#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/mac_partition/mac_partition.c#4 integrate
.. //depot/projects/dtrace/src/sys/security/mac_portacl/mac_portacl.c#5 integrate
.. //depot/projects/dtrace/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate
.. //depot/projects/dtrace/src/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/hvcons.c#7 integrate
.. //depot/projects/dtrace/src/sys/sys/jail.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/mac_policy.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/priv.h#1 branch
.. //depot/projects/dtrace/src/sys/sys/systm.h#11 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_extattr.c#4 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_quota.c#6 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/vm/swap_pager.c#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#6 integrate
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp1.0#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp2.2#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp3.2#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp4.2#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp5.2#1 branch
.. //depot/projects/dtrace/src/tools/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ascii.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.block.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dddh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ddhh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhdd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhdh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.dhhh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.ed.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.grep.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hddh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hdhh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhdh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhd2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhh.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.hhhh2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.n21.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.out#4 delete
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.sh#4 integrate
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.stutter.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.tabs.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.x.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.xaa.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.yes.out#1 branch
.. //depot/projects/dtrace/src/usr.bin/jot/jot.1#5 integrate
.. //depot/projects/dtrace/src/usr.bin/jot/jot.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/ktrace/ktrace.1#4 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#11 integrate
.. //depot/projects/dtrace/www/en/releases/6.2R/todo.sgml#5 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.334 2006/08/21 18:50:41 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.335 2006/11/06 15:08:17 trhodes Exp $
 -->
 
 <chapter id="install">
@@ -269,8 +269,8 @@
 	want a graphical user interface.  If you intend to install a lot of
 	third party software as well, then you will need more space.</para>
 
-      <para>You can use a commercial tool such as <application>&partitionmagic;</application>
-	to resize your partitions to make space for
+      <para>You can use a commercial tool such as <application>&partitionmagic;</application>, or a free tool such as <application>GParted</application>,
+	to resize your partitions and make space for
 	FreeBSD.  The <filename>tools</filename> directory on the CDROM
 	contains two free software tools which can carry out this task, namely
 	<application>FIPS</application> and

==== //depot/projects/dtrace/ports/MOVED#30 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1176 2006/11/05 17:55:55 alepulver Exp $
+# $FreeBSD: ports/MOVED,v 1.1177 2006/11/06 17:49:08 ale Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2516,3 +2516,4 @@
 graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
 chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname
 mail/nail|mail/heirloom-mailx|2006-11-05|Project name changed
+databases/php5-filepro||2006-11-06|Removed in 5.2 branch

==== //depot/projects/dtrace/ports/Mk/bsd.php.mk#6 (text+ko) ====

@@ -7,7 +7,7 @@
 # Please send all suggested changes to the maintainer instead of committing
 # them to CVS yourself.
 #
-# $FreeBSD: ports/Mk/bsd.php.mk,v 1.33 2006/09/11 21:10:07 ale Exp $
+# $FreeBSD: ports/Mk/bsd.php.mk,v 1.34 2006/11/06 17:43:10 ale Exp $
 #
 # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk.
 # If the port requires a predefined set of PHP extensions, they can be
@@ -43,7 +43,7 @@
 .if ${PHP_VER} == 4
 PHP_EXT_DIR=	20020429
 .else
-PHP_EXT_DIR=	20050922
+PHP_EXT_DIR=	20060613
 .endif
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
@@ -228,7 +228,7 @@
 .if ${USE_PHP:L} != "yes"
 # non-version specific components
 _USE_PHP_ALL=	bcmath bz2 calendar ctype curl dba dbase \
-		exif fileinfo filepro fribidi ftp gd gettext gmp \
+		exif fileinfo fribidi ftp gd gettext gmp \
 		hash iconv imap interbase ldap mbstring mcrypt \
 		mhash ming mssql mysql ncurses odbc \
 		openssl panda pcntl pcre pdf pgsql posix \
@@ -236,7 +236,7 @@
 		sockets sybase_ct sysvmsg sysvsem sysvshm \
 		tokenizer wddx xml xmlrpc yaz zip zlib
 # version specific components
-_USE_PHP_VER4=	${_USE_PHP_ALL} crack dbx dio domxml mcal mcve \
+_USE_PHP_VER4=	${_USE_PHP_ALL} crack dbx dio domxml filepro mcal mcve \
 		mnogosearch oracle overload pfpro xslt yp
 _USE_PHP_VER5=	${_USE_PHP_ALL} dom mysqli pdo simplexml soap sqlite \
 		tidy xmlreader xmlwriter xsl

==== //depot/projects/dtrace/ports/UPDATING#23 (text+ko) ====

@@ -6,6 +6,20 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20061106
+  AFFECTS: users of syutils/munin-*
+  AUTHOR: miwi at FreeBSD.org
+
+  - The default install location has changed from
+    ${PREFIX}/www/data/munin to ${PREFIX}/www/munin.
+
+20061106
+  AFFECTS: users of chinese/tatter-tools
+  AUTHOR: chinsan.tw at gmail.com
+
+  - The default install location has changed from
+    ${PREFIX}/www/data/tatter to ${PREFIX}/www/tatter.
+
 20061102
   AFFECTS: users of mail/fetchmail
   AUTHOR: barner at FreeBSD.org
@@ -4333,4 +4347,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.419 2006/11/02 16:05:29 barner Exp $
+$FreeBSD: ports/UPDATING,v 1.421 2006/11/06 22:50:19 miwi Exp $

==== //depot/projects/dtrace/src/bin/sh/expand.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.49 2006/02/04 14:37:50 schweikh Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.50 2006/11/05 18:36:05 stefanf Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -763,6 +763,11 @@
 			goto record;
 		break;
 
+	case VSERROR:
+		c = p - var - 1;
+		error("${%.*s%s}: Bad substitution", c, var,
+		    (c > 0 && *p != CTLENDVAR) ? "..." : "");
+
 	default:
 		abort();
 	}

==== //depot/projects/dtrace/src/bin/sh/parser.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.58 2006/11/05 18:36:05 stefanf Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -1228,12 +1228,17 @@
 				c = pgetc();
 			}
 		} else {
-			if (! is_special(c))
-badsub:				synerror("Bad substitution");
-			USTPUTC(c, out);
-			c = pgetc();
+			if (! is_special(c)) {
+				subtype = VSERROR;
+				if (c == '}')
+					pungetc();
+				else
+					USTPUTC(c, out);
+			} else {
+				USTPUTC(c, out);
+				c = pgetc();
+			}
 		}
-		STPUTC('=', out);
 		flags = 0;
 		if (subtype == 0) {
 			switch (c) {
@@ -1243,9 +1248,13 @@
 				/*FALLTHROUGH*/
 			default:
 				p = strchr(types, c);
-				if (p == NULL)
-					goto badsub;
-				subtype = p - types + VSNORMAL;
+				if (p == NULL) {
+					if (flags == VSNUL)
+						STPUTC(':', out);
+					STPUTC(c, out);
+					subtype = VSERROR;
+				} else
+					subtype = p - types + VSNORMAL;
 				break;
 			case '%':
 			case '#':
@@ -1261,9 +1270,10 @@
 					break;
 				}
 			}
-		} else {
+		} else if (subtype != VSERROR) {
 			pungetc();
 		}
+		STPUTC('=', out);
 		if (subtype != VSLENGTH && (dblquote || arinest))
 			flags |= VSQUOTE;
 		*(stackblock() + typeloc) = subtype | flags;

==== //depot/projects/dtrace/src/bin/sh/parser.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/parser.h,v 1.10 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/parser.h,v 1.11 2006/11/05 18:36:05 stefanf Exp $
  */
 
 /* control characters in argument strings */
@@ -60,6 +60,7 @@
 #define VSTRIMRIGHT	0x8		/* ${var%pattern} */
 #define VSTRIMRIGHTMAX 	0x9		/* ${var%%pattern} */
 #define VSLENGTH	0xa		/* ${#var} */
+#define VSERROR		0xb		/* Syntax error, issue when expanded */
 
 
 /*

==== //depot/projects/dtrace/src/etc/amd.map#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/amd.map,v 1.9 2002/05/15 22:24:29 obrien Exp $
+# $FreeBSD: src/etc/amd.map,v 1.10 2006/11/06 01:42:11 obrien Exp $
 #
 /defaults       type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
-*               opts:=rw,grpid,resvport,vers=3,proto=udp,nosuid,nodev
+*               opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#20 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.301 2006/10/28 20:08:12 phk Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.302 2006/11/06 15:11:24 rwatson Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -478,6 +478,7 @@
 ##############################################################
 
 auditd_enable="NO"	# Run the audit daemon.
+auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
 cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.

==== //depot/projects/dtrace/src/gnu/usr.bin/binutils/libiberty/config.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.8 2006/09/14 06:36:13 imp Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.9 2006/11/06 02:32:29 obrien Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
@@ -7,7 +7,7 @@
 
 
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#if defined(__sparc64__) || defined(__ARMEB__)
+#if defined(__sparc64__) || defined(__ARMEB__) || defined(TARGET_BIG_ENDIAN)
 #define BYTEORDER 4321
 #else
 #define BYTEORDER 1234
@@ -325,7 +325,7 @@
 
 /* Define if the host machine stores words of multi-word integers in
    big-endian order. */
-#if defined(__sparc64__) || defined(__ARMEB__)
+#if defined(__sparc64__) || defined(__ARMEB__) || defined(TARGET_BIG_ENDIAN)
 #define HOST_WORDS_BIG_ENDIAN 1
 #endif
 

==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/arm.md.diff#3 (text+ko) ====

@@ -1,20 +1,13 @@
-$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.1 2006/09/18 17:08:32 imp Exp $
+$FreeBSD: src/gnu/usr.bin/cc/cc_tools/arm.md.diff,v 1.2 2006/11/06 02:49:19 obrien Exp $
 Index: arm.md
 ===================================================================
 RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v
 retrieving revision 1.1.1.7
 diff -u -p -r1.1.1.7 arm.md
 --- arm.md	3 Jun 2005 03:28:42 -0000	1.1.1.7
-+++ arm.md	29 Aug 2005 12:39:39 -0000
-@@ -8836,12 +8836,12 @@
- 	ldm[2] = operands[4];
-       }
-     if (GET_CODE (XEXP (operands[2], 0)) != REG)
--      val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1));
-+	val1 = INTVAL (XEXP (XEXP (operands[2], 0), 1));
-     if (GET_CODE (XEXP (operands[3], 0)) != REG)
--      val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1));
-+        val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1));
++++ arm.md	6 Nov 2006 02:44:36 -0000
+@@ -8840,7 +8840,7 @@
+       val2 = INTVAL (XEXP (XEXP (operands[3], 0), 1));
      arith[0] = operands[0];
      arith[3] = operands[1];
 -    if (val1 < val2)
@@ -22,7 +15,7 @@
        {
  	arith[1] = ldm[1];
  	arith[2] = ldm[2];
-@@ -8871,7 +8871,7 @@
+@@ -8870,7 +8870,7 @@
  	else
  	  output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm);
        }
@@ -31,7 +24,7 @@
        {
  	ldm[0] = XEXP (operands[2], 0);
  	if (val1 < val2)
-@@ -8879,6 +8879,14 @@
+@@ -8878,6 +8878,14 @@
  	else
  	  output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm);
        }

==== //depot/projects/dtrace/src/lib/libarchive/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.52 2006/11/06 00:28:46 kientzle Exp $
 
 LIB=	archive
 DPADD=	${LIBBZ2} ${LIBZ}
@@ -13,12 +13,9 @@
 ARCHIVE_API_MAJOR!=	echo ${VERSION} | sed -e 's/\..*//'
 ARCHIVE_API_MINOR!=	echo ${VERSION} | sed -e 's/[0-9]*\.//' | sed -e 's/\..*//'
 
-# The FreeBSD SHLIB_MAJOR is computed from the above values.
-# To bump SHLIB_MAJOR, increase the MINOR number in "version" file.
-SHLIB_MAJOR!= echo $$((${ARCHIVE_API_MAJOR} + ${ARCHIVE_API_MINOR}))
-# The SHLIB_MAJOR computation above attempts to match the
-# version number generated by libtool.  (This may change
-# when the FreeBSD port of libtool gets fixed.)
+# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
+# It has no real relation to the version number above.
+SHLIB_MAJOR= 3
 
 CFLAGS+=	-DPACKAGE_NAME=\"lib${LIB}\"
 CFLAGS+=	-DPACKAGE_VERSION=\"${VERSION}\"
@@ -187,7 +184,6 @@
 MLINKS+=	archive_write.3 archive_write_open.3
 MLINKS+=	archive_write.3 archive_write_open_fd.3
 MLINKS+=	archive_write.3 archive_write_open_file.3
-MLINKS+=	archive_write.3 archive_write_prepare.3
 MLINKS+=	archive_write.3 archive_write_set_bytes_per_block.3
 MLINKS+=	archive_write.3 archive_write_set_bytes_in_last_block.3
 MLINKS+=	archive_write.3 archive_write_set_callbacks.3

==== //depot/projects/dtrace/src/lib/libarchive/archive_write.3#4 (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_write.3,v 1.13 2005/11/24 10:06:05 ru Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.14 2006/11/06 00:28:46 kientzle Exp $
 .\"
 .Dd January 8, 2005
 .Dt archive_write 3
@@ -42,7 +42,6 @@
 .Nm archive_write_open ,
 .Nm archive_write_open_fd ,
 .Nm archive_write_open_file ,
-.Nm archive_write_prepare ,
 .Nm archive_write_header ,
 .Nm archive_write_data ,
 .Nm archive_write_close ,

==== //depot/projects/dtrace/src/lib/libarchive/archive_write.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.18 2006/09/05 05:59:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.19 2006/11/06 00:16:40 kientzle Exp $");
 
 /*
  * This file contains the "essential" portions of the write API, that
@@ -47,8 +47,6 @@
 #include "archive_entry.h"
 #include "archive_private.h"
 
-extern char		**environ;
-
 /*
  * Allocate, initialize and return an archive object.
  */

==== //depot/projects/dtrace/src/lib/libc/arm/arith.h#4 (text+ko) ====

@@ -1,7 +1,7 @@
 /*
  * MD header for contrib/gdtoa
  *
- * $FreeBSD: src/lib/libc/arm/arith.h,v 1.1 2004/05/14 12:04:29 cognet Exp $
+ * $FreeBSD: src/lib/libc/arm/arith.h,v 1.2 2006/11/06 20:49:23 cognet Exp $
  */
 
 /*
@@ -11,6 +11,11 @@
  * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
  */
 
+#ifndef __ARMEB__
 #define IEEE_8087
 #define Arith_Kind_ASL 1
 #define Sudden_Underflow
+#else
+#define IEEE_MC68k
+#define Arith_Kind_ASL 2
+#endif

==== //depot/projects/dtrace/src/lib/libc/net/Makefile.inc#6 (text+ko) ====

@@ -1,17 +1,17 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.61 2006/07/26 08:36:46 yar Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.62 2006/11/06 22:07:47 cognet Exp $
 
 # machine-independent net sources
-.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net
+.PATH: ${.CURDIR}/net
 
-SRCS+=	addr2ascii.c ascii2addr.c base64.c ether_addr.c eui64.c \
+SRCS+=	addr2ascii.c ascii2addr.c base64.c  ether_addr.c eui64.c \
 	gai_strerror.c getaddrinfo.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
 	getifaddrs.c getifmaddrs.c getnameinfo.c \
 	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
 	getproto.c getprotoent.c getprotoname.c getservent.c \
 	if_indextoname.c if_nameindex.c if_nametoindex.c \
-	ip6opt.c linkaddr.c map_v4v6.c name6.c \
+	ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
 	nsdispatch.c nslexer.c nsparser.c nss_compat.c \
 	rcmd.c rcmdsh.c recv.c rthdr.c send.c sockatmark.c vars.c
 
@@ -42,11 +42,6 @@
 	${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
 		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
 
-# machine-dependent net sources
-.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc)
-.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc"
-.endif
-
 MAN+=	addr2ascii.3 byteorder.3 ethers.3 eui64.3 \
 	getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
 	getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \

==== //depot/projects/dtrace/src/lib/libc/sys/extattr_get_file.2#4 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.17 2005/06/10 16:54:17 rodrigc Exp $
+.\" $FreeBSD: src/lib/libc/sys/extattr_get_file.2,v 1.18 2006/11/06 15:12:43 rwatson Exp $
 .\"
 .Dd February 23, 2005
 .Dt EXTATTR 2
@@ -48,7 +48,6 @@
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/extattr.h
-.In sys/uio.h
 .Ft ssize_t
 .Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
 .Ft int

==== //depot/projects/dtrace/src/lib/libstand/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libstand/Makefile,v 1.56 2006/08/22 08:03:01 ru Exp $
+# $FreeBSD: src/lib/libstand/Makefile,v 1.57 2006/11/06 22:07:45 cognet Exp $
 # Originally from	$NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $
 #
 # Notes:
@@ -37,13 +37,9 @@
 # private (pruned) versions of libc string functions
 SRCS+=	strcasecmp.c
 
-# byte order functions from libc
-.if ${MACHINE_ARCH} != "amd64"
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net
-.else
-.PATH: ${.CURDIR}/../libc/i386/net
-.endif
-SRCS+= htons.S ntohs.S htonl.S ntohl.S
+.PATH: ${.CURDIR}/../libc/net
+
+SRCS+= ntoh.c
 
 # string functions from libc
 .PATH: ${.CURDIR}/../libc/string

==== //depot/projects/dtrace/src/lib/libutil/login_ok.3#4 (text+ko) ====

@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.14 2004/07/02 23:52:19 ru Exp $
+.\" $FreeBSD: src/lib/libutil/login_ok.3,v 1.15 2006/11/05 19:00:08 trhodes Exp $
 .\"
 .Dd January 2, 1997
 .Os
@@ -56,7 +56,7 @@
 An empty
 .Em ttys.allow
 list (or if no such capability exists for
-the give login class) logins via any tty device are allowed unless
+the given login class) logins via any tty device are allowed unless
 the
 .Em ttys.deny
 list exists and is non-empty, and the device or its

==== //depot/projects/dtrace/src/sbin/devfs/devfs.8#4 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.17 2006/11/05 20:12:32 danger Exp $
 .\"
-.Dd July 1, 2002
+.Dd November 5, 2006
 .Dt DEVFS 8
 .Os
 .Sh NAME
@@ -237,7 +237,21 @@
 .Sh FILES
 .Bl -tag -compact
 .It Pa /etc/defaults/devfs.rules
+Default
+.Nm
+configuration file.
 .It Pa /etc/devfs.rules
+Local
+.Nm
+configuration file.
+.It Pa /etc/devfs.conf
+Boot-time
+.Nm
+configuration file.
+.It Pa /usr/share/examples/etc/devfs.conf
+Example boot-time
+.Nm
+configuration file.
 .El
 .Sh EXAMPLES
 When the system boots,
@@ -348,6 +362,8 @@
 .Xr jail 2 ,
 .Xr glob 3 ,
 .Xr devfs 5 ,
+.Xr devfs.conf 5 ,
+.Xr devfs.rules 5 ,
 .Xr chown 8 ,
 .Xr jail 8 ,
 .Xr mknod 8

==== //depot/projects/dtrace/src/sbin/routed/main.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $
+ * $FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $
  */
 
 #include "defs.h"
@@ -45,10 +45,10 @@
 __RCSID("$NetBSD$");
 #include <util.h>
 #elif defined(__FreeBSD__)
-__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.18 2005/05/31 20:28:48 stefanf Exp $");
+__RCSID("$FreeBSD: src/sbin/routed/main.c,v 1.19 2006/11/05 14:49:47 trhodes Exp $");
 #else
-__RCSID("$Revision: 2.27 $");
-#ident "$Revision: 2.27 $"
+__RCSID("$Revision: 2.31 $");
+#ident "$Revision: 2.31 $"
 #endif
 
 pid_t	mypid;
@@ -133,7 +133,7 @@
 	(void)gethostname(myname, sizeof(myname)-1);
 	(void)gethost(myname, &myaddr);
 
-	while ((n = getopt(argc, argv, "sqdghmpAtvT:F:P:")) != -1) {
+	while ((n = getopt(argc, argv, "sqdghmAtvT:F:P:")) != -1) {
 		switch (n) {
 		case 's':
 			supplier = 1;
@@ -219,7 +219,7 @@
 		case 'v':
 			/* display version */
 			verbose++;
-			msglog("version 2.25");
+			msglog("version 2.31");
 			break;
 
 		default:
@@ -237,7 +237,7 @@
 		goto usage;
 	if (argc != 0) {
 usage:
-		logbad(0, "usage: routed [-sqdghmpAtv] [-T tracefile]"
+		logbad(0, "usage: routed [-sqdghmAtv] [-T tracefile]"
 		       " [-F net[,metric]] [-P parms]");
 	}
 	if (geteuid() != 0) {
@@ -863,14 +863,15 @@
 
 	va_start(args, p);
 	vsyslog(LOG_ERR, p, args);
-
+	va_end(args);
 	if (ftrace != 0) {
 		if (ftrace == stdout)
 			(void)fputs("routed: ", ftrace);
+		va_start(args, p);
 		(void)vfprintf(ftrace, p, args);
+		va_end(args);
 		(void)fputc('\n', ftrace);
 	}
-	va_end(args);
 }
 
 
@@ -889,8 +890,6 @@
 	struct msg_sub *ms1, *ms;
 	const char *p1;
 
-	va_start(args, p);
-
 	/* look for the oldest slot in the table
 	 * or the slot for the bad router.
 	 */
@@ -925,15 +924,18 @@
 		trace_flush();
 		for (p1 = p; *p1 == ' '; p1++)
 			continue;
+		va_start(args, p);
 		vsyslog(LOG_ERR, p1, args);
+		va_end(args);
 	}
 
 	/* always display the message if tracing */
 	if (ftrace != 0) {
+		va_start(args, p);
 		(void)vfprintf(ftrace, p, args);
+		va_end(args);
 		(void)fputc('\n', ftrace);
 	}
-	va_end(args);
 }
 
 
@@ -946,12 +948,13 @@
 
 	va_start(args, p);
 	vsyslog(LOG_ERR, p, args);
-
+	va_end(args);
 	(void)fputs("routed: ", stderr);
+	va_start(args, p);
 	(void)vfprintf(stderr, p, args);
+	va_end(args);
 	(void)fputs("; giving up\n",stderr);
 	(void)fflush(stderr);
-	va_end(args);
 
 	if (dump)
 		abort();

==== //depot/projects/dtrace/src/share/man/man4/ips.4#4 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ips.4,v 1.6 2006/06/18 09:53:00 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ips.4,v 1.7 2006/11/05 08:55:21 maxim Exp $
 .\"
-.Dd August 8, 2004
+.Dd November 4, 2006
 .Dt IPS 4
 .Os
 .Sh NAME

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


More information about the p4-projects mailing list