PERFORCE change 140380 for review

John Birrell jb at FreeBSD.org
Tue Apr 22 02:12:04 UTC 2008 

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

Change 140380 by jb at freebsd3 on 2008/04/22 02:11:32

	IF7

Affected files ...

.. //depot/projects/dtrace7/src/ObsoleteFiles.inc#8 integrate
.. //depot/projects/dtrace7/src/bin/sh/cd.c#2 integrate
.. //depot/projects/dtrace7/src/bin/sh/options.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/zone.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/deviceid.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/fsshare.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mkdirp.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mnttab.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zmount.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zone.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb_il.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_main.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_util.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_main.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/ztest/ztest.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/assert.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/atomic.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/libintl.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/stdio_ext.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/synch.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/thread.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/kernel.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#6 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/taskq.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/util.c#4 delete
.. //depot/projects/dtrace7/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/dtrace7/src/lib/libutil/humanize_number.c#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_zone.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/acl.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/byteorder.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/callb.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cmn_err.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cred.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/debug.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dirent.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dkio.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dnlc.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kobj.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kstat.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/lock.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/misc.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mntent.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mnttab.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mount.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/policy.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#5 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/random.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/string.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sunddi.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sysmacros.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/systm.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/types.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/uio.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/varargs.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/zone.h#3 delete
.. //depot/projects/dtrace7/src/sys/conf/files#8 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/acl/acl_common.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/acl/acl_common.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/Makefile.files#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/list.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/callb.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/compress.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cred.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/debug.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/list.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/note.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/processor.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/synch.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#3 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_l2t.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_l2t.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_multiq.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3cdev.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete
.. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/fcntl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/param.h#7 integrate
.. //depot/projects/dtrace7/src/tools/regression/file/dup/dup.c#2 integrate

Differences ...

==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.12 2008/04/08 09:07:43 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.13 2008/04/20 16:44:50 antoine Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -30,6 +30,11 @@
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libkse.a
+OLD_FILES+=usr/lib32/libkse_p.a
+OLD_FILES+=usr/lib32/libkse_pic.a
+.endif
 .endif
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
@@ -116,6 +121,12 @@
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libatm.a
+OLD_FILES+=usr/lib32/libatm.so
+OLD_LIBS+=usr/lib32/libatm.so.5
+OLD_FILES+=usr/lib32/libatm_p.a
+.endif
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
@@ -206,6 +217,42 @@
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libalias.so.5
+OLD_LIBS+=usr/lib32/libbsnmp.so.3
+OLD_LIBS+=usr/lib32/libdialog.so.5
+OLD_LIBS+=usr/lib32/libgnuregex.so.3
+OLD_LIBS+=usr/lib32/libhistory.so.6
+OLD_LIBS+=usr/lib32/libncurses.so.6
+OLD_LIBS+=usr/lib32/libncursesw.so.6
+OLD_LIBS+=usr/lib32/libpam.so.3
+OLD_LIBS+=usr/lib32/libreadline.so.6
+OLD_LIBS+=usr/lib32/libssh.so.3
+OLD_LIBS+=usr/lib32/pam_chroot.so.3
+OLD_LIBS+=usr/lib32/pam_deny.so.3
+OLD_LIBS+=usr/lib32/pam_echo.so.3
+OLD_LIBS+=usr/lib32/pam_exec.so.3
+OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
+OLD_LIBS+=usr/lib32/pam_group.so.3
+OLD_LIBS+=usr/lib32/pam_guest.so.3
+OLD_LIBS+=usr/lib32/pam_krb5.so.3
+OLD_LIBS+=usr/lib32/pam_ksu.so.3
+OLD_LIBS+=usr/lib32/pam_lastlog.so.3
+OLD_LIBS+=usr/lib32/pam_login_access.so.3
+OLD_LIBS+=usr/lib32/pam_nologin.so.3
+OLD_LIBS+=usr/lib32/pam_opie.so.3
+OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
+OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
+OLD_LIBS+=usr/lib32/pam_permit.so.3
+OLD_LIBS+=usr/lib32/pam_radius.so.3
+OLD_LIBS+=usr/lib32/pam_rhosts.so.3
+OLD_LIBS+=usr/lib32/pam_rootok.so.3
+OLD_LIBS+=usr/lib32/pam_securetty.so.3
+OLD_LIBS+=usr/lib32/pam_self.so.3
+OLD_LIBS+=usr/lib32/pam_ssh.so.3
+OLD_LIBS+=usr/lib32/pam_tacplus.so.3
+OLD_LIBS+=usr/lib32/pam_unix.so.3
+.endif
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
@@ -585,6 +632,9 @@
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libarchive.so.3
+.endif
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz

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

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

==== //depot/projects/dtrace7/src/bin/sh/options.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25.2.1 2008/04/20 18:02:41 stefanf Exp $");
 
 #include <signal.h>
 #include <unistd.h>
@@ -383,7 +383,7 @@
 	}
 	ap2 = shellparam.p;
 	while ((*ap2++ = *ap1++) != NULL);
-	shellparam.optnext = NULL;
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -405,6 +405,7 @@
 	if (*argptr != NULL) {
 		setparam(argptr);
 	}
+	shellparam.reset = 1;
 	INTON;
 	return 0;
 }
@@ -414,7 +415,6 @@
 getoptsreset(const char *value)
 {
 	if (number(value) == 1) {
-		shellparam.optnext = NULL;
 		shellparam.reset = 1;
 	}
 }

==== //depot/projects/dtrace7/src/lib/libc/sys/fcntl.2#3 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.45.2.1 2008/04/10 09:39:20 dfr Exp $
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.45.2.2 2008/04/20 19:32:45 antoine Exp $
 .\"
-.Dd January 12, 1994
+.Dd March 8, 2008
 .Dt FCNTL 2
 .Os
 .Sh NAME
@@ -78,6 +78,18 @@
 .Xr execve 2
 system calls.
 .El
+.It Dv F_DUP2FD
+It is functionally equivalent to
+.Bd -literal -offset indent
+dup2(fd, arg)
+.Ed
+.Pp
+The
+.Dv F_DUP2FD
+constant is not portable, so it should not be used if portability is needed.
+Use
+.Fn dup2
+instead.
 .It Dv F_GETFD
 Get the close-on-exec flag associated with the file descriptor
 .Fa fd
@@ -394,6 +406,9 @@
 .Bl -tag -width F_GETOWNX -offset indent
 .It Dv F_DUPFD
 A new file descriptor.
+.It Dv F_DUP2FD
+A file descriptor equal to
+.Fa arg .
 .It Dv F_GETFD
 Value of flag (only the low-order bit is defined).
 .It Dv F_GETFL
@@ -437,6 +452,14 @@
 The argument
 .Fa cmd
 is
+.Dv F_DUP2FD ,
+and
+.Fa arg
+is not a valid file descriptor.
+.Pp
+The argument
+.Fa cmd
+is
 .Dv F_SETLK
 or
 .Dv F_SETLKW ,
@@ -500,6 +523,8 @@
 .Fa cmd
 is
 .Dv F_DUPFD
+or
+.Dv F_DUP2FD
 and the maximum number of file descriptors permitted for the
 process are already in use,
 or no file descriptors greater than or equal to
@@ -572,6 +597,7 @@
 .Xr tcgetpgrp 3 .
 .Sh SEE ALSO
 .Xr close 2 ,
+.Xr dup2 2 ,
 .Xr execve 2 ,
 .Xr flock 2 ,
 .Xr getdtablesize 2 ,
@@ -580,8 +606,18 @@
 .Xr lockf 3 ,
 .Xr tcgetpgrp 3 ,
 .Xr tcsetpgrp 3
+.Sh STANDARDS
+The
+.Dv F_DUP2FD
+constant is non portable.
+It is provided for compatibility with AIX and Solaris.
 .Sh HISTORY
 The
 .Fn fcntl
 system call appeared in
 .Bx 4.2 .
+.Pp
+The
+.Dv F_DUP2FD
+constant first appeared in
+.Fx 7.1 .

==== //depot/projects/dtrace7/src/lib/libutil/humanize_number.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$NetBSD: humanize_number.c,v 1.8 2004/07/27 01:56:24 enami Exp $	*/
+/*	$NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -38,10 +38,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2 2004/09/25 14:11:34 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2.10.1 2008/04/20 16:29:01 antoine Exp $");
 
 #include <sys/types.h>
 #include <assert.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -118,7 +119,12 @@
 		for (max = 100, i = len - baselen; i-- > 0;)
 			max *= 10;
 
-		for (i = 0; bytes >= max && i < maxscale; i++)
+		/*
+		 * Divide the number until it fits the given column.
+		 * If there will be an overflow by the rounding below,
+		 * divide once more.
+		 */
+		for (i = 0; bytes >= max - 50 && i < maxscale; i++)
 			bytes /= divisor;
 
 		if (scale & HN_GETSCALE)
@@ -139,9 +145,8 @@
 		    sign * s1, localeconv()->decimal_point, s2,
 		    sep, SCALE2PREFIX(i), suffix);
 	} else
-		r = snprintf(buf, len, "%lld%s%s%s",
-		    /* LONGLONG */
-		    (long long)(sign * ((bytes + 50) / 100)),
+		r = snprintf(buf, len, "%" PRId64 "%s%s%s",
+		    sign * ((bytes + 50) / 100),
 		    sep, SCALE2PREFIX(i), suffix);
 
 	return (r);

==== //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#3 (text+ko) ====

@@ -37,7 +37,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.3 2008/03/07 16:32:42 bmah Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.4 2008/04/17 19:03:43 delphij Exp $</pubdate>
 
     <copyright>
       <year>2008</year>
@@ -130,7 +130,33 @@
 ]]>
 
 <![ %release.type.snapshot [
-    <para>No advisories.</para>
+    <para>The following security advisories pertain to &os; &release.bugfix;.
+      For more information, consult the individual advisories available from
+      <ulink url="http://security.FreeBSD.org/"></ulink>.</para>
+
+    <informaltable frame="none" pgwide="0">
+      <tgroup cols="3">
+	<colspec colwidth="1*">
+	<colspec colwidth="1*">
+	<colspec colwidth="3*">
+	<thead>
+	  <row>
+	    <entry>Advisory</entry>
+	    <entry>Date</entry>
+	    <entry>Topic</entry>
+	  </row>
+	</thead>
+
+	<tbody>
+	  <row>
+	    <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:05.openssh.asc"
+		>SA-08:05.openssh</ulink></entry>
+	    <entry>17&nbsp;April&nbsp;2008</entry>
+	    <entry><para>OpenSSH X11-forwarding privilege escalation</para></entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </informaltable>
 ]]>
 
   </sect1>

==== //depot/projects/dtrace7/src/sys/conf/files#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1243.2.16 2008/04/14 06:21:34 yongari Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243.2.17 2008/04/18 02:45:35 kmacy Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -515,9 +515,9 @@
 dev/cs/if_cs_pccard.c		optional cs pccard
 dev/cxgb/cxgb_main.c		optional cxgb pci
 dev/cxgb/cxgb_offload.c		optional cxgb pci
-dev/cxgb/cxgb_l2t.c		optional cxgb pci
 dev/cxgb/cxgb_lro.c		optional cxgb pci
 dev/cxgb/cxgb_sge.c		optional cxgb pci
+dev/cxgb/cxgb_multiq.c		optional cxgb pci
 dev/cxgb/common/cxgb_mc5.c	optional cxgb pci
 dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci
 dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci
@@ -526,6 +526,8 @@
 dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci
 dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci
 dev/cxgb/sys/uipc_mvec.c	optional cxgb pci
+dev/cxgb/sys/cxgb_support.c	optional cxgb pci
+dev/cxgb/cxgb_t3fw.c		 optional cxgb cxgb_t3fw
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci

==== //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.3 2007/06/13 05:36:00 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.3.2.1 2008/04/18 02:45:36 kmacy Exp $");
 
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
@@ -36,6 +36,9 @@
 #include <dev/cxgb/cxgb_include.h>
 #endif
 
+#undef msleep
+#define msleep t3_os_sleep
+
 enum {
 	AEL100X_TX_DISABLE  = 9,
 	AEL100X_TX_CONFIG1  = 0xc002,
@@ -52,9 +55,9 @@
 {
 	int tx_on_gpio = phy->addr == 0 ? F_GPIO7_OUT_VAL : F_GPIO2_OUT_VAL;
 
-	t3_os_sleep(100);
+	msleep(100);
 	t3_set_reg_field(phy->adapter, A_T3DBG_GPIO_EN, 0, tx_on_gpio);
-	t3_os_sleep(30);
+	msleep(30);
 }
 
 static int ael1002_power_down(struct cphy *phy, int enable)
@@ -115,7 +118,6 @@
 
 #ifdef C99_NOT_SUPPORTED
 static struct cphy_ops ael1002_ops = {
-	NULL,
 	ael1002_reset,
 	ael1002_intr_noop,
 	ael1002_intr_noop,
@@ -141,11 +143,14 @@
 };
 #endif
 
-void t3_ael1002_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
-			 const struct mdio_ops *mdio_ops)
+int t3_ael1002_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
+			const struct mdio_ops *mdio_ops)
 {
-	cphy_init(phy, adapter, phy_addr, &ael1002_ops, mdio_ops);
+	cphy_init(phy, adapter, phy_addr, &ael1002_ops, mdio_ops,
+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,
+		  "10GBASE-R");
 	ael100x_txon(phy);
+	return 0;
 }
 
 static int ael1006_reset(struct cphy *phy, int wait)
@@ -188,7 +193,6 @@
 
 #ifdef C99_NOT_SUPPORTED
 static struct cphy_ops ael1006_ops = {
-	NULL,
 	ael1006_reset,
 	ael1006_intr_enable,
 	ael1006_intr_disable,
@@ -214,16 +218,18 @@
 };
 #endif
 
-void t3_ael1006_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
-			 const struct mdio_ops *mdio_ops)
+int t3_ael1006_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
+			const struct mdio_ops *mdio_ops)
 {
-	cphy_init(phy, adapter, phy_addr, &ael1006_ops, mdio_ops);
+	cphy_init(phy, adapter, phy_addr, &ael1006_ops, mdio_ops,
+		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,
+		  "10GBASE-SR");
 	ael100x_txon(phy);
+	return 0;
 }
 
 #ifdef C99_NOT_SUPPORTED
 static struct cphy_ops qt2045_ops = {
-	NULL,
 	ael1006_reset,
 	ael1006_intr_enable,

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

More information about the p4-projects mailing list