PERFORCE change 118500 for review
Matt Jacob
mjacob at FreeBSD.org
Fri Apr 20 22:43:50 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=118500
Change 118500 by mjacob at mjexp on 2007/04/20 22:42:54
IFC
Affected files ...
.. //depot/projects/mjexp/Makefile.inc1#8 integrate
.. //depot/projects/mjexp/ObsoleteFiles.inc#13 integrate
.. //depot/projects/mjexp/UPDATING#13 integrate
.. //depot/projects/mjexp/cddl/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/Makefile.inc#2 integrate
.. //depot/projects/mjexp/cddl/lib/Makefile#3 integrate
.. //depot/projects/mjexp/cddl/lib/Makefile.inc#2 integrate
.. //depot/projects/mjexp/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/lib/libzpool/Makefile#3 integrate
.. //depot/projects/mjexp/cddl/sbin/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/usr.bin/Makefile#3 integrate
.. //depot/projects/mjexp/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/mjexp/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/mjexp/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/HISTORY#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/README#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/TODO#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/VERSION#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/audit/audit.8#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/auditd/auditd.8#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/auditd/auditd.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/auditfilterd/auditfilterd.8#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/praudit/praudit.1#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bin/praudit/praudit.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/bsm/libbsm.h#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/compat/clock_gettime.h#1 branch
.. //depot/projects/mjexp/contrib/openbsm/config/config.h#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/configure#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/configure.ac#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/etc/audit_event#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_class.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_control.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_event.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_free_token.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_io.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_mask.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_open.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_token.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/au_user.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/audit_submit.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_io.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_notify.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_token.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/libbsm/libbsm.3#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit.log.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit_class.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit_control.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit_event.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit_user.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/audit_warn.5#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/auditctl.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/auditon.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/getaudit.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/getauid.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/setaudit.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/man/setauid.2#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/bsm/generate.c#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/arg32_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/data_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/file_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/in_addr_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/ip_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/ipc_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/iport_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/opaque_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/path_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record#2 delete
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record-IPv4#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_record-IPv6#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token#2 delete
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token-IPv4#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process32ex_token-IPv6#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64_record#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64_token#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_record-IPv4#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_record-IPv6#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_token-IPv4#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/process64ex_token-IPv6#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/return32_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/seq_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_token-IPv4#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/subject32ex_token-IPv6#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/text_record#2 integrate
.. //depot/projects/mjexp/contrib/openbsm/test/reference/zonename_record#1 branch
.. //depot/projects/mjexp/contrib/openbsm/test/reference/zonename_token#1 branch
.. //depot/projects/mjexp/contrib/openbsm/tools/audump.c#2 integrate
.. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate
.. //depot/projects/mjexp/contrib/top/commands.c#2 integrate
.. //depot/projects/mjexp/contrib/top/machine.h#2 integrate
.. //depot/projects/mjexp/contrib/top/top.X#3 integrate
.. //depot/projects/mjexp/contrib/top/top.c#3 integrate
.. //depot/projects/mjexp/etc/mtree/BSD.include.dist#6 integrate
.. //depot/projects/mjexp/etc/rc.d/zfs#3 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#9 integrate
.. //depot/projects/mjexp/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate
.. //depot/projects/mjexp/lib/libc/net/rthdr.c#2 integrate
.. //depot/projects/mjexp/lib/libc/stdio/fputs.3#3 integrate
.. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#5 integrate
.. //depot/projects/mjexp/libexec/ftpd/ftpcmd.y#2 integrate
.. //depot/projects/mjexp/libexec/ftpd/ftpd.8#2 integrate
.. //depot/projects/mjexp/libexec/ftpd/ftpd.c#3 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate
.. //depot/projects/mjexp/sbin/ifconfig/Makefile#3 integrate
.. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#10 integrate
.. //depot/projects/mjexp/sbin/ifconfig/iflagg.c#1 branch
.. //depot/projects/mjexp/sbin/ifconfig/iftrunk.c#2 delete
.. //depot/projects/mjexp/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/mjexp/sbin/ping6/ping6.c#2 integrate
.. //depot/projects/mjexp/share/man/man4/Makefile#11 integrate
.. //depot/projects/mjexp/share/man/man4/lagg.4#1 branch
.. //depot/projects/mjexp/share/man/man4/trunk.4#2 delete
.. //depot/projects/mjexp/share/man/man7/hier.7#6 integrate
.. //depot/projects/mjexp/share/man/man8/nanobsd.8#3 integrate
.. //depot/projects/mjexp/share/man/man9/pseudofs.9#2 integrate
.. //depot/projects/mjexp/share/misc/organization.dot#1 branch
.. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_dummy.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#13 integrate
.. //depot/projects/mjexp/sys/bsm/audit.h#3 integrate
.. //depot/projects/mjexp/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/mjexp/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/mjexp/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_periph.c#5 integrate
.. //depot/projects/mjexp/sys/cam/cam_periph.h#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_sim.c#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_sim.h#3 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/mjexp/sys/cam/cam_xpt_periph.h#3 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_low.c#5 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#4 integrate
.. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#4 integrate
.. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate
.. //depot/projects/mjexp/sys/conf/NOTES#19 integrate
.. //depot/projects/mjexp/sys/conf/files#20 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/dnlc.c#4 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.h#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ath/if_ath.c#8 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate
.. //depot/projects/mjexp/sys/dev/ex/if_exvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwdma.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/mjexp/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/mjexp/sys/dev/iicbus/icee.c#2 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#17 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#17 integrate
.. //depot/projects/mjexp/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/mjexp/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/als4000.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx-pcm.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#11 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/t4dwave.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/via82c686.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#6 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.h#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.h#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/sbus/cs4231.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_ural.c#7 integrate
.. //depot/projects/mjexp/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#7 integrate
.. //depot/projects/mjexp/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.c#5 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs.h#5 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_internal.h#3 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate
.. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/bios.c#2 integrate
.. //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/identcpu.c#6 integrate
.. //depot/projects/mjexp/sys/isa/isa_common.c#2 integrate
.. //depot/projects/mjexp/sys/kern/kern_intr.c#10 integrate
.. //depot/projects/mjexp/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/mjexp/sys/kern/subr_rman.c#4 integrate
.. //depot/projects/mjexp/sys/kern/subr_witness.c#10 integrate
.. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#9 integrate
.. //depot/projects/mjexp/sys/kern/vfs_mount.c#12 integrate
.. //depot/projects/mjexp/sys/modules/Makefile#11 integrate
.. //depot/projects/mjexp/sys/modules/if_lagg/Makefile#1 branch
.. //depot/projects/mjexp/sys/modules/if_trunk/Makefile#2 delete
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#2 integrate
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#2 integrate
.. //depot/projects/mjexp/sys/net/if.c#8 integrate
.. //depot/projects/mjexp/sys/net/if_ethersubr.c#9 integrate
.. //depot/projects/mjexp/sys/net/if_lagg.c#1 branch
.. //depot/projects/mjexp/sys/net/if_lagg.h#1 branch
.. //depot/projects/mjexp/sys/net/if_trunk.c#2 delete
.. //depot/projects/mjexp/sys/net/if_trunk.h#2 delete
.. //depot/projects/mjexp/sys/net/if_var.h#4 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/ip_fw2.c#10 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_indata.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_input.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#4 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_structs.h#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_uio.h#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_var.h#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctputil.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctputil.h#7 integrate
.. //depot/projects/mjexp/sys/netinet/tcp.h#4 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_output.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_subr.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_var.h#6 integrate
.. //depot/projects/mjexp/sys/netnatm/natm.h#3 integrate
.. //depot/projects/mjexp/sys/pci/if_rlreg.h#5 integrate
.. //depot/projects/mjexp/sys/pci/if_vr.c#3 integrate
.. //depot/projects/mjexp/sys/pci/if_vrreg.h#2 integrate
.. //depot/projects/mjexp/sys/pci/intpm.c#4 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/nexus.c#3 integrate
.. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#4 integrate
.. //depot/projects/mjexp/sys/sys/interrupt.h#4 integrate
.. //depot/projects/mjexp/sys/sys/mount.h#10 integrate
.. //depot/projects/mjexp/sys/sys/priv.h#6 integrate
.. //depot/projects/mjexp/sys/sys/socket.h#3 integrate
.. //depot/projects/mjexp/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/mjexp/sys/vm/vm_param.h#2 integrate
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/Makefile#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/README#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/mach#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getaddr.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getaddr.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getgr.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getgr.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getproto.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getproto.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getpw.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getpw.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getrpc.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getrpc.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getserv.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getserv.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getusershell.c#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-getusershell.t#1 branch
.. //depot/projects/mjexp/tools/regression/lib/libc/nss/testutil.h#1 branch
.. //depot/projects/mjexp/tools/regression/sockets/sendfile/Makefile#2 integrate
.. //depot/projects/mjexp/tools/regression/sockets/sendfile/sendfile.c#2 integrate
.. //depot/projects/mjexp/tools/tools/nanobsd/nanobsd.sh#3 integrate
.. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.1#3 integrate
.. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.c#3 integrate
.. //depot/projects/mjexp/usr.bin/make/GNode.h#2 integrate
.. //depot/projects/mjexp/usr.bin/make/main.c#3 integrate
.. //depot/projects/mjexp/usr.bin/make/make.c#2 integrate
.. //depot/projects/mjexp/usr.bin/make/targ.c#2 integrate
.. //depot/projects/mjexp/usr.bin/tar/read.c#6 integrate
.. //depot/projects/mjexp/usr.bin/tar/test/test-basic.sh#4 integrate
.. //depot/projects/mjexp/usr.bin/tar/util.c#4 integrate
.. //depot/projects/mjexp/usr.bin/top/machine.c#4 integrate
.. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#3 integrate
.. //depot/projects/mjexp/usr.sbin/daemon/daemon.c#4 integrate
Differences ...
==== //depot/projects/mjexp/Makefile.inc1#8 (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/mjexp/ObsoleteFiles.inc#13 (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/mjexp/UPDATING#13 (text+ko) ====
@@ -21,6 +21,10 @@
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
@@ -763,4 +767,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.485 2007/04/14 16:26:01 gshapiro Exp $
+$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $
==== //depot/projects/mjexp/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 <bsd.subdir.mk>
==== //depot/projects/mjexp/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/mjexp/cddl/lib/Makefile#3 (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 <bsd.own.mk>
-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 <bsd.subdir.mk>
==== //depot/projects/mjexp/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/mjexp/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 <bsd.lib.mk>
==== //depot/projects/mjexp/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 <bsd.lib.mk>
==== //depot/projects/mjexp/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 <bsd.lib.mk>
==== //depot/projects/mjexp/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 <bsd.lib.mk>
==== //depot/projects/mjexp/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 <bsd.lib.mk>
==== //depot/projects/mjexp/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/mjexp/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 <bsd.own.mk>
-SUBDIR=
+SUBDIR= ${_zfs} ${_zpool}
+
.if ${MK_ZFS} != "no"
-SUBDIR+=zfs
-SUBDIR+=zpool
+_zfs= zfs
+_zpool= zpool
.endif
.include <bsd.subdir.mk>
==== //depot/projects/mjexp/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/mjexp/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/mjexp/cddl/usr.bin/Makefile#3 (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 <bsd.own.mk>
-.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 <bsd.subdir.mk>
==== //depot/projects/mjexp/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 <bsd.prog.mk>
==== //depot/projects/mjexp/cddl/usr.sbin/Makefile#3 (text+ko) ====
@@ -1,14 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.2 2007/04/07 19:12:09 des Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.3 2007/04/16 21:20:26 ru Exp $
.include <bsd.own.mk>
-SUBDIR=
+SUBDIR= ${_zdb}
+
.if ${MK_ZFS} != "no"
-SUBDIR+=${_zdb}
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+_zdb= zdb
.endif
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-_zdb= zdb
.endif
.include <bsd.subdir.mk>
==== //depot/projects/mjexp/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====
@@ -1,23 +1,22 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.1 2007/04/06 01:08:58 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
PROG= zdb
MAN= zdb.8
-SRCS+= zdb.c zdb_il.c
+SRCS= zdb.c zdb_il.c
-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
-CFLAGS+=-I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-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
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+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
+DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
+LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool
.include <bsd.prog.mk>
==== //depot/projects/mjexp/contrib/openbsm/HISTORY#2 (text) ====
@@ -1,3 +1,23 @@
+OpenBSM 1.0 alpha 14
+
+- Fix endian issues when processing IPv6 addresses for extended subject
+ and process tokens.
+- gcc41 warnings clean.
+- Teach audit_submit(3) about getaudit_addr(2).
+- Add support for zonename tokens.
+
+OpenBSM 1.0 alpha 13
+
+- compat/clock_gettime.h now provides a compatibility implementation of
+ clock_gettime(), which fixes building on Mac OS X.
+- Countless man page improvements, markup fixes, content fixs, etc.
+- XML printing support via "praudit -x".
+- audit.log.5 expanded to include additional BSM token types.
+- Added encoding and decoding routines for process64_ex, process32_ex,
+ subject32_ex, header64, and attr64 tokens.
+- Additional audit event identifiers for listen, mlockall/munlockall,
+ getpath, POSIX message queues, and mandatory access control.
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list