From owner-p4-projects@FreeBSD.ORG Wed Apr 18 10:20:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27E2016A410; Wed, 18 Apr 2007 10:20:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8799516A403 for ; Wed, 18 Apr 2007 10:20:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 75F7513C4B8 for ; Wed, 18 Apr 2007 10:20:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3IAK2s9096809 for ; Wed, 18 Apr 2007 10:20:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3IAJrSr096773 for perforce@freebsd.org; Wed, 18 Apr 2007 10:19:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 18 Apr 2007 10:19:53 GMT Message-Id: <200704181019.l3IAJrSr096773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 118350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2007 10:20:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=118350 Change 118350 by rwatson@rwatson_zoo on 2007/04/18 10:19:42 Integrate TrustedBSD base branch from FreeBSD CVS: - trunk(4) renamed to lagg(4) - sendmail update to 8.14.1 - Sundry ZFS build and bug fixes - libreadonline update to 5.2p2 - OpenBSM update to 1.0 alpha 14 - top(1) jailid support - cam(4) MPSAFE, as well as several SCSI device drivers - pseudofs, procfs, linprocfs, linsysfs MPSAFE - PRIV_VFS_MOUNT_OWNER and vfs_suser changes - rman(9) debugging - many sctp(4) fixes - SUSER_ALLOWJAIL consistency improvements - ARG_TERMID_ADDR and extended address process audit state Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#84 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#22 integrate .. //depot/projects/trustedbsd/base/UPDATING#78 integrate .. //depot/projects/trustedbsd/base/cddl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/TODO#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/VERSION#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditfilterd/auditfilterd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/auditreduce/auditreduce.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/bsm/libbsm.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/compat/clock_gettime.h#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_control.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_event.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_io.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_mask.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_open.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_token.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/au_user.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_notify.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_token.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/bsm_wrappers.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/libbsm/libbsm.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit.log.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditctl.2#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/bsm/generate.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/arg32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/data_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/file_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/in_addr_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ip_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/ipc_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/iport_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/opaque_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/path_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token#2 delete .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/return32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/seq_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/text_record#2 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/zonename_record#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/test/reference/zonename_token#1 branch .. //depot/projects/trustedbsd/base/contrib/openbsm/tools/audump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/top/commands.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/top/machine.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#9 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.h#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/hostid#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountd#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/zfs#2 integrate .. //depot/projects/trustedbsd/base/etc/services#15 integrate .. //depot/projects/trustedbsd/base/include/Makefile#60 integrate .. //depot/projects/trustedbsd/base/include/rpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/rpc/types.h#3 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#25 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_data_large.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_large.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_position.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_truncated.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_open_memory.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#9 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#14 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atmconfig/diag.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#48 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/iflagg.c#1 branch .. //depot/projects/trustedbsd/base/sbin/ifconfig/iftrunk.c#2 delete .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#46 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#29 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/cvs-supfile#9 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#7 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/standard-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#75 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lagg.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/trunk.4#2 delete .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#7 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#3 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#3 integrate .. //depot/projects/trustedbsd/base/share/misc/organization.dot#1 branch .. //depot/projects/trustedbsd/base/sys/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#22 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.h#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.c#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_sim.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#31 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#31 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#14 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#62 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#15 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#20 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_targ_bh.c#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#41 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#27 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#85 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#114 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#81 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pfsync.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/adwcam.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aha/aha.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_cam.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/buslogic/bt.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/esp/ncr53c9x.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_exvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdma.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp_targ.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#50 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#62 integrate .. //depot/projects/trustedbsd/base/sys/dev/wds/wd7000.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_dbregs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_fpregs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_map.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_regs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_fileno.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_internal.h#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_share.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#74 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#27 integrate .. //depot/projects/trustedbsd/base/sys/isa/isa_common.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_rman.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#87 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#54 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#55 integrate .. //depot/projects/trustedbsd/base/sys/net/if_lagg.c#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_lagg.h#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_trunk.c#2 delete .. //depot/projects/trustedbsd/base/sys/net/if_trunk.h#2 delete .. //depot/projects/trustedbsd/base/sys/net/if_var.h#43 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#59 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#73 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#47 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.h#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#27 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#38 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#6 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#12 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_token.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#55 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/priv.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#82 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/mach#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipblock/Makefile#2 delete .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipblock/ipblock.c#2 delete .. //depot/projects/trustedbsd/base/usr.bin/finger/extern.h#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/finger.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/finger.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/net.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#26 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/top/machine.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.conf.5#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.sh#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.c#21 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd_lock.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#84 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.571 2007/04/06 02:13:29 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,11 +1016,11 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.78 2007/04/09 19:16:48 pjd Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070417: trunk(4) renamed to lagg(4) +OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ OLD_FILES+=usr/bin/uuidgen # 20070328: bzip2 1.0.4 ==== //depot/projects/trustedbsd/base/UPDATING#78 (text+ko) ==== @@ -21,6 +21,15 @@ developers choose to disable these features on build machines to maximize performance. +20070417: + The new trunk(4) driver has been renamed to lagg(4) as it better + reflects its purpose. ifconfig will need to be recompiled. + +20070408: + sendmail(8) has been updated to version 8.14.1. Mail filters + (aka, milters) compiled against the libmilter included in the + base operating system should be recompiled. + 20070302: Firmwares for ipw(4) and iwi(4) are now included in the base tree. In order to use them one must agree to the respective LICENSE in @@ -758,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.484 2007/04/03 10:04:54 brueffer Exp $ +$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ ==== //depot/projects/trustedbsd/base/cddl/Makefile#2 (text+ko) ==== @@ -1,8 +1,5 @@ -# $FreeBSD: src/cddl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -SUBDIR= lib -SUBDIR+=sbin -SUBDIR+=usr.bin -SUBDIR+=usr.sbin +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/trustedbsd/base/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+=-D_SOLARIS_C_SOURCE +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/trustedbsd/base/cddl/lib/Makefile#2 (text+ko) ==== @@ -1,18 +1,19 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.3 2007/04/16 21:20:24 ru Exp $ .include -SUBDIR= libavl -SUBDIR+=libnvpair -SUBDIR+=libumem -SUBDIR+=libuutil -.if ${MK_CDDL} != "no" -SUBDIR+=libzfs -SUBDIR+=${_libzpool} -.endif +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +_libzfs= libzfs +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/trustedbsd/base/cddl/lib/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ SHLIBDIR?= /lib +SHLIB_MAJOR?= 1 .include "../Makefile.inc" ==== //depot/projects/trustedbsd/base/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= avl -SHLIB_MAJOR?=1 - SRCS= avl.c - -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,18 +1,17 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair LIB= nvpair -SHLIB_MAJOR?=1 -SRCS= libnvpair.c -SRCS+= nvpair_alloc_system.c -SRCS+= nvpair_alloc_fixed.c -SRCS+= nvpair.c +SRCS= libnvpair.c \ + nvpair_alloc_system.c \ + nvpair_alloc_fixed.c \ + nvpair.c -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../include -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../include # XXX +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libumem/Makefile#2 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.1 2007/04/06 01:08:56 pjd Exp $ +# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem +.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem LIB= umem -SHLIB_MAJOR?=1 - SRCS= umem.c - -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem .include ==== //depot/projects/trustedbsd/base/cddl/lib/libuutil/Makefile#2 (text+ko) ==== @@ -1,27 +1,25 @@ -# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl LIB= uutil -SHLIB_MAJOR?=1 +SRCS= avl.c \ + uu_alloc.c \ + uu_avl.c \ + uu_dprintf.c \ + uu_ident.c \ + uu_list.c \ + uu_misc.c \ + uu_open.c \ + uu_pname.c \ + uu_strtoint.c -SRCS= avl.c -SRCS+= uu_alloc.c -SRCS+= uu_avl.c -SRCS+= uu_dprintf.c -SRCS+= uu_ident.c -SRCS+= uu_list.c -SRCS+= uu_misc.c -SRCS+= uu_open.c -SRCS+= uu_pname.c -SRCS+= uu_strtoint.c - -CFLAGS+=-DNATIVE_BUILD -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -DNATIVE_BUILD +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head .include ==== //depot/projects/trustedbsd/base/cddl/lib/libzfs/Makefile#2 (text+ko) ==== @@ -1,49 +1,46 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ -.PATH: ${.CURDIR}/../../../compat/opensolaris/misc -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +.PATH: ${.CURDIR}/../../../compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common LIB= zfs -SHLIB_MAJOR?=1 - DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c -SRCS+= mkdirp.c -SRCS+= zmount.c -SRCS+= fsshare.c -SRCS+= zone.c +SRCS= mnttab.c \ + mkdirp.c \ + zmount.c \ + fsshare.c \ + zone.c -SRCS+= zfs_namecheck.c -SRCS+= zfs_prop.c -SRCS+= libzfs_dataset.c -SRCS+= libzfs_util.c -SRCS+= libzfs_graph.c -SRCS+= libzfs_mount.c -SRCS+= libzfs_pool.c -SRCS+= libzfs_changelist.c -SRCS+= libzfs_config.c -SRCS+= libzfs_import.c -SRCS+= libzfs_status.c +SRCS+= zfs_namecheck.c \ + zfs_prop.c \ + libzfs_dataset.c \ + libzfs_util.c \ + libzfs_graph.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_import.c \ + libzfs_status.c -CFLAGS+=-DZFS_NO_ACL -CFLAGS+=-I${.CURDIR}/../../../sbin/mount -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common .include ==== //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,44 +1,43 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.2 2007/04/07 23:54:53 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.4 2007/04/17 15:52:36 pjd Exp $ .include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs # KERNEL_SRCS -.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common # LIST_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -LIB= zpool -SHLIB_MAJOR?=1 +LIB= zpool -ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c -ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} -KERNEL_SRCS= kernel.c taskq.c util.c -LIST_SRCS= list.c -ATOMIC_SRCS= atomic.S +ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c +ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} +KERNEL_SRCS= kernel.c taskq.c util.c +LIST_SRCS= list.c +ATOMIC_SRCS= atomic.S -SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} +SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ + ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../cddl/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= ==== //depot/projects/trustedbsd/base/cddl/sbin/Makefile#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/cddl/sbin/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ .include -SUBDIR= +SUBDIR= ${_zfs} ${_zpool} + .if ${MK_ZFS} != "no" -SUBDIR+=zfs -SUBDIR+=zpool +_zfs= zfs +_zpool= zpool .endif .include ==== //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#2 (text+ko) ==== @@ -1,25 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 -SRCS= zfs_main.c -SRCS+= zfs_iter.c +SRCS= zfs_main.c zfs_iter.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#2 (text+ko) ==== @@ -1,27 +1,23 @@ -# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.1 2007/04/06 01:08:57 pjd Exp $ +# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool PROG= zpool MAN= zpool.8 -SRCS= zpool_main.c -SRCS+= zpool_vdev.c -SRCS+= zpool_iter.c -SRCS+= zpool_util.c +SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs ==== //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $ .include -.if ${MK_ZFS} != "no" SUBDIR= ${_ztest} -.endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MK_ZFS} != "no" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _ztest= ztest .endif +.endif .include ==== //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#2 (text+ko) ==== @@ -1,23 +1,21 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $ -.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest +.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest PROG= ztest +NO_MAN= -CFLAGS+=-I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/include -CFLAGS+=-I${.CURDIR}/../../../compat/opensolaris/lib/libumem -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -CFLAGS+=-I${.CURDIR}/../../../contrib/opensolaris/head -CFLAGS+=-I${.CURDIR}/../../lib/libumem -CFLAGS+=-I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool - -NO_MAN= +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include >>> TRUNCATED FOR MAIL (1000 lines) <<<