PERFORCE change 156225 for review
Warner Losh
imp at FreeBSD.org
Thu Jan 15 11:49:30 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=156225
Change 156225 by imp at imp_paco-paco on 2009/01/15 19:48:56
IFC @156221
userland + lots of stuff to loopback in sys.
Affected files ...
.. //depot/projects/mips2/src/Makefile.inc1#27 integrate
.. //depot/projects/mips2/src/UPDATING#26 integrate
.. //depot/projects/mips2/src/bin/kenv/kenv.1#2 integrate
.. //depot/projects/mips2/src/bin/ln/ln.1#4 integrate
.. //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_crypto.c#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/INSTALL#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/NEWS#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/VERSION#7 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#6 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#6 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#6 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/configure#7 integrate
.. //depot/projects/mips2/src/contrib/openbsm/configure.ac#7 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libauditd/libauditd.3#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.in#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_domain.3#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_socket_type.3#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/au_token.3#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_audit.c#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_domain.c#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_errno.c#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#7 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_token.c#6 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/libbsm.3#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/man/audit_user.5#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.am#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit.h#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_domain.h#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_record.h#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch
.. //depot/projects/mips2/src/contrib/openbsm/test/bsm/generate.c#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/E2BIG_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EACCES_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBADF_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EBUSY_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ECHILD_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EDEADLK_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EEXIST_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFAULT_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EFBIG_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINTR_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EINVAL_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EIO_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EISDIR_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMFILE_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EMLINK_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENFILE_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENODEV_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOENT_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOMEM_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOSPC_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENOTTY_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ENXIO_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPERM_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EPIPE_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EROFS_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESPIPE_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ESRCH_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/EXDEV_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/arg32_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/data_token#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/file_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/in_addr_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ip_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/ipc_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/iport_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/opaque_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/path_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64_record#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/return32_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/seq_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_record#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/socketex_token#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/subject32ex_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/text_record#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/reference/zonename_record#3 integrate
.. //depot/projects/mips2/src/etc/periodic/weekly/Makefile#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate
.. //depot/projects/mips2/src/lib/libbsm/Makefile#6 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/printfcommon.h#1 branch
.. //depot/projects/mips2/src/lib/libc/stdio/vfprintf.c#7 integrate
.. //depot/projects/mips2/src/lib/libc/stdio/vfwprintf.c#8 integrate
.. //depot/projects/mips2/src/lib/libc/string/ffs.3#4 integrate
.. //depot/projects/mips2/src/lib/libusb20/libusb20.c#2 integrate
.. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#8 integrate
.. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#6 integrate
.. //depot/projects/mips2/src/lib/msun/src/k_cosf.c#3 integrate
.. //depot/projects/mips2/src/lib/msun/src/k_sinf.c#3 integrate
.. //depot/projects/mips2/src/lib/msun/src/k_tanf.c#3 integrate
.. //depot/projects/mips2/src/sbin/fdisk/fdisk.c#6 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#11 integrate
.. //depot/projects/mips2/src/sbin/mount/mount.c#10 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/refuse.README#3 integrate
.. //depot/projects/mips2/src/share/man/man4/ath.4#6 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/exception.S#8 integrate
.. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/mips2/src/sys/amd64/conf/USB2#2 integrate
.. //depot/projects/mips2/src/sys/boot/common/load.c#2 delete
.. //depot/projects/mips2/src/sys/boot/forth/support.4th#6 integrate
.. //depot/projects/mips2/src/sys/bsm/audit.h#8 integrate
.. //depot/projects/mips2/src/sys/bsm/audit_domain.h#1 branch
.. //depot/projects/mips2/src/sys/bsm/audit_errno.h#2 integrate
.. //depot/projects/mips2/src/sys/bsm/audit_internal.h#7 integrate
.. //depot/projects/mips2/src/sys/bsm/audit_kevents.h#8 integrate
.. //depot/projects/mips2/src/sys/bsm/audit_record.h#8 integrate
.. //depot/projects/mips2/src/sys/bsm/audit_socket_type.h#1 branch
.. //depot/projects/mips2/src/sys/cam/cam_xpt.c#14 integrate
.. //depot/projects/mips2/src/sys/cam/scsi/scsi_all.c#5 integrate
.. //depot/projects/mips2/src/sys/cam/scsi/scsi_da.c#12 integrate
.. //depot/projects/mips2/src/sys/cam/scsi/scsi_sg.c#6 integrate
.. //depot/projects/mips2/src/sys/conf/files#36 integrate
.. //depot/projects/mips2/src/sys/conf/files.powerpc#17 integrate
.. //depot/projects/mips2/src/sys/conf/kern.pre.mk#12 integrate
.. //depot/projects/mips2/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/bce/if_bce.c#13 integrate
.. //depot/projects/mips2/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/iicbus/iicbus.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#12 integrate
.. //depot/projects/mips2/src/sys/dev/msk/if_mskreg.h#7 integrate
.. //depot/projects/mips2/src/sys/dev/ofw/ofw_iicbus.c#1 branch
.. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ehci.c#12 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#29 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci.c#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ehci2_pci.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2_atmelarm.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/ohci2_pci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uhci2_pci.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_bus.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/usb2_controller.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_busdma.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_core.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_debug.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_device.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_generic.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_handle_request.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_hub.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_mbuf.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_parse.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_request.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/core/usb2_transfer.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axe2_reg.h#3 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cue2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_rue2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udav2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/image/uscanner2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_defs.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devid.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_devtable.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/include/usb2_standard.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/input/uhid2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/input/ukbd2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/input/ums2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/u3g2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uark2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ubsa2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ubser2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uchcom2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ucycom2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ufoma2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uftdi2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ugensa2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uipaq2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/ulpt2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/umct2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/umodem2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/umoscom2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uplcom2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/usb2_serial.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/usb2_serial.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uvisor2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/serial/uvscom2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/sound/uaudio2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/storage/ata-usb2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/storage/umass2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2.c#2 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rum2_var.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_ural2_var.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zyd2_reg.h#3 delete
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch
.. //depot/projects/mips2/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch
.. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate
.. //depot/projects/mips2/src/sys/i386/conf/GENERIC#22 integrate
.. //depot/projects/mips2/src/sys/i386/conf/USB2#2 integrate
.. //depot/projects/mips2/src/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/mips2/src/sys/kern/kern_timeout.c#14 integrate
.. //depot/projects/mips2/src/sys/kern/sysv_sem.c#7 integrate
.. //depot/projects/mips2/src/sys/mips/idt/idtpci.c#5 integrate
.. //depot/projects/mips2/src/sys/mips/include/pmap.h#17 integrate
.. //depot/projects/mips2/src/sys/mips/malta/gt_pci.c#7 integrate
.. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#12 integrate
.. //depot/projects/mips2/src/sys/mips/mips/cpu.c#25 integrate
.. //depot/projects/mips2/src/sys/mips/mips/machdep.c#47 integrate
.. //depot/projects/mips2/src/sys/mips/mips/nexus.c#15 integrate
.. //depot/projects/mips2/src/sys/mips/mips/pmap.c#38 integrate
.. //depot/projects/mips2/src/sys/modules/usb2/controller_atmegadci/Makefile#1 branch
.. //depot/projects/mips2/src/sys/netinet/tcp_input.c#20 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_subr.c#20 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_timer.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_var.h#15 integrate
.. //depot/projects/mips2/src/sys/netinet/vinet.h#3 integrate
.. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#15 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/locore.S#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/machdep.c#9 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/pmap.c#6 integrate
.. //depot/projects/mips2/src/sys/powerpc/booke/support.S#2 delete
.. //depot/projects/mips2/src/sys/powerpc/booke/trap_subr.S#3 integrate
.. //depot/projects/mips2/src/sys/powerpc/conf/NOTES#11 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/pcpu.h#7 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/pte.h#4 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/tlb.h#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/powermac/kiic.c#1 branch
.. //depot/projects/mips2/src/sys/powerpc/powerpc/genassym.c#6 integrate
.. //depot/projects/mips2/src/sys/security/audit/audit_bsm_domain.c#1 branch
.. //depot/projects/mips2/src/sys/security/audit/audit_bsm_errno.c#2 integrate
.. //depot/projects/mips2/src/sys/security/audit/audit_bsm_socket_type.c#1 branch
.. //depot/projects/mips2/src/sys/security/audit/audit_bsm_token.c#8 integrate
.. //depot/projects/mips2/src/sys/sys/param.h#25 integrate
.. //depot/projects/mips2/src/tools/sched/schedgraph.py#7 integrate
.. //depot/projects/mips2/src/tools/tools/net80211/scripts/setup.tdma-master#1 branch
.. //depot/projects/mips2/src/tools/tools/net80211/scripts/setup.tdma-slave#1 branch
.. //depot/projects/mips2/src/usr.bin/make/job.c#8 integrate
.. //depot/projects/mips2/src/usr.bin/make/main.c#12 integrate
.. //depot/projects/mips2/src/usr.bin/netstat/inet6.c#8 integrate
.. //depot/projects/mips2/src/usr.sbin/boot0cfg/boot0cfg.8#4 integrate
.. //depot/projects/mips2/src/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/usbconfig/usbconfig.c#2 integrate
Differences ...
==== //depot/projects/mips2/src/Makefile.inc1#27 (text+ko) ====
@@ -1,10 +1,11 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.614 2008/11/12 04:43:55 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.615 2009/01/15 04:19:03 imp Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNO_CLEAN do not clean at all
# -DNO_SHARE do not go into share subdir
+# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -697,6 +698,11 @@
# be set to cross-build, we have to make sure TARGET is set
# properly.
+.if defined(KERNFAST)
+NO_KERNELCLEAN= t
+NO_KERNELCONFIG= t
+NO_KERNELDEPEND= t
+.endif
.if !defined(KERNCONF) && defined(KERNEL)
KERNCONF= ${KERNEL}
KERNWARN=
==== //depot/projects/mips2/src/UPDATING#26 (text+ko) ====
@@ -22,6 +22,12 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090115:
+ TCP Appropriate Byte Counting (RFC 3465) support added to kernel.
+ New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to
+ 800061. User space tools that rely on the size of struct tcpcb in
+ tcp_var.h (e.g. sockstat) need to be recompiled.
+
20081225:
ng_tty(4) module updated to match the new TTY subsystem.
Due to API change, user-level applications must be updated.
@@ -1201,4 +1207,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $
+$FreeBSD: src/UPDATING,v 1.558 2009/01/15 06:44:22 lstewart Exp $
==== //depot/projects/mips2/src/bin/kenv/kenv.1#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.13 2005/11/17 12:15:22 ru Exp $
+.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.16 2009/01/13 18:25:56 maxim Exp $
.\"
-.Dd September 13, 2005
+.Dd January 13, 2009
.Dt KENV 1
.Os
.Sh NAME
@@ -67,8 +67,28 @@
.Fl q
option is set, warnings normally printed as a result of being unable to
perform the requested operation will be suppressed.
+.Pp
+Variables can be added to the kernel environment using the
+.Xr /boot/loader.conf
+file, or also statically compiled into the kernel using the statement
+.Pp
+.Dl Ic env Ar filename
+.Pp
+in the kernel config file.
+The file can contain lines of the form
+.Pp
+.Dl name = "value" # this is a comment
+.Pp
+where whitespace around name and '=', and
+everything after a '#' character, are ignored. Almost any printable
+character except '=' is acceptable as part of a name. Quotes
+are optional and necessary only if the value contains
+whitespace.
+.Pp
.Sh SEE ALSO
.Xr kenv 2 ,
+.Xr config 5 ,
+.Xr loader.conf 5 ,
.Xr loader 8
.Sh HISTORY
The
==== //depot/projects/mips2/src/bin/ln/ln.1#4 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ln.1 8.2 (Berkeley) 12/30/93
-.\" $FreeBSD: src/bin/ln/ln.1,v 1.33 2008/06/06 08:27:59 keramida Exp $
+.\" $FreeBSD: src/bin/ln/ln.1,v 1.34 2009/01/13 15:24:35 trhodes Exp $
.\"
.Dd June 6, 2008
.Dt LN 1
@@ -38,7 +38,7 @@
.Sh NAME
.Nm ln ,
.Nm link
-.Nd make links
+.Nd link files
.Sh SYNOPSIS
.Nm
.Op Fl s Op Fl F
@@ -57,8 +57,13 @@
.Sh DESCRIPTION
The
.Nm
-utility creates a new directory entry (linked file) which has the
-same modes as the original file.
+utility creates a new directory entry (linked file) for the file name
+specified by
+.Ar target_file .
+The
+.Ar target_file
+will be created with the same file modes as the
+.Ar source_file .
It is useful for maintaining multiple copies of a file in many places
at once without using up storage for the
.Dq copies ;
@@ -148,7 +153,7 @@
A hard link to a file is indistinguishable from the original directory entry;
any changes to a file are effectively independent of the name used to reference
the file.
-Hard links may not normally refer to directories and may not span file systems.
+Directories may not be hardlinked, and hard links may not span file systems.
.Pp
A symbolic link contains the name of the file to
which it is linked.
==== //depot/projects/mips2/src/contrib/ntp/ntpd/ntp_crypto.c#3 (text+ko) ====
@@ -1612,7 +1612,7 @@
*/
EVP_VerifyInit(&ctx, peer->digest);
EVP_VerifyUpdate(&ctx, (u_char *)&ep->tstamp, vallen + 12);
- if (!EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey))
+ if (EVP_VerifyFinal(&ctx, (u_char *)&ep->pkt[i], siglen, pkey) <= 0)
return (XEVNT_SIG);
if (peer->crypto & CRYPTO_FLAG_VRFY) {
==== //depot/projects/mips2/src/contrib/openbsm/INSTALL#2 (text) ====
@@ -9,6 +9,12 @@
./configure
make
+If doing development work on OpenBSM with gcc, the following invocation of
+configure may be preferred in order to generate full compiler warnings and
+force the compile to fail if a warning is found:
+
+ CFLAGS="-Wall -Werror" ./configure
+
To install, use:
make install
==== //depot/projects/mips2/src/contrib/openbsm/NEWS#2 (text) ====
@@ -1,5 +1,24 @@
OpenBSM Version History
+OpenBSM 1.1 alpha 5
+
+- Stub libauditd(3) man page added.
+- All BSM error number constants with BSM_ERRNO_.
+- Interfaces to convert between local and BSM socket types and protocol
+ families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3),
+ au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions
+ of constants in audit_domain.h and audit_socket_type.h. This improves
+ interoperability by converting local constant spaces, which vary by OS, to
+ and from Solaris constants (where available) or OpenBSM constants for
+ protocol domains not present in Solaris (a fair number). These routines
+ should be used when generating and interpreting extended socket tokens.
+- Fix build warnings with full gcc warnings enabled on most supported
+ platforms.
+- Don't compile error strings into bsm_errno.c when building it in the kernel
+ environment.
+- When started by launchd, use the label com.apple.auditd rather than
+ org.trustedbsd.auditd.
+
OpenBSM 1.1 alpha 4
- With the addition of BSM error number mapping, we also need to map the
@@ -393,4 +412,4 @@
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $
==== //depot/projects/mips2/src/contrib/openbsm/VERSION#7 (text) ====
@@ -1,1 +1,1 @@
-OPENBSM_1_1_ALPHA_4
+OPENBSM_1_1_ALPHA_5
==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.8#6 (text) ====
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $
.\"
.Dd December 11, 2008
.Dt AUDITD 8
@@ -115,6 +115,7 @@
.Nm .
.Sh SEE ALSO
.Xr asl 3 ,
+.Xr libauditd 3 ,
.Xr audit 4 ,
.Xr audit_class 5 ,
.Xr audit_control 5 ,
==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd.c#6 (text) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $
*/
#include <sys/types.h>
@@ -252,7 +252,7 @@
*/
err = auditd_read_dirs(audit_warn_soft, audit_warn_hard);
if (err) {
- auditd_log_err("auditd_read_dirs() %s: %m",
+ auditd_log_err("auditd_read_dirs(): %s",
auditd_strerror(err));
if (err == ADE_HARDLIM)
audit_warn_allhard();
==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_darwin.c#2 (text) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#2 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#3 $
*/
#include <sys/types.h>
@@ -83,7 +83,7 @@
#endif /* __BSM_INTERNAL_NOTIFY_KEY */
#ifndef __AUDIT_LAUNCHD_LABEL
-#define __AUDIT_LAUNCHD_LABEL "org.trustedbsd.auditd"
+#define __AUDIT_LAUNCHD_LABEL "com.apple.auditd"
#endif /* __AUDIT_LAUNCHD_LABEL */
#define MAX_MSG_SIZE 4096
@@ -100,7 +100,7 @@
if (debug)
opt = ASL_OPT_STDERR;
- au_aslclient = asl_open("auditd", "org.trustedbsd.auditd", opt);
+ au_aslclient = asl_open("auditd", "com.apple.auditd", opt);
au_aslmsg = asl_new(ASL_TYPE_MSG);
#ifdef ASL_KEY_READ_UID
==== //depot/projects/mips2/src/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 (text) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#2 $
*/
#include <sys/types.h>
@@ -35,9 +35,11 @@
#include <errno.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <signal.h>
+#include <string.h>
#include <syslog.h>
-#include <stdarg.h>
+#include <unistd.h>
#include <bsm/audit.h>
#include <bsm/audit_uevents.h>
==== //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#6 (text) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#31 $
*/
/*
@@ -41,6 +41,9 @@
*/
#include <config/config.h>
+
+#define _GNU_SOURCE /* Required for strptime() on glibc2. */
+
#ifdef HAVE_FULL_QUEUE_H
#include <sys/queue.h>
#else
==== //depot/projects/mips2/src/contrib/openbsm/bsm/auditd_lib.h#2 (text) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $
*/
#ifndef _BSM_AUDITD_LIB_H_
@@ -57,7 +57,7 @@
* Path of auditd plist file for launchd.
*/
#define AUDITD_PLIST_FILE \
- "/System/Library/LaunchDaemons/org.trustedbsd.auditd.plist"
+ "/System/Library/LaunchDaemons/com.apple.auditd.plist"
/*
* Error return codes for auditd_lib functions.
==== //depot/projects/mips2/src/contrib/openbsm/bsm/libbsm.h#5 (text) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#40 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $
*/
#ifndef _LIBBSM_H_
@@ -821,14 +821,22 @@
*/
void au_print_xml_header(FILE *outfp);
void au_print_xml_footer(FILE *outfp);
-__END_DECLS
/*
- * Functions relating to BSM<->errno conversion.
+ * BSM library routines for converting between local and BSM constant spaces.
+ * (Note: some of these are replicated in audit_record.h for the benefit of
+ * the FreeBSD and Mac OS X kernels)
*/
-int au_bsm_to_errno(u_char bsm_error, int *errorp);
-u_char au_errno_to_bsm(int error);
-const char *au_strerror(u_char bsm_error);
+int au_bsm_to_domain(u_short bsm_domain, int *local_domainp);
+int au_bsm_to_errno(u_char bsm_error, int *errorp);
+int au_bsm_to_socket_type(u_short bsm_socket_type,
+ int *local_socket_typep);
+u_short au_domain_to_bsm(int local_domain);
+u_char au_errno_to_bsm(int local_errno);
+u_short au_socket_type_to_bsm(int local_socket_type);
+
+const char *au_strerror(u_char bsm_error);
+__END_DECLS
/*
* The remaining APIs are associated with Apple's BSM implementation, in
==== //depot/projects/mips2/src/contrib/openbsm/configure#7 (text) ====
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4.
+# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5.
#
# Report bugs to <trustedbsd-audit at TrustesdBSD.org>.
#
@@ -729,8 +729,8 @@
# Identity of this package.
PACKAGE_NAME='OpenBSM'
PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.1alpha4'
-PACKAGE_STRING='OpenBSM 1.1alpha4'
+PACKAGE_VERSION='1.1alpha5'
+PACKAGE_STRING='OpenBSM 1.1alpha5'
PACKAGE_BUGREPORT='trustedbsd-audit at TrustesdBSD.org'
ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -1404,7 +1404,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1474,7 +1474,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";;
+ short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";;
esac
cat <<\_ACEOF
@@ -1580,7 +1580,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenBSM configure 1.1alpha4
+OpenBSM configure 1.1alpha5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenBSM $as_me 1.1alpha4, which was
+It was created by OpenBSM $as_me 1.1alpha5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -19076,7 +19076,7 @@
# Define the identity of the package.
PACKAGE=OpenBSM
- VERSION=1.1alpha4
+ VERSION=1.1alpha5
cat >>confdefs.h <<_ACEOF
@@ -23584,7 +23584,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenBSM $as_me 1.1alpha4, which was
+This file was extended by OpenBSM $as_me 1.1alpha5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23637,7 +23637,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-OpenBSM config.status 1.1alpha4
+OpenBSM config.status 1.1alpha5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
==== //depot/projects/mips2/src/contrib/openbsm/configure.ac#7 (text) ====
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $])
+AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit at TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADER([config/config.h])
==== //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.am#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $
#
if USE_NATIVE_INCLUDES
@@ -13,5 +13,5 @@
libauditd_la_SOURCES = \
auditd_lib.c
-#man3_MANS = \
-# libauditd.3
+man3_MANS = \
+ libauditd.3
==== //depot/projects/mips2/src/contrib/openbsm/libauditd/Makefile.in#2 (text) ====
@@ -15,7 +15,7 @@
@SET_MAKE@
#
-# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $
+# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $
#
VPATH = @srcdir@
@@ -51,7 +51,7 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libauditd_la_LIBADD =
@@ -71,6 +71,9 @@
$(LDFLAGS) -o $@
SOURCES = $(libauditd_la_SOURCES)
DIST_SOURCES = $(libauditd_la_SOURCES)
+man3dir = $(mandir)/man3
+NROFF = nroff
+MANS = $(man3_MANS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -188,6 +191,9 @@
libauditd_la_SOURCES = \
auditd_lib.c
+man3_MANS = \
+ libauditd.3
+
all: all-am
.SUFFIXES:
@@ -285,6 +291,51 @@
clean-libtool:
-rm -rf .libs _libs
+install-man3: $(man3_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
+uninstall-man3:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.3*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+ *) ext='3' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -362,9 +413,9 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(MANS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -412,7 +463,7 @@
info-am:
-install-data-am:
+install-data-am: install-man
install-dvi: install-dvi-am
@@ -422,7 +473,7 @@
install-info: install-info-am
-install-man:
+install-man: install-man3
install-pdf: install-pdf-am
@@ -448,7 +499,9 @@
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am: uninstall-libLTLIBRARIES uninstall-man
+
+uninstall-man: uninstall-man3
.MAKE: install-am install-strip
@@ -459,16 +512,14 @@
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-libLTLIBRARIES install-man install-man3 install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libLTLIBRARIES
-
+ tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ uninstall-man uninstall-man3
-#man3_MANS = \
-# libauditd.3
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
==== //depot/projects/mips2/src/contrib/openbsm/libauditd/auditd_lib.c#2 (text) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $
*/
#include <sys/param.h>
@@ -823,7 +823,7 @@
*/
if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0)
return (-1);
- if (cond == AUC_DISABLED)
+ if (cond == AUC_NOAUDIT)
return (0);
/*
==== //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.am#3 (text) ====
@@ -1,5 +1,5 @@
#
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list