Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Nov 2007 05:11:14 GMT
From:      Kip Macy <kmacy@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 129753 for review
Message-ID:  <200711290511.lAT5BEUt099965@repoman.freebsd.org>

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

Change 129753 by kmacy@entropy_kmacy_xen31 on 2007/11/29 05:10:50

	IFC	#129749

Affected files ...

.. //depot/projects/xen31/ObsoleteFiles.inc#5 integrate
.. //depot/projects/xen31/UPDATING#3 integrate
.. //depot/projects/xen31/bin/ln/ln.1#2 integrate
.. //depot/projects/xen31/bin/ln/ln.c#2 integrate
.. //depot/projects/xen31/bin/sh/Makefile#2 integrate
.. //depot/projects/xen31/cddl/Makefile.inc#2 integrate
.. //depot/projects/xen31/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/xen31/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/xen31/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/xen31/contrib/binutils/opcodes/ppc-dis.c#2 integrate
.. //depot/projects/xen31/contrib/csup/mux.c#2 integrate
.. //depot/projects/xen31/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate
.. //depot/projects/xen31/contrib/less/FREEBSD-upgrade#1 branch
.. //depot/projects/xen31/contrib/less/LICENSE#2 integrate
.. //depot/projects/xen31/contrib/less/Makefile.dsm#2 delete
.. //depot/projects/xen31/contrib/less/NEWS#2 integrate
.. //depot/projects/xen31/contrib/less/README#2 integrate
.. //depot/projects/xen31/contrib/less/ch.c#2 integrate
.. //depot/projects/xen31/contrib/less/command.c#2 integrate
.. //depot/projects/xen31/contrib/less/configure#2 integrate
.. //depot/projects/xen31/contrib/less/configure.ac#2 integrate
.. //depot/projects/xen31/contrib/less/decode.c#2 integrate
.. //depot/projects/xen31/contrib/less/defines.ds#2 integrate
.. //depot/projects/xen31/contrib/less/defines.h.in#2 integrate
.. //depot/projects/xen31/contrib/less/defines.o2#2 integrate
.. //depot/projects/xen31/contrib/less/defines.o9#2 integrate
.. //depot/projects/xen31/contrib/less/defines.wn#2 integrate
.. //depot/projects/xen31/contrib/less/edit.c#2 integrate
.. //depot/projects/xen31/contrib/less/filename.c#2 integrate
.. //depot/projects/xen31/contrib/less/funcs.h#2 integrate
.. //depot/projects/xen31/contrib/less/less.h#2 integrate
.. //depot/projects/xen31/contrib/less/less.man#2 integrate
.. //depot/projects/xen31/contrib/less/less.nro#2 integrate
.. //depot/projects/xen31/contrib/less/lessecho.man#2 integrate
.. //depot/projects/xen31/contrib/less/lessecho.nro#2 integrate
.. //depot/projects/xen31/contrib/less/lesskey.man#2 integrate
.. //depot/projects/xen31/contrib/less/lesskey.nro#2 integrate
.. //depot/projects/xen31/contrib/less/line.c#2 integrate
.. //depot/projects/xen31/contrib/less/optfunc.c#2 integrate
.. //depot/projects/xen31/contrib/less/opttbl.c#2 integrate
.. //depot/projects/xen31/contrib/less/screen.c#2 integrate
.. //depot/projects/xen31/contrib/less/search.c#2 integrate
.. //depot/projects/xen31/contrib/less/tags.c#2 integrate
.. //depot/projects/xen31/contrib/less/version.c#2 integrate
.. //depot/projects/xen31/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/xen31/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/xen31/etc/defaults/periodic.conf#2 integrate
.. //depot/projects/xen31/etc/etc.amd64/ttys#2 integrate
.. //depot/projects/xen31/etc/etc.arm/ttys#2 integrate
.. //depot/projects/xen31/etc/etc.i386/ttys#2 integrate
.. //depot/projects/xen31/etc/etc.ia64/ttys#2 integrate
.. //depot/projects/xen31/etc/etc.powerpc/ttys#2 integrate
.. //depot/projects/xen31/etc/etc.sparc64/ttys#2 integrate
.. //depot/projects/xen31/etc/freebsd-update.conf#3 integrate
.. //depot/projects/xen31/etc/gss/mech#2 integrate
.. //depot/projects/xen31/etc/periodic/security/100.chksetuid#2 integrate
.. //depot/projects/xen31/etc/rc.d/hostapd#2 integrate
.. //depot/projects/xen31/gnu/lib/libobjc/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate
.. //depot/projects/xen31/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/xen31/include/dirent.h#2 integrate
.. //depot/projects/xen31/include/elf.h#2 integrate
.. //depot/projects/xen31/kerberos5/lib/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/Makefile#3 integrate
.. //depot/projects/xen31/lib/libc/gdtoa/_ldtoa.c#2 integrate
.. //depot/projects/xen31/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/xen31/lib/libc/gen/closedir.c#2 integrate
.. //depot/projects/xen31/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/authdes_prot.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/authunix_prot.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/key_prot_xdr.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/rpc_callmsg.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/rpc_prot.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/rpcb_prot.c#2 integrate
.. //depot/projects/xen31/lib/libc/rpc/rpcb_st_xdr.c#2 integrate
.. //depot/projects/xen31/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate
.. //depot/projects/xen31/lib/libc/stdlib/malloc.3#2 integrate
.. //depot/projects/xen31/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/xen31/lib/libdisk/libdisk.3#2 integrate
.. //depot/projects/xen31/lib/libdisk/libdisk.h#2 integrate
.. //depot/projects/xen31/lib/libelf/elf.3#2 integrate
.. //depot/projects/xen31/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/xen31/lib/libelf/libelf_data.c#2 integrate
.. //depot/projects/xen31/lib/libelf/libelf_xlate.c#2 integrate
.. //depot/projects/xen31/lib/libgssapi/Makefile#2 integrate
.. //depot/projects/xen31/lib/libgssapi/gss_acquire_cred.c#2 integrate
.. //depot/projects/xen31/lib/libkse/Makefile#2 integrate
.. //depot/projects/xen31/lib/libkse/kse.map#2 integrate
.. //depot/projects/xen31/lib/libkse/sys/lock.c#2 integrate
.. //depot/projects/xen31/lib/libkse/sys/lock.h#2 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_cond.c#2 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_init.c#2 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_kern.c#2 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_mutex.c#3 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_rtld.c#2 integrate
.. //depot/projects/xen31/lib/libkse/thread/thr_spec.c#2 integrate
.. //depot/projects/xen31/lib/libpmc/Makefile#2 integrate
.. //depot/projects/xen31/lib/libpmc/pmc.3#2 integrate
.. //depot/projects/xen31/lib/libpmc/pmc_allocate.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_attach.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_capabilities.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_configure_logfile.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_disable.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_event_names_of_class.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_get_driver_stats.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_get_msr.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_init.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_name_of_capability.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_read.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_set.3#1 branch
.. //depot/projects/xen31/lib/libpmc/pmc_start.3#1 branch
.. //depot/projects/xen31/lib/libsdp/search.c#2 integrate
.. //depot/projects/xen31/lib/libthr/Makefile#2 integrate
.. //depot/projects/xen31/lib/libthr/pthread.map#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_mutex.c#3 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_rtld.c#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_sem.c#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_suspend_np.c#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/xen31/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/xen31/lib/libthread_db/arch/arm/libpthread_md.c#1 branch
.. //depot/projects/xen31/lib/libutil/expand_number.3#2 integrate
.. //depot/projects/xen31/lib/libutil/expand_number.c#2 integrate
.. //depot/projects/xen31/lib/libutil/libutil.h#2 integrate
.. //depot/projects/xen31/lib/libutil/pty.c#2 integrate
.. //depot/projects/xen31/libexec/rtld-elf/powerpc/reloc.c#2 integrate
.. //depot/projects/xen31/libexec/tftpd/Makefile#2 integrate
.. //depot/projects/xen31/libexec/tftpd/tftpd.8#2 integrate
.. //depot/projects/xen31/libexec/tftpd/tftpd.c#2 integrate
.. //depot/projects/xen31/release/Makefile#3 integrate
.. //depot/projects/xen31/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/xen31/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/xen31/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/xen31/release/picobsd/bridge/PICOBSD#2 integrate
.. //depot/projects/xen31/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/xen31/release/picobsd/build/Makefile.conf#2 integrate
.. //depot/projects/xen31/release/picobsd/build/picobsd#2 integrate
.. //depot/projects/xen31/release/picobsd/tinyware/login/Makefile#2 integrate
.. //depot/projects/xen31/release/picobsd/tinyware/msg/msg.c#2 integrate
.. //depot/projects/xen31/sbin/atacontrol/atacontrol.8#2 integrate
.. //depot/projects/xen31/sbin/clri/clri.c#2 integrate
.. //depot/projects/xen31/sbin/devd/Makefile#2 integrate
.. //depot/projects/xen31/sbin/geom/class/journal/gjournal.8#2 integrate
.. //depot/projects/xen31/sbin/geom/class/nop/gnop.8#2 integrate
.. //depot/projects/xen31/sbin/geom/class/virstor/geom_virstor.c#2 integrate
.. //depot/projects/xen31/sbin/init/init.c#2 integrate
.. //depot/projects/xen31/sbin/ipf/ipftest/Makefile#2 integrate
.. //depot/projects/xen31/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/xen31/sbin/mdconfig/mdconfig.8#3 integrate
.. //depot/projects/xen31/sbin/mdconfig/mdconfig.c#2 integrate
.. //depot/projects/xen31/sbin/mount/mount.8#2 integrate
.. //depot/projects/xen31/sbin/mount_ntfs/mount_ntfs.8#2 integrate
.. //depot/projects/xen31/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/xen31/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/xen31/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/xen31/sbin/ping6/ping6.8#2 integrate
.. //depot/projects/xen31/sbin/ping6/ping6.c#2 integrate
.. //depot/projects/xen31/sbin/spppcontrol/spppcontrol.c#2 integrate
.. //depot/projects/xen31/sbin/sysctl/sysctl.8#2 integrate
.. //depot/projects/xen31/share/colldef/sv_SE.ISO8859-1.src#2 integrate
.. //depot/projects/xen31/share/colldef/sv_SE.ISO8859-15.src#2 integrate
.. //depot/projects/xen31/share/man/man4/Makefile#3 integrate
.. //depot/projects/xen31/share/man/man4/agp.4#2 integrate
.. //depot/projects/xen31/share/man/man4/asmc.4#2 integrate
.. //depot/projects/xen31/share/man/man4/enc.4#2 integrate
.. //depot/projects/xen31/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/xen31/share/man/man4/ichsmb.4#2 integrate
.. //depot/projects/xen31/share/man/man4/ipw.4#2 integrate
.. //depot/projects/xen31/share/man/man4/iwi.4#2 integrate
.. //depot/projects/xen31/share/man/man4/msk.4#2 integrate
.. //depot/projects/xen31/share/man/man4/nfe.4#2 integrate
.. //depot/projects/xen31/share/man/man4/rl.4#2 integrate
.. //depot/projects/xen31/share/man/man4/wlan.4#2 integrate
.. //depot/projects/xen31/share/man/man4/wpi.4#2 integrate
.. //depot/projects/xen31/share/man/man9/Makefile#4 integrate
.. //depot/projects/xen31/share/man/man9/rwlock.9#2 integrate
.. //depot/projects/xen31/share/man/man9/stack.9#1 branch
.. //depot/projects/xen31/share/man/man9/sx.9#2 integrate
.. //depot/projects/xen31/share/man/man9/timeout.9#2 integrate
.. //depot/projects/xen31/share/misc/iso3166#2 integrate
.. //depot/projects/xen31/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/xen31/share/mk/sys.mk#4 integrate
.. //depot/projects/xen31/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/xen31/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/xen31/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/xen31/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/xen31/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/xen31/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/xen31/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/xen31/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/xen31/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/xen31/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/xen31/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/arm/conf/HL200#1 branch
.. //depot/projects/xen31/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/xen31/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/xen31/sys/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/xen31/sys/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/xen31/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/xen31/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/xen31/sys/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/xen31/sys/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/xen31/sys/conf/NOTES#3 integrate
.. //depot/projects/xen31/sys/conf/files#4 integrate
.. //depot/projects/xen31/sys/conf/kmod.mk#3 integrate
.. //depot/projects/xen31/sys/conf/options#2 integrate
.. //depot/projects/xen31/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/xen31/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/xen31/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/xen31/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/xen31/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/xen31/sys/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/xen31/sys/dev/agp/agp_i810.c#2 integrate
.. //depot/projects/xen31/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/xen31/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/xen31/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/xen31/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/xen31/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/xen31/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/xen31/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/xen31/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/xen31/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/xen31/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/xen31/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/xen31/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/xen31/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/xen31/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_80003es2lan.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_80003es2lan.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82540.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82541.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82541.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82542.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82543.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82543.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82575.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_82575.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_mac.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_mac.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_manage.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_manage.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_nvm.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_nvm.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/e1000_regs.h#2 integrate
.. //depot/projects/xen31/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/xen31/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/xen31/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/xen31/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/xen31/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/xen31/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/xen31/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/xen31/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/xen31/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/xen31/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/xen31/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/xen31/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/xen31/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/xen31/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/xen31/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/xen31/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/xen31/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/xen31/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/xen31/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/xen31/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/xen31/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/xen31/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/xen31/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/xen31/sys/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/xen31/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/xen31/sys/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/xen31/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/xen31/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/geom/eli/g_eli_crypto.c#2 integrate
.. //depot/projects/xen31/sys/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/xen31/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/xen31/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/xen31/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/xen31/sys/i386/i386/busdma_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/locore.s#2 integrate
.. //depot/projects/xen31/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/xen31/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/xen31/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/xen31/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/xen31/sys/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/xen31/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/xen31/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/xen31/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/xen31/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/xen31/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/xen31/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/xen31/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/xen31/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/xen31/sys/kern/init_main.c#4 integrate
.. //depot/projects/xen31/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/xen31/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/xen31/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_rmlock.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/xen31/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/xen31/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/xen31/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/xen31/sys/kern/linker_if.m#2 integrate
.. //depot/projects/xen31/sys/kern/p1003_1b.c#2 integrate
.. //depot/projects/xen31/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/xen31/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/xen31/sys/kern/subr_pcpu.c#3 integrate
.. //depot/projects/xen31/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/xen31/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/xen31/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/xen31/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/xen31/sys/kern/sys_pipe.c#3 integrate
.. //depot/projects/xen31/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/xen31/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/xen31/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/xen31/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/xen31/sys/net/if_enc.c#2 integrate
.. //depot/projects/xen31/sys/net/if_lagg.c#2 integrate
.. //depot/projects/xen31/sys/net/pfil.c#2 integrate
.. //depot/projects/xen31/sys/net/pfil.h#2 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211.h#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/xen31/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/xen31/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/xen31/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/xen31/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/xen31/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/xen31/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/xen31/sys/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/xen31/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/xen31/sys/netinet/tcp_subr.c#3 integrate
.. //depot/projects/xen31/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/xen31/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/xen31/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/xen31/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/xen31/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/xen31/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/xen31/sys/netipsec/keysock.c#3 integrate
.. //depot/projects/xen31/sys/netipsec/xform.h#2 integrate
.. //depot/projects/xen31/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/xen31/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/xen31/sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/xen31/sys/pci/if_rl.c#2 integrate
.. //depot/projects/xen31/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/xen31/sys/pci/if_sf.c#2 integrate
.. //depot/projects/xen31/sys/pci/if_ste.c#2 integrate
.. //depot/projects/xen31/sys/pci/if_vr.c#2 integrate
.. //depot/projects/xen31/sys/pci/if_xl.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/machdep.c#3 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/xen31/sys/powerpc/powerpc/vm_machdep.c#3 integrate
.. //depot/projects/xen31/sys/sparc64/conf/DEFAULTS#2 integrate
.. //depot/projects/xen31/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/sparc64/sparc64/intr_machdep.c#2 integrate
.. //depot/projects/xen31/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/xen31/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/xen31/sys/sun4v/include/stdarg.h#2 integrate
.. //depot/projects/xen31/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/xen31/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/xen31/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/xen31/sys/sys/_elf_solaris.h#2 delete
.. //depot/projects/xen31/sys/sys/callout.h#2 integrate
.. //depot/projects/xen31/sys/sys/elf.h#2 integrate
.. //depot/projects/xen31/sys/sys/eventhandler.h#2 integrate
.. //depot/projects/xen31/sys/sys/kernel.h#2 integrate
.. //depot/projects/xen31/sys/sys/linker.h#3 integrate
.. //depot/projects/xen31/sys/sys/lock.h#3 integrate
.. //depot/projects/xen31/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/xen31/sys/sys/mutex.h#2 integrate
.. //depot/projects/xen31/sys/sys/param.h#5 integrate
.. //depot/projects/xen31/sys/sys/proc.h#4 integrate
.. //depot/projects/xen31/sys/sys/signal.h#2 integrate
.. //depot/projects/xen31/sys/sys/stat.h#2 integrate
.. //depot/projects/xen31/sys/sys/time.h#2 integrate
.. //depot/projects/xen31/sys/sys/types.h#2 integrate
.. //depot/projects/xen31/sys/sys/umtx.h#2 integrate
.. //depot/projects/xen31/sys/vm/pmap.h#3 integrate
.. //depot/projects/xen31/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_object.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_page.c#4 integrate
.. //depot/projects/xen31/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/xen31/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/xen31/sys/vm/vnode_pager.c#3 integrate
.. //depot/projects/xen31/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch
.. //depot/projects/xen31/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate
.. //depot/projects/xen31/tools/regression/priv/Makefile#2 integrate
.. //depot/projects/xen31/tools/regression/priv/main.c#2 integrate
.. //depot/projects/xen31/tools/regression/priv/main.h#2 integrate
.. //depot/projects/xen31/tools/regression/priv/priv_netinet_ipsec.c#1 branch
.. //depot/projects/xen31/tools/sched/schedgraph.py#3 integrate
.. //depot/projects/xen31/usr.bin/fstat/zfs/Makefile#2 integrate
.. //depot/projects/xen31/usr.bin/fstat/zfs/zfs.c#2 integrate
.. //depot/projects/xen31/usr.bin/less/defines.h#2 integrate
.. //depot/projects/xen31/usr.bin/lsvfs/lsvfs.c#2 integrate
.. //depot/projects/xen31/usr.bin/make/main.c#2 integrate
.. //depot/projects/xen31/usr.bin/netstat/Makefile#2 integrate
.. //depot/projects/xen31/usr.bin/rpcgen/rpc_cout.c#2 integrate
.. //depot/projects/xen31/usr.bin/tail/read.c#3 integrate
.. //depot/projects/xen31/usr.bin/tee/tee.1#2 integrate
.. //depot/projects/xen31/usr.bin/tip/tip/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/IPXrouted/trace.c#2 integrate
.. //depot/projects/xen31/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/acpi/acpidump/acpi.c#2 integrate
.. //depot/projects/xen31/usr.sbin/arp/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/xen31/usr.sbin/kldxref/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate
.. //depot/projects/xen31/usr.sbin/nscd/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/ppp/chap.h#2 integrate
.. //depot/projects/xen31/usr.sbin/ppp/physical.h#2 integrate
.. //depot/projects/xen31/usr.sbin/rpc.yppasswdd/Makefile#2 integrate
.. //depot/projects/xen31/usr.sbin/sa/db.c#2 integrate

Differences ...

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.117 2007/11/08 17:43:13 imp Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.122 2007/11/28 23:21:55 jb Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,8 +14,16 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20071129: Removed a Solaris compatibility header
+OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
+# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=rescue/bsdlabel
+OLD_FILES+=rescue/fdisk
+OLD_FILES+=rescue/gpt
+.endif
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
@@ -198,7 +206,7 @@
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
-OLD_LIBS+=lib/liblwres.so.10
+OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
@@ -3957,6 +3965,21 @@
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
+
+# 20071120: shared library version bump
+OLD_LIBS+=usr/lib/libasn1.so.8
+OLD_LIBS+=usr/lib/libgssapi.so.8
+OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
+OLD_LIBS+=usr/lib/libhdb.so.8
+OLD_LIBS+=usr/lib/libkadm5clnt.so.8
+OLD_LIBS+=usr/lib/libkadm5srv.so.8
+OLD_LIBS+=usr/lib/libkafs5.so.8
+OLD_LIBS+=usr/lib/libkrb5.so.8
+OLD_LIBS+=usr/lib/libobjc.so.2
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libgssapi.so.8
+OLD_LIBS+=usr/lib32/libobjc.so.2
+.endif
 # 20070519: GCC 4.2
 OLD_LIBS+=usr/lib/libg2c.a
 OLD_LIBS+=usr/lib/libg2c.so

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

@@ -21,6 +21,21 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20071128:
+	The ADAPTIVE_GIANT kernel option has been retired because its
+	functionality is the default now.
+
+20071118:
+	The AT keyboard emulation of sunkbd(4) has been turned on
+	by default. In order to make the special symbols of the Sun
+	keyboards driven by sunkbd(4) work under X these now have
+	to be configured the same way as Sun USB keyboards driven
+	by ukbd(4) (which also does AT keyboard emulation), f.e.:
+
+	Option	"XkbLayout" "us"
+	Option	"XkbRules" "xorg"
+	Option	"XkbSymbols" "pc(pc105)+sun_vndr/usb(sun_usb)+us"
+
 20071024:
 	It has been decided that it is desirable to provide ABI
 	backwards compatibility to the FreeBSD 4/5/6 versions of the
@@ -934,4 +949,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $
+$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $

==== //depot/projects/xen31/bin/ln/ln.1#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/bin/ln/ln.1,v 1.31 2006/02/14 11:08:05 glebius Exp $
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.32 2007/11/17 21:01:22 ru Exp $
 .\"
 .Dd February 14, 2006
 .Dt LN 1
@@ -41,11 +41,15 @@
 .Nd make links
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
 .Ar source_file
 .Op Ar target_file
 .Nm
-.Op Fl Ffhinsv
+.Op Fl s Op Fl F
+.Op Fl f | i
+.Op Fl hnv
 .Ar source_file ...
 .Ar target_dir
 .Nm link

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

@@ -39,7 +39,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $");
+__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.36 2007/11/17 21:01:22 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -69,7 +69,7 @@
 main(int argc, char *argv[])
 {
 	struct stat sb;
-	char *p, *sourcedir;
+	char *p, *targetdir;
 	int ch, exitval;
 
 	/*
@@ -134,34 +134,34 @@
 	case 0:
 		usage();
 		/* NOTREACHED */
-	case 1:				/* ln target */
+	case 1:				/* ln source */
 		exit(linkit(argv[0], ".", 1));
-	case 2:				/* ln target source */
+	case 2:				/* ln source target */
 		exit(linkit(argv[0], argv[1], 0));
 	default:
 		;
 	}
-					/* ln target1 target2 directory */
-	sourcedir = argv[argc - 1];
-	if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
+					/* ln source1 source2 directory */
+	targetdir = argv[argc - 1];
+	if (hflag && lstat(targetdir, &sb) == 0 && S_ISLNK(sb.st_mode)) {
 		/*
 		 * We were asked not to follow symlinks, but found one at
 		 * the target--simulate "not a directory" error
 		 */
 		errno = ENOTDIR;
-		err(1, "%s", sourcedir);
+		err(1, "%s", targetdir);
 	}
-	if (stat(sourcedir, &sb))
-		err(1, "%s", sourcedir);
+	if (stat(targetdir, &sb))
+		err(1, "%s", targetdir);
 	if (!S_ISDIR(sb.st_mode))
 		usage();
-	for (exitval = 0; *argv != sourcedir; ++argv)
-		exitval |= linkit(*argv, sourcedir, 1);
+	for (exitval = 0; *argv != targetdir; ++argv)
+		exitval |= linkit(*argv, targetdir, 1);
 	exit(exitval);
 }
 
 int
-linkit(const char *target, const char *source, int isdir)
+linkit(const char *source, const char *target, int isdir)
 {
 	struct stat sb;
 	const char *p;
@@ -169,57 +169,57 @@
 	char path[PATH_MAX];
 
 	if (!sflag) {
-		/* If target doesn't exist, quit now. */
-		if (stat(target, &sb)) {
-			warn("%s", target);
+		/* If source doesn't exist, quit now. */
+		if (stat(source, &sb)) {
+			warn("%s", source);
 			return (1);
 		}
 		/* Only symbolic links to directories. */
 		if (S_ISDIR(sb.st_mode)) {
 			errno = EISDIR;
-			warn("%s", target);
+			warn("%s", source);
 			return (1);
 		}
 	}
 
 	/*
-	 * If the source is a directory (and not a symlink if hflag),
-	 * append the target's name.
+	 * If the target is a directory (and not a symlink if hflag),
+	 * append the source's name.
 	 */
 	if (isdir ||
-	    (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
-	    (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) {
-		if ((p = strrchr(target, '/')) == NULL)
-			p = target;
+	    (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
+	    (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) {
+		if ((p = strrchr(source, '/')) == NULL)
+			p = source;
 		else
 			++p;
-		if (snprintf(path, sizeof(path), "%s/%s", source, p) >=
+		if (snprintf(path, sizeof(path), "%s/%s", target, p) >=
 		    (ssize_t)sizeof(path)) {
 			errno = ENAMETOOLONG;
-			warn("%s", target);
+			warn("%s", source);
 			return (1);
 		}
-		source = path;
+		target = path;
 	}
 
-	exists = !lstat(source, &sb);
+	exists = !lstat(target, &sb);
 	/*
 	 * If the file exists, then unlink it forcibly if -f was specified
 	 * and interactively if -i was specified.
 	 */
 	if (fflag && exists) {
 		if (Fflag && S_ISDIR(sb.st_mode)) {
-			if (rmdir(source)) {
-				warn("%s", source);
+			if (rmdir(target)) {
+				warn("%s", target);
 				return (1);
 			}
-		} else if (unlink(source)) {
-			warn("%s", source);
+		} else if (unlink(target)) {
+			warn("%s", target);
 			return (1);
 		}
 	} else if (iflag && exists) {
 		fflush(stdout);
-		fprintf(stderr, "replace %s? ", source);
+		fprintf(stderr, "replace %s? ", target);
 
 		first = ch = getchar();
 		while(ch != '\n' && ch != EOF)
@@ -230,23 +230,23 @@
 		}
 
 		if (Fflag && S_ISDIR(sb.st_mode)) {
-			if (rmdir(source)) {
-				warn("%s", source);
+			if (rmdir(target)) {
+				warn("%s", target);
 				return (1);
 			}
-		} else if (unlink(source)) {
-			warn("%s", source);
+		} else if (unlink(target)) {
+			warn("%s", target);
 			return (1);
 		}
 	}
 
 	/* Attempt the link. */
-	if ((*linkf)(target, source)) {
-		warn("%s", source);
+	if ((*linkf)(source, target)) {
+		warn("%s", target);
 		return (1);
 	}
 	if (vflag)
-		(void)printf("%s %c> %s\n", source, linkch, target);
+		(void)printf("%s %c> %s\n", target, linkch, source);
 	return (0);
 }
 
@@ -254,8 +254,8 @@
 usage(void)
 {
 	(void)fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: ln [-Ffhinsv] source_file [target_file]",
-	    "       ln [-Ffhinsv] source_file ... target_dir",
+	    "usage: ln [-s [-F]] [-f | -i] [-hnv] source_file [target_file]",
+	    "       ln [-s [-F]] [-f | -i] [-hnv] source_file ... target_dir",
 	    "       link source_file target_file");
 	exit(1);
 }

==== //depot/projects/xen31/bin/sh/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD: src/bin/sh/Makefile,v 1.46 2006/04/17 17:55:11 schweikh Exp $
+# $FreeBSD: src/bin/sh/Makefile,v 1.47 2007/11/18 01:53:07 jb Exp $
 
 PROG=	sh
 INSTALLFLAGS= -S
@@ -22,7 +22,7 @@
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:
 # CFLAGS+= -g -DDEBUG=2
-WARNS?=	3
+WARNS?=	2
 WFORMAT=0
 
 .PATH:	${.CURDIR}/bltin \

==== //depot/projects/xen31/cddl/Makefile.inc#2 (text+ko) ====

@@ -1,3 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
 
-CFLAGS+= -D_SOLARIS_C_SOURCE
+IGNORE_PRAGMA=	YES

==== //depot/projects/xen31/cddl/lib/libnvpair/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
@@ -10,8 +10,8 @@
 	nvpair_alloc_fixed.c \
 	nvpair.c
 
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../include		# XXX
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
 
 .include <bsd.lib.mk>

==== //depot/projects/xen31/contrib/binutils/opcodes/ppc-dis.c#2 (text+ko) ====

@@ -1,3 +1,4 @@
+/* $FreeBSD: src/contrib/binutils/opcodes/ppc-dis.c,v 1.2 2007/11/23 23:54:44 jb Exp $ */
 /* ppc-dis.c -- Disassemble PowerPC instructions
    Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
@@ -45,6 +46,7 @@
 powerpc_dialect (struct disassemble_info *info)
 {
   int dialect = PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC;
+  void *pd = &info->private_data;
 
   if (BFD_DEFAULT_TARGET_SIZE == 64)
     dialect |= PPC_OPCODE_64;
@@ -91,7 +93,7 @@
 	dialect |= PPC_OPCODE_64;
     }
 
-  ((struct dis_private *) &info->private_data)->dialect = dialect;
+  ((struct dis_private *) pd)->dialect = dialect;
   return dialect;
 }
 
@@ -100,7 +102,8 @@
 int
 print_insn_big_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
-  int dialect = ((struct dis_private *) &info->private_data)->dialect;
+  void *pd = &info->private_data;
+  int dialect = ((struct dis_private *) pd)->dialect;
   return print_insn_powerpc (memaddr, info, 1, dialect);
 }
 
@@ -109,7 +112,8 @@
 int
 print_insn_little_powerpc (bfd_vma memaddr, struct disassemble_info *info)
 {
-  int dialect = ((struct dis_private *) &info->private_data)->dialect;
+  void *pd = &info->private_data;
+  int dialect = ((struct dis_private *) pd)->dialect;
   return print_insn_powerpc (memaddr, info, 0, dialect);
 }
 

==== //depot/projects/xen31/contrib/csup/mux.c#2 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/mux.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $
+ * $FreeBSD: src/contrib/csup/mux.c,v 1.2 2007/11/18 00:25:18 jb Exp $
  */
 
 #include <sys/param.h>
@@ -782,7 +782,7 @@
 	struct buf *buf;
 	uint32_t winsize;
 	uint16_t hdrsize, size, len;
-	int error, id, iovcnt, what;
+	int error, id, iovcnt, what = 0;
 
 	m = (struct mux *)arg;
 again:

==== //depot/projects/xen31/contrib/gdb/gdb/i386fbsd-nat.c#2 (text+ko) ====

@@ -91,7 +91,7 @@
 #ifdef KERN_PS_STRINGS
   {
     int mib[2];
-    int ps_strings;
+    u_long ps_strings;
     size_t len;
 
     mib[0] = CTL_KERN;

==== //depot/projects/xen31/contrib/less/LICENSE#2 (text+ko) ====

@@ -2,7 +2,7 @@
                           ------------
 
 Less
-Copyright (C) 1984-2005  Mark Nudelman
+Copyright (C) 1984-2007  Mark Nudelman
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

==== //depot/projects/xen31/contrib/less/NEWS#2 (text+ko) ====

@@ -13,6 +13,17 @@
 ======================================================================
 
 
+	Major changes between "less" versions 409 and 416
+
+* New --follow-name option makes F command follow the name of a file
+  rather than the file descriptor if an open file is renamed.
+
+* Make searching with -i/-I work correctly with non-ASCII text.
+
+* Fix DJGPP build.
+
+======================================================================
+
 	Major changes between "less" versions 406 and 409
 
 * Support CSI escape sequences, like SGR escape sequences.
@@ -698,3 +709,4 @@
 
 

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



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