PERFORCE change 177413 for review

Alexander Motin mav at FreeBSD.org
Tue Apr 27 20:11:13 UTC 2010 

http://p4web.freebsd.org/@@177413?ac=10

Change 177413 by mav at mav_mavtest on 2010/04/27 20:10:42

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/Makefile.inc1#19 integrate
.. //depot/projects/scottl-camlock/src/bin/ln/symlink.7#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/arith.y#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.c#9 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#20 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/routing#6 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/unlink.2#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/kvm.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpkg/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/deps.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/exec.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/file.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/global.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/match.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/msg.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/pen.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/pkg.h#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/pkgwrap.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/plist.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/str.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/url.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libpkg/version.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libufs/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/cgroup.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/inode.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/libufs.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/sblock.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/type.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/devd/devd.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/dumpfs/dumpfs.c#6 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/fsck.h#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/gjournal.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/pass5.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsck_ffs/suj.c#1 branch
.. //depot/projects/scottl-camlock/src/sbin/fsdb/fsdb.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/part/gpart.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastctl/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/hastd/hast_proto.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/tunefs/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.8#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man1/builtin.1#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#17 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/alq.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#42 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#36 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/proc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-78XXX#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#16 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/LN2410SBC#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/SHEEVAPLUG#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/proc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#52 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#85 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#20 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#14 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ale/if_ale.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwn.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/ati_pcigart.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_bufs.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_context.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_hashtab.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_memory.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_mm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_scatter.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sman.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sysctl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_vm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_dma.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_dma.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_dma.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_warp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_cce.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_state.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_cp.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cs.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/savage_bci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_dma.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_map.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/via_mm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sge/if_sge.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uss820dci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/misc/udbp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_aue.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_kue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_rue.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_udav.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubsa.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ubser.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/ulpt.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umoscom.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uplcom.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uslcom.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvisor.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uvscom.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/urio.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/ustorage_fs.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_debug.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dev.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_freebsd.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_generic.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_hub.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_request.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvfsops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_apm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_if.m#5 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_vtoc8.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#35 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/XBOX#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#46 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/proc.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#25 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/proc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_alq.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_descrip.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#6 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/proc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/vmparam.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#10 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpfdesc.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/igmp.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_asconf.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_src.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#28 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#30 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/proc.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#11 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#33 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/ofw_machdep.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/proc.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/isa/isa.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/cheetah.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/locore.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#19 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/ofw_machdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/proc.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/alq.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/buf.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mount.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/user.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_balloc.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_extern.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_inode.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_softdep.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_subr.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vnops.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/softdep.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/dinode.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/inode.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_dirhash.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_extern.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufsmount.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#21 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/trim3.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bpf/bpf_filter/tests/test0083.h#2 integrate
.. //depot/projects/scottl-camlock/src/tools/test/README#3 integrate
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/README.txt#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/fail.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/fail.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/random.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/random.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/slowfloat-32.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/slowfloat-64.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/slowfloat.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/slowfloat.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/fpu_emul.S#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/fpu_reg.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/fpu_util.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/libc_private.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/milieu.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/namespace.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/softfloat.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/sparc64.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/systflags.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/systfloat.S#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/systfloat.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/systmodes.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/sparc64/un-namespace.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/systemBugs.txt#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/systflags.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/systfloat.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/systmodes.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testCases.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testCases.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testFunction.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testFunction.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testLoops.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testLoops.h#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testfloat-history.txt#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testfloat-source.txt#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testfloat.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testfloat.txt#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/testsoftfloat.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/writeHex.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/test/testfloat/writeHex.h#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/alias/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.1#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/gzip.c#8 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/stat/stat.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/stat/stat.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/config.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/configvers.h#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkmakefile.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/mkoptions.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/makefs/ffs/ffs_bswap.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/extract.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/futil.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/main.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/add/perform.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/perform.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/create/pl.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/perform.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/info.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/main.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/perform.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/show.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/Makefile#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/deps.c#3 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/exec.c#3 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/file.c#4 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/global.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#9 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/match.c#4 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/msg.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/pen.c#5 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/pkgwrap.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/plist.c#5 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/str.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/url.c#7 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/version.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/perform.c#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/Makefile.inc1#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.643 2010/04/14 18:56:07 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.645 2010/04/23 11:07:43 flz Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -259,7 +259,7 @@
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
-.if ${MK_CDDL} == "no" || defined(NO_CTF)
+.if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
 .endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -780,7 +780,7 @@
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
+	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS \
 	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
 # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
@@ -1111,7 +1111,7 @@
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		lib/libbz2 lib/libcom_err lib/libcrypt \
-		lib/libexpat \
+		lib/libexpat lib/libfetch \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
@@ -1138,6 +1138,7 @@
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
+lib/libfetch__L: secure/lib/libcrypto__L secure/lib/libssl__L lib/libmd__L
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
@@ -1173,7 +1174,7 @@
 .endif
 
 .if ${MK_OPENSSL} == "no"
-lib/libradius__L: lib/libmd__L
+lib/libfetch__L lib/libradius__L: lib/libmd__L
 .endif
 
 .for _lib in ${_prereq_libs}

==== //depot/projects/scottl-camlock/src/bin/ln/symlink.7#2 (text+ko) ====

@@ -27,9 +27,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" $FreeBSD: src/bin/ln/symlink.7,v 1.30 2005/02/13 22:25:09 ru Exp $
+.\" $FreeBSD: src/bin/ln/symlink.7,v 1.32 2010/04/25 13:29:59 jilles Exp $
 .\"
-.Dd March 31, 1994
+.Dd April 25, 2010
 .Dt SYMLINK 7
 .Os
 .Sh NAME
@@ -103,19 +103,23 @@
 would return a file descriptor to the file
 .Dq afile .
 .Pp
-There are nine system calls that do not follow links, and which operate
+There are thirteen system calls that do not follow links, and which operate
 on the symbolic link itself.
 They are:
 .Xr lchflags 2 ,
 .Xr lchmod 2 ,
 .Xr lchown 2 ,
+.Xr lpathconf 2 ,
 .Xr lstat 2 ,
 .Xr lutimes 2 ,
 .Xr readlink 2 ,
+.Xr readlinkat 2 ,
 .Xr rename 2 ,
+.Xr renameat 2 ,
 .Xr rmdir 2 ,
+.Xr unlink 2 ,
 and
-.Xr unlink 2 .
+.Xr unlinkat 2 .
 Because
 .Xr remove 3
 is an alias for
@@ -123,9 +127,30 @@
 it also does not follow symbolic links.
 When
 .Xr rmdir 2
+or
+.Xr unlinkat 2
+with the
+.Dv AT_REMOVEDIR
+flag
 is applied to a symbolic link, it fails with the error
 .Er ENOTDIR .
 .Pp
+The
+.Xr linkat 2
+system call does not follow symbolic links
+unless given the
+.Dv AT_SYMLINK_FOLLOW
+flag.
+.Pp
+The following system calls follow symbolic links
+unless given the
+.Dv AT_SYMLINK_NOFOLLOW
+flag:
+.Xr fchmodat 2 ,
+.Xr fchownat 2
+and
+.Xr fstatat 2 .
+.Pp
 The owner and group of an existing symbolic link can be changed by
 means of the
 .Xr lchown 2
@@ -138,8 +163,8 @@
 and
 .Xr lutimes 2
 system calls, respectively.
-Of these, only the flags are used by the system;
-the access permissions and ownership are ignored.
+Of these, only the flags and ownership are used by the system;
+the access permissions are ignored.
 .Pp
 The
 .Bx 4.4

==== //depot/projects/scottl-camlock/src/bin/sh/arith.y#5 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.25 2009/12/30 15:59:40 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.26 2010/04/25 20:43:19 jilles Exp $");
 
 #include <limits.h>
 #include <stdio.h>
@@ -287,7 +287,9 @@
 arith(const char *s)
 {
 	arith_t result;
+	struct stackmark smark;
 
+	setstackmark(&smark);
 	arith_buf = arith_startbuf = s;
 
 	INTOFF;
@@ -295,6 +297,8 @@
 	arith_lex_reset();	/* Reprime lex. */
 	INTON;
 
+	popstackmark(&smark);
+
 	return result;
 }
 

==== //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.26 2010/04/25 20:43:19 jilles Exp $");
 
 #include <string.h>
 
@@ -51,13 +51,6 @@
 
 int yylex(void);
 
-struct varname
-{
-	struct varname *next;
-	char name[1];
-};
-static struct varname *varnames;
-
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
 	result = (*buf = *arith_buf++) ? 1 : YY_NULL;
@@ -87,14 +80,11 @@
 			 * If variable doesn't exist, we should initialize
 			 * it to zero.
 			 */
-			struct varname *temp;
+			char *temp;
 			if (lookupvar(yytext) == NULL)
 				setvarsafe(yytext, "0", 0);
-			temp = ckmalloc(sizeof(struct varname) +
-			    strlen(yytext));
-			temp->next = varnames;
-			varnames = temp;
-			yylval.s_value = strcpy(temp->name, yytext);
+			temp = stalloc(strlen(yytext) + 1);
+			yylval.s_value = strcpy(temp, yytext);
 
 			return ARITH_VAR;
 		}
@@ -140,15 +130,5 @@
 void
 arith_lex_reset(void)
 {
-	struct varname *name, *next;
-
 	YY_NEW_FILE;
-
-	name = varnames;
-	while (name != NULL) {
-		next = name->next;
-		ckfree(name);
-		name = next;
-	}
-	varnames = NULL;
 }

==== //depot/projects/scottl-camlock/src/bin/sh/expand.c#9 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.62 2010/04/03 22:04:44 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.63 2010/04/25 20:43:19 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -360,7 +360,7 @@
 void
 expari(int flag)
 {
-	char *p, *start;
+	char *p, *q, *start;
 	arith_t result;
 	int begoff;
 	int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
@@ -398,7 +398,9 @@
 	removerecordregions(begoff);
 	if (quotes)
 		rmescapes(p+2);
+	q = grabstackstr(expdest);
 	result = arith(p+2);
+	ungrabstackstr(q, expdest);
 	fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result);
 	while (*p++)
 		;

==== //depot/projects/scottl-camlock/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.375 2010/04/17 21:31:42 rpaulo Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.376 2010/04/26 15:31:58 ume Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -470,8 +470,8 @@
 #ipv6_prefix_ed0="fec0:0000:0000:0001 fec0:0000:0000:0002"  # Examples for rtr.
 #ipv6_prefix_ep0="fec0:0000:0000:0003 fec0:0000:0000:0004"  # Examples for rtr.
 ipv6_default_interface="NO"	# Default output interface for scoped addrs.
-				# Now this works only for IPv6 link local
-				# multicast addrs.
+				# This works only with
+				# ipv6_gateway_enable="NO".
 rtsol_flags=""			# Flags to IPv6 router solicitation.
 rtsold_enable="NO"		# Set to YES to enable an IPv6 router
 				# solicitation daemon.

==== //depot/projects/scottl-camlock/src/etc/rc.d/routing#6 (text+ko) ====

@@ -2,7 +2,7 @@
 #
 # Configure routing and miscellaneous network tunables
 #
-# $FreeBSD: src/etc/rc.d/routing,v 1.152 2009/10/02 20:19:53 hrs Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.153 2010/04/26 15:31:58 ume Exp $
 #
 
 # PROVIDE: routing
@@ -210,34 +210,24 @@
 		;;
 	esac
 
-	# Disallow unicast packets without outgoing scope identifiers,
-	# or route such packets to a "default" interface, if it is specified.
+	# Disallow link-local unicast packets without outgoing scope
+	# identifiers.  However, if you set "ipv6_default_interface",
+	# for the host case, you will allow to omit the identifiers.
+	# Under this configuration, the packets will go to the default
+	# interface.
 	route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject
+	route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject
 
 	case ${ipv6_default_interface} in
 	'')
-		route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject
 		;;
 	*)
-		laddr=`network6_getladdr ${ipv6_default_interface}`
-		route ${_action} -inet6 ff02:: ${laddr} -prefixlen 16 -interface
-
-		# Disable installing the default interface with the
-		# case net.inet6.ip6.forwarding=0 and
-		# the interface with no ND6_IFF_ACCEPT_RTADV
-		# to avoid conflict between the default router list and
-		# the manual configured default route.
+		# Disable installing the default interface when we act
+		# as router to avoid conflict between the default
+		# router list and the manual configured default route.
 		if ! checkyesno ipv6_gateway_enable; then
-			ifconfig ${ipv6_default_interface} nd6 | \
-			while read proto options
-			do
-				case "${proto}:${options}" in
-				nd6:*ACCEPT_RTADV*)
-					ifconfig ${ipv6_default_interface} inet6 defaultif
-					break
-				;;
-				esac
-			done
+			ifconfig ${ipv6_default_interface} inet6 defaultif
+			sysctl net.inet6.ip6.use_defaultzone=1
 		fi
 		;;
 	esac

==== //depot/projects/scottl-camlock/src/lib/Makefile#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.245 2010/03/13 03:06:48 imp Exp $
+# $FreeBSD: src/lib/Makefile,v 1.246 2010/04/23 11:07:43 flz Exp $
 
 .include <bsd.own.mk>
 
@@ -85,6 +85,7 @@
 	libopie \
 	libpam \
 	libpcap \
+	${_libpkg} \
 	${_libpmc} \
 	libproc \
 	librt \
@@ -197,6 +198,10 @@
 _libpmc=	libpmc
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+_libpkg=	libpkg
+.endif
+
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm

==== //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#6 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.78 2010/04/14 18:29:26 uqs Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.79 2010/04/25 12:35:39 jilles Exp $
 .\"
-.Dd February 21, 2010
+.Dd April 25, 2010
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -325,7 +325,7 @@
 .It "KERN_BOOTFILE	string	yes"
 .It "KERN_BOOTTIME	struct timeval	no"
 .It "KERN_CLOCKRATE	struct clockinfo	no"
-.It "KERN_FILE	struct file	no"
+.It "KERN_FILE	struct xfile	no"
 .It "KERN_HOSTID	integer	yes"
 .It "KERN_HOSTUUID	string	yes"
 .It "KERN_HOSTNAME	string	yes"
@@ -342,14 +342,14 @@
 .It "KERN_OSREV	integer	no"
 .It "KERN_OSTYPE	string	no"
 .It "KERN_POSIX1	integer	no"
-.It "KERN_PROC	struct proc	no"
+.It "KERN_PROC	node	not applicable"
 .It "KERN_PROF	node	not applicable"
 .It "KERN_QUANTUM	integer	yes"
 .It "KERN_SAVED_IDS	integer	no"
 .It "KERN_SECURELVL	integer	raise only"
 .It "KERN_UPDATEINTERVAL	integer	no"
 .It "KERN_VERSION	string	no"
-.It "KERN_VNODE	struct vnode	no"
+.It "KERN_VNODE	struct xvnode	no"
 .El
 .Bl -tag -width 6n
 .It Li KERN_ARGMAX
@@ -370,10 +370,8 @@
 frequencies, the number of micro-seconds per hz tick and the skew rate.
 .It Li KERN_FILE
 Return the entire file table.
-The returned data consists of a single
-.Va struct filehead
-followed by an array of
-.Va struct file ,
+The returned data consists of an array of
+.Va struct xfile ,
 whose size depends on the current number of such objects in the system.
 .It Li KERN_HOSTID
 Get or set the host ID.
@@ -525,10 +523,8 @@
 the system.
 The returned data consists of an array whose size depends on the
 current number of such objects in the system.
-Each element of the array contains the kernel address of a vnode
-.Va struct vnode *
-followed by the vnode itself
-.Va struct vnode .
+Each element of the array consists of a
+.Va struct xvnode .
 .El
 .Ss CTL_NET
 The string and integer information available for the CTL_NET level
@@ -854,6 +850,8 @@
 A process without appropriate privilege attempts to set a value.
 .El
 .Sh SEE ALSO
+.Xr confstr 3 ,
+.Xr kvm 3 ,
 .Xr sysconf 3 ,
 .Xr sysctl 8
 .Sh HISTORY

==== //depot/projects/scottl-camlock/src/lib/libc/sys/unlink.2#4 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/unlink.2,v 1.24 2010/02/17 09:11:21 phk Exp $
+.\" $FreeBSD: src/lib/libc/sys/unlink.2,v 1.25 2010/04/25 13:55:52 jilles Exp $
 .\"
-.Dd April 10, 2008
+.Dd April 25, 2010
 .Dt UNLINK 2
 .Os
 .Sh NAME
@@ -167,7 +167,7 @@
 argument is neither
 .Dv AT_FDCWD
 nor a valid file descriptor open for searching.
-.It Bq Er EEXIST
+.It Bq Er ENOTEMPTY
 The
 .Fa flag
 parameter has the

==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)kvm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.15 2007/01/08 17:35:36 imp Exp $
+.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.16 2010/04/25 12:50:30 jilles Exp $
 .\"
-.Dd January 29, 2004
+.Dd April 25, 2010
 .Dt KVM 3
 .Os
 .Sh NAME
@@ -46,12 +46,15 @@
 library provides a uniform interface for accessing kernel virtual memory
 images, including live systems and crash dumps.
 Access to live systems is via
+.Xr sysctl 3
+for some functions, and
 .Xr mem 4
 and
 .Xr kmem 4
+for other functions,
 while crash dumps can be examined via the core file generated by
 .Xr savecore 8 .
-The interface behaves identically in both cases.
+The interface behaves similarly in both cases.
 Memory can be read and written, kernel symbol addresses can be
 looked up efficiently, and information about user processes can
 be gathered.
@@ -112,5 +115,6 @@
 .Xr kvm_openfiles 3 ,
 .Xr kvm_read 3 ,
 .Xr kvm_write 3 ,
+.Xr sysctl 3 ,
 .Xr kmem 4 ,
 .Xr mem 4

==== //depot/projects/scottl-camlock/src/lib/libufs/Makefile#5 (text+ko) ====

@@ -1,9 +1,9 @@
-# $FreeBSD: src/lib/libufs/Makefile,v 1.18 2010/02/11 07:09:04 imp Exp $
+# $FreeBSD: src/lib/libufs/Makefile,v 1.19 2010/04/24 07:05:35 jeff Exp $
 
 LIB=	ufs
 SHLIBDIR?= /lib
 
-SRCS=	block.c cgroup.c inode.c sblock.c type.c
+SRCS=	block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c
 INCS=	libufs.h
 
 MAN=	bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3
@@ -16,8 +16,11 @@
 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
 MLINKS+= ufs_disk_close.3 ufs_disk_write.3
 
-WARNS?=	3
+.PATH:  ${.CURDIR}/../../sys/ufs/ffs
+
+WARNS?=	2
 
+DEBUG_FLAGS = -g
 CFLAGS+= -D_LIBUFS
 .if defined(LIBUFS_DEBUG)
 CFLAGS+= -D_LIBUFS_DEBUGGING

==== //depot/projects/scottl-camlock/src/lib/libufs/cgroup.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.5 2010/02/11 06:22:38 mckusick Exp $");
+__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.6 2010/04/24 07:05:35 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -40,11 +40,143 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <libufs.h>
 
+ufs2_daddr_t
+cgballoc(struct uufsd *disk)
+{
+	u_int8_t *blksfree;
+	struct cg *cgp;
+	struct fs *fs;
+	long bno;
+
+	fs = &disk->d_fs;
+	cgp = &disk->d_cg;
+	blksfree = cg_blksfree(cgp);
+	for (bno = 0; bno < fs->fs_fpg / fs->fs_frag; bno++)
+		if (ffs_isblock(fs, blksfree, bno))
+			goto gotit;
+	return (0);
+gotit:
+	fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
+	ffs_clrblock(fs, blksfree, (long)bno);
+	ffs_clusteracct(fs, cgp, bno, -1);
+	cgp->cg_cs.cs_nbfree--;
+	fs->fs_cstotal.cs_nbfree--;
+	fs->fs_fmod = 1;
+	return (cgbase(fs, cgp->cg_cgx) + blkstofrags(fs, bno));
+}
+
+int
+cgbfree(struct uufsd *disk, ufs2_daddr_t bno, long size)
+{
+	u_int8_t *blksfree;
+	struct fs *fs;
+	struct cg *cgp;
+	ufs1_daddr_t fragno, cgbno;
+	int i, cg, blk, frags, bbase;
+
+	fs = &disk->d_fs;
+	cg = dtog(fs, bno);
+	if (cgread1(disk, cg) != 1)
+		return (-1);
+	cgp = &disk->d_cg;
+	cgbno = dtogd(fs, bno);
+	blksfree = cg_blksfree(cgp);
+	if (size == fs->fs_bsize) {
+		fragno = fragstoblks(fs, cgbno);
+		ffs_setblock(fs, blksfree, fragno);
+		ffs_clusteracct(fs, cgp, fragno, 1);
+		cgp->cg_cs.cs_nbfree++;
+		fs->fs_cstotal.cs_nbfree++;
+		fs->fs_cs(fs, cg).cs_nbfree++;
+	} else {
+		bbase = cgbno - fragnum(fs, cgbno);
+		/*
+		 * decrement the counts associated with the old frags
+		 */
+		blk = blkmap(fs, blksfree, bbase);
+		ffs_fragacct(fs, blk, cgp->cg_frsum, -1);
+		/*
+		 * deallocate the fragment
+		 */
+		frags = numfrags(fs, size);
+		for (i = 0; i < frags; i++)
+			setbit(blksfree, cgbno + i);
+		cgp->cg_cs.cs_nffree += i;
+		fs->fs_cstotal.cs_nffree += i;
+		fs->fs_cs(fs, cg).cs_nffree += i;
+		/*
+		 * add back in counts associated with the new frags
+		 */
+		blk = blkmap(fs, blksfree, bbase);
+		ffs_fragacct(fs, blk, cgp->cg_frsum, 1);
+		/*
+		 * if a complete block has been reassembled, account for it
+		 */
+		fragno = fragstoblks(fs, bbase);
+		if (ffs_isblock(fs, blksfree, fragno)) {
+			cgp->cg_cs.cs_nffree -= fs->fs_frag;
+			fs->fs_cstotal.cs_nffree -= fs->fs_frag;
+			fs->fs_cs(fs, cg).cs_nffree -= fs->fs_frag;

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

More information about the p4-projects mailing list