Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Sep 2005 03:56:26 GMT
From:      Scott Long <scottl@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 84324 for review
Message-ID:  <200509270356.j8R3uQe8052732@repoman.freebsd.org>

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

Change 84324 by scottl@scottl-junior on 2005/09/27 03:55:56

	IFC

Affected files ...

.. //depot/projects/soc2005/ufsj/src/bin/csh/config_p.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/smb_lib.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/mbuf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb_name.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/rap.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/contrib/smbfs/smbutil/view.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/geli#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/kerberos#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/localpkg#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/mountd#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/pf#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.d/pflog#2 integrate
.. //depot/projects/soc2005/ufsj/src/etc/rc.initdiskless#3 integrate
.. //depot/projects/soc2005/ufsj/src/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/soc2005/ufsj/src/gnu/lib/libstdc++/config.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive.h.in#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_entry.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_private.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read.3#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_data_into_fd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_open_fd.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_open_file.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_read_support_format_zip.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_util.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_write.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_write_set_format_cpio.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_write_set_format_pax.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libc/gen/getcwd.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libc/stdio/fgetwln.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_exec/pam_exec.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_ssh/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_ssh/pam_ssh.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpthread/thread/thr_init.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libpthread/thread/thr_kern.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libufs/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/lib/libutil/pidfile.3#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/msun/bsdsrc/b_log.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/msun/bsdsrc/b_tgamma.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/lib/msun/bsdsrc/mathimpl.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/soc2005/ufsj/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate
.. //depot/projects/soc2005/ufsj/src/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/bsdlabel/bsdlabel.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/fdisk/fdisk.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/fdisk_pc98/fdisk.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/init/init.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/init/init.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/kldstat/kldstat.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/route/route.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sbin/sysctl/sysctl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/cdce.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ed.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/esp.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ip.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/fe.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/man4.i386/lnc.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/sn.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/snp.4#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/ural.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man4/vr.4#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man5/passwd.5#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/VFS_LOCK_GIANT.9#1 branch
.. //depot/projects/soc2005/ufsj/src/share/man/man9/make_dev.9#2 integrate
.. //depot/projects/soc2005/ufsj/src/share/man/man9/namei.9#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/busdma_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/sgmap.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/alpha/trap.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/conf/GENERIC#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/alpha/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/include/chipset.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/include/pmap.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/isa/isa.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/mcbus/mcpcia.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_ioctl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_misc.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/apecs.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/cia.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/irongate.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/lca.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/t2.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/tsunami.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/pci/tsunami_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/alpha/tlsb/dwlpx.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/mptable_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/amd64/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/sa11x0/sa11x0.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/iq80321.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/arm/xscale/i80321/obiovar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/common/help.common#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/common/loader.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/efi/libefi/bootinfo.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/i386/libi386/bootinfo.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/i386/libi386/libi386.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/ia64/ski/bootinfo.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/powerpc/loader/metadata.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/boot/sparc64/loader/metadata.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ioctl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ipc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_signal.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_stream.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_termios.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_ttold.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/compat/svr4/svr4_util.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/NOTES#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/files#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/files.i386#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/files.pc98#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/kmod.mk#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/conf/options#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/contrib/dev/oltr/if_oltr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic/aic_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/awi/if_awi_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cm/if_cm_isa.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/cs/if_cs_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_ed_pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ed/if_edvar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/en/if_en_pci.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ep/if_ep.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ex/if_ex.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/exca/exca.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fe/if_fe_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/hatm/if_hatm_intr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ie/if_ie.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ieee488/pcii.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ieee488/tnt4882.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/ieee488/upd7210.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ieee488/upd7210.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips_commands.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ips/ips_ioctl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwireg.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwivar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ixgb/if_ixgb.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/joy/joy_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/lnc/if_lnc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/md/md.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/nge/if_nge.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/nsp/nsp_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/nve/if_nve.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/patm/if_patm_rx.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/card_if.m#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccard_cis.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccard_device.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccardvar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccard/pccardvarp.h#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ral/if_ral.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ral/if_ral_pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/ray/if_ray.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sbsh/if_sbsh.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sio/sio_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sn/if_sn.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sn/if_snreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sn/if_snvar.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/snc/if_snc_pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/tx/if_tx.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/txp/if_txp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/uart/uart_bus_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/ehcireg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_aue.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_cdce.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_cdcereg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_cue.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_rue.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/usb/uvscom.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/vge/if_vge.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/wl/if_wl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/dev/xe/if_xe_pccard.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs_devs.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs_rule.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs_vfsops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_ctl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_gpt.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_io.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/geom/geom_slice.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/mptable_pci.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/i386/vm86.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/include/pcb_ext.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ia64/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/ia64/ia64/unaligned.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_acl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_event.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_tc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_pcpu.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_prf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/uipc_socket2.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/agp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/geom/geom_bsd/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/pccard/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_ppp.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_sl.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/route.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/in.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/in.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_fastfwd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet/udp_usrreq.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pccard/mecia.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pccard.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pccard_beep.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pccard_nbk.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pcic.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pcic_isa.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pccard/pcic_pci.c#2 delete
.. //depot/projects/soc2005/ufsj/src/sys/pci/agp_ati.c#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/agpreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_dc.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_pcn.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sf.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sis.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sisreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_sk.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_ste.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_ti.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_tl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_tlreg.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_vr.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_wb.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/pci/if_xl.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/powerpc/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/powerpc/include/atomic.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/rpc/rpcclnt.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac/mac_vfs.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_none/mac_none.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_partition/mac_partition.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sparc64/conf/MAC#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/sys/bus.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/conf.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/mchain.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/proc.h#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/rman.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/snoop.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/socket.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/types.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/sys/uuid.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/sys/tools/bus_macro.sh#1 branch
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufs_inode.c#4 integrate
.. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufs_vnops.c#5 edit
.. //depot/projects/soc2005/ufsj/src/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_gpt/gctl.t#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/geom_gpt/test.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/sockets/listen_backlog/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/sockets/listen_backlog/listen_backlog.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/sockets/shutdown/shutdown.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/regression/ufs/uprintf/Makefile#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/regression/ufs/uprintf/ufs_uprintf.c#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/README#3 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/NET4801#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/comconsole#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/default#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/files#3 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/nobeastie#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Customize/pkgs#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Files/root/change_password#3 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Files/root/save_sshkeys#3 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Files/root/updatep#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Files/root/updatep1#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Files/root/updatep2#2 integrate
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/FlashDevice.sub#1 branch
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/Makefile#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/customize.sh#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/i386.diskimage#3 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/localfiles#2 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/make.conf#3 delete
.. //depot/projects/soc2005/ufsj/src/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/calendar/calendars/calendar.birthday#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/finger/extern.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/finger/finger.1#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/finger/finger.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/finger/util.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/Makefile#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/hash_tables.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/make.1#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/make/parse.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/netstat/bpf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/sed/main.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/tar/bsdtar_platform.h#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/tar/configure.ac.in#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/tar/getdate.y#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/tar/write.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.bin/vgrind/tmac.vgrind#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/asf/asf.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/cron/cron/cron.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/inetd/inetd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/mountd/mountd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/moused/moused.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/moused/moused.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/pkg_install/info/show.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/pkg_install/lib/match.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/portsnap/make_index/make_index.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/portsnap/phttpget/phttpget.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/powerd/powerd.8#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/powerd/powerd.c#3 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/ppp/ppp.8.m4#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/watch/watch.c#2 integrate
.. //depot/projects/soc2005/ufsj/src/usr.sbin/watchdogd/watchdogd.c#3 integrate

Differences ...

==== //depot/projects/soc2005/ufsj/src/bin/csh/config_p.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/bin/csh/config_p.h,v 1.11 2005/04/24 19:51:57 mp Exp $ */
+/* $FreeBSD: src/bin/csh/config_p.h,v 1.12 2005/09/22 18:32:53 mp Exp $ */
 /*
  * config.h -- configure various defines for tcsh
  *
@@ -98,6 +98,7 @@
 #define SYSMALLOC
 /* Use LC_MESSAGES locale category to open the message catalog */
 #define MCLoadBySet NL_CAT_LOCALE
+#define BUFSIZE 8192
 #endif
 
 #if defined(__bsdi__)

==== //depot/projects/soc2005/ufsj/src/contrib/smbfs/include/netsmb/smb_lib.h#2 (text+ko) ====

@@ -30,6 +30,7 @@
  * SUCH DAMAGE.
  *
  * $Id: smb_lib.h,v 1.24 2001/12/20 15:19:43 bp Exp $
+ * $FreeBSD: src/contrib/smbfs/include/netsmb/smb_lib.h,v 1.2 2005/09/19 08:11:04 imura Exp $
  */
 #ifndef _NETSMB_SMB_LIB_H_
 #define _NETSMB_SMB_LIB_H_
@@ -79,20 +80,16 @@
 #define setdbe(buf,ofs,val) getdle(buf,ofs)=htonl(val)
 
 #else	/* (BYTE_ORDER == LITTLE_ENDIAN) */
-#error "Macros for Big-Endians are incomplete"
-#define getwle(buf,ofs) ((u_int16_t)(getb(buf, ofs) | (getb(buf, ofs + 1) << 8)))
-#define getdle(buf,ofs) ((u_int32_t)(getb(buf, ofs) | \
-				    (getb(buf, ofs + 1) << 8) | \
-				    (getb(buf, ofs + 2) << 16) | \
-				    (getb(buf, ofs + 3) << 24)))
-#define getwbe(buf,ofs) (*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))
-#define getdbe(buf,ofs) (*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))
-/*
-#define setwle(buf,ofs,val) getwle(buf,ofs)=val
-#define setdle(buf,ofs,val) getdle(buf,ofs)=val
-*/
-#define setwbe(buf,ofs,val) getwle(buf,ofs)=val
-#define setdbe(buf,ofs,val) getdle(buf,ofs)=val
+
+#define getwbe(buf,ofs)	(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))
+#define getdbe(buf,ofs)	(*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))
+#define getwle(buf,ofs)	(bswap16(getwbe(buf,ofs)))
+#define getdle(buf,ofs)	(bswap32(getdbe(buf,ofs)))
+
+#define setwbe(buf,ofs,val) getwbe(buf,ofs)=val
+#define setwle(buf,ofs,val) getwbe(buf,ofs)=bswap16(val)
+#define setdbe(buf,ofs,val) getdbe(buf,ofs)=val
+#define setdle(buf,ofs,val) getdbe(buf,ofs)=bswap32(val)
 
 #endif	/* (BYTE_ORDER == LITTLE_ENDIAN) */
 

==== //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/mbuf.c#2 (text+ko) ====

@@ -33,10 +33,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.2 2004/10/19 17:44:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.3 2005/09/19 08:07:18 imura Exp $");
 
 #include <sys/types.h>
-#include <sys/mchain.h>
+#include <sys/endian.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
@@ -268,7 +268,7 @@
 mb_put_int64be(struct mbdata *mbp, int64_t x)
 {
 	MB_PUT(int64_t);
-	*p = htobeq(x);
+	*p = htobe64(x);
 	return 0;
 }
 
@@ -276,7 +276,7 @@
 mb_put_int64le(struct mbdata *mbp, int64_t x)
 {
 	MB_PUT(int64_t);
-	*p = htoleq(x);
+	*p = htole64(x);
 	return 0;
 }
 
@@ -367,7 +367,7 @@
 	u_int16_t v;
 	int error = mb_get_uint16(mbp, &v);
 
-	*x = letohs(v);
+	*x = le16toh(v);
 	return error;
 }
 
@@ -376,7 +376,7 @@
 	u_int16_t v;
 	int error = mb_get_uint16(mbp, &v);
 
-	*x = betohs(v);
+	*x = be16toh(v);
 	return error;
 }
 
@@ -393,7 +393,7 @@
 	int error;
 
 	error = mb_get_uint32(mbp, &v);
-	*x = betohl(v);
+	*x = be32toh(v);
 	return error;
 }
 
@@ -404,7 +404,7 @@
 	int error;
 
 	error = mb_get_uint32(mbp, &v);
-	*x = letohl(v);
+	*x = le32toh(v);
 	return error;
 }
 
@@ -421,7 +421,7 @@
 	int error;
 
 	error = mb_get_int64(mbp, &v);
-	*x = betohq(v);
+	*x = be64toh(v);
 	return error;
 }
 
@@ -432,7 +432,7 @@
 	int error;
 
 	error = mb_get_int64(mbp, &v);
-	*x = letohq(v);
+	*x = le64toh(v);
 	return error;
 }
 

==== //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/nb_name.c#2 (text+ko) ====

@@ -31,9 +31,13 @@
  *
  * $Id: nb_name.c,v 1.2 2001/08/22 03:31:36 bp Exp $
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
+
 #include <sys/param.h>
+#include <sys/endian.h>
 #include <sys/socket.h>
-#include <sys/mchain.h>		/* for endiand macros */
 
 #include <ctype.h>
 #include <err.h>
@@ -139,7 +143,7 @@
 	return len;
 }
 
-#define	NBENCODE(c)	(htoles((u_short)(((u_char)(c) >> 4) | \
+#define	NBENCODE(c)	(htole16((u_short)(((u_char)(c) >> 4) | \
 			 (((u_char)(c) & 0xf) << 8)) + 0x4141))
 
 static void

==== //depot/projects/soc2005/ufsj/src/contrib/smbfs/lib/smb/rap.c#2 (text+ko) ====

@@ -30,11 +30,12 @@
  * SUCH DAMAGE.
  *
  * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.4 2004/06/19 19:03:01 le Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.5 2005/09/19 08:07:18 imura Exp $
  *
  * This is very simple implementation of RAP protocol.
  */
 #include <sys/param.h>
+#include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -45,8 +46,6 @@
 #include <stdlib.h>
 #include <sysexits.h>
 
-#include <sys/mchain.h>
-
 #include <netsmb/smb_lib.h>
 #include <netsmb/smb_conn.h>
 #include <netsmb/smb_rap.h>
@@ -290,7 +289,7 @@
 		return error;
 	switch (ptype) {
 	    case 'h':
-		*value = letohs(*(u_int16_t*)rap->r_npbuf);
+		*value = le16toh(*(u_int16_t*)rap->r_npbuf);
 		break;
 	    default:
 		return EINVAL;
@@ -320,8 +319,8 @@
 	if (error)
 		return error;
 	rp = (u_int16_t*)rap->r_pbuf;
-	rap->r_result = letohs(*rp++);
-	conv = letohs(*rp++);
+	rap->r_result = le16toh(*rp++);
+	conv = le16toh(*rp++);
 	rap->r_npbuf = (char*)rp;
 	rap->r_entries = entries = 0;
 	done = 0;
@@ -329,7 +328,7 @@
 		ptype = *p;
 		switch (ptype) {
 		    case 'e':
-			rap->r_entries = entries = letohs(*(u_int16_t*)rap->r_npbuf);
+			rap->r_entries = entries = le16toh(*(u_int16_t*)rap->r_npbuf);
 			rap->r_npbuf += 2;
 			p++;
 			break;

==== //depot/projects/soc2005/ufsj/src/contrib/smbfs/smbutil/view.c#2 (text+ko) ====

@@ -31,6 +31,11 @@
  *
  * $Id: view.c,v 1.9 2002/02/20 09:26:42 bp Exp $
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/view.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
+
+#include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
@@ -44,8 +49,6 @@
 
 #include <cflib.h>
 
-#include <sys/mchain.h>
-
 #include <netsmb/smb_lib.h>
 #include <netsmb/smb_conn.h>
 #include <netsmb/smb_rap.h>
@@ -113,7 +116,7 @@
 		exit(1);
 	}
 	for (ep = rpbuf, i = 0; i < entries; i++, ep++) {
-		type = letohs(ep->shi1_type);
+		type = le16toh(ep->shi1_type);
 
 		cp = (char*)rpbuf + ep->shi1_remark;
 		printf("%-12s %-10s %s\n", ep->shi1_netname,

==== //depot/projects/soc2005/ufsj/src/etc/defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.259 2005/08/24 16:25:47 yar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.260 2005/09/20 11:13:27 rwatson Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -197,6 +197,7 @@
 #
 kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
 kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
+kerberos5_server_flags=""	# Additional flags to the kerberos 5 server
 kadmind5_server_enable="NO"	# Run kadmind (or NO)
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.55 2005/08/14 18:25:35 pjd Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.56 2005/09/23 16:54:09 wollman Exp $
 
 FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	abi accounting addswap adjkerntz amd \
@@ -31,7 +31,7 @@
 	ramdisk ramdisk-own random rarpd rcconf.sh resolv root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore securelevel sendmail \
-	serial sppp sshd swap1 \
+	serial sppp swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw usbd \
@@ -39,6 +39,11 @@
 	watchdogd wpa_supplicant \
 	ypbind yppasswdd ypserv \
 	ypset ypupdated ypxfrd
+
+.if !defined(NO_OPENSSH)
+FILES+=	sshd
+.endif
+
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/geli#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/geli,v 1.2 2005/08/14 22:16:34 pjd Exp $
+# $FreeBSD: src/etc/rc.d/geli,v 1.3 2005/09/23 23:53:35 pjd Exp $
 #
 
 # PROVIDE: disks
@@ -46,10 +46,7 @@
 		return
 	fi
 
-	geli load >/dev/null 2>&1
-	if ! kldstat -m g_eli >/dev/null 2>&1; then
-		err 1 'geom_eli module failed to load.'
-	fi
+	kldstat -q -m g_eli || geli load || err 1 'geom_eli module failed to load.'
 
 	if [ -z "${geli_tries}" ]; then
 		if [ -n "${geli_attach_attempts}" ]; then

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/kerberos#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/kerberos,v 1.4 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.5 2005/09/20 11:13:28 rwatson Exp $
 #
 
 # PROVIDE: kerberos
@@ -12,6 +12,6 @@
 load_rc_config $name
 rcvar="kerberos5_server_enable"
 command="${kerberos5_server}"
-command_args="&"
+command_args="${kerberos5_server_flags} &"
 
 run_rc_command "$1"

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/localpkg#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/localpkg,v 1.5 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/localpkg,v 1.6 2005/09/27 02:05:55 brooks Exp $
 #
 
 # PROVIDE: localpkg
@@ -53,13 +53,12 @@
 
 pkg_stop()
 {
-	echo -n 'Shutting down daemon processes:'
-
 	# For each dir in $local_startup, search for init scripts matching *.sh
 	case ${local_startup} in
 	[Nn][Oo] | '')
 		;;
 	*)
+		echo -n 'Shutting down daemon processes:'
 		slist=""
 		if [ -z "${script_name_sep}" ]; then
 			script_name_sep=" "

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/mountd#2 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $
-# $FreeBSD: src/etc/rc.d/mountd,v 1.15 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountd,v 1.16 2005/09/18 17:04:26 rodrigc Exp $
 #
 
 # PROVIDE: mountd
@@ -29,11 +29,11 @@
 	#
 	if checkyesno nfs_server_enable ; then
 		if checkyesno weak_mountd_authentication; then
-			mountd_flags="${mountd_flags} -n"
+			rc_flags="${mountd_flags} -n"
 		fi
 	else
 		if checkyesno mountd_enable; then
-			checkyesno weak_mountd_authentication && mountd_flags="-n"
+			checkyesno weak_mountd_authentication && rc_flags="-n"
 		fi
 	fi
 	rm -f /var/db/mountdtab

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/pf#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/pf,v 1.7 2005/04/04 23:06:10 seanc Exp $
+# $FreeBSD: src/etc/rc.d/pf,v 1.8 2005/09/24 15:57:17 pjd Exp $
 #
 
 # PROVIDE: pf
@@ -30,8 +30,8 @@
 pf_prestart()
 {
 	# load pf kernel module if needed
-	if ! kldstat -v | grep -q pf\$; then
-		if kldload pf; then
+	if ! kldstat -q -m pf ; then
+		if kldload pf ; then
 			info 'pf module loaded.'
 		else
 			err 1 'pf module failed to load.'
@@ -84,10 +84,7 @@
 pf_resync()
 {
 	# Don't resync if pf is not loaded
-	if ! kldstat -v | grep -q pf\$ ; then
-		 return
-	fi
-	${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags}
+	kldstat -q -m pf && ${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags}
 }
 
 pf_status()

==== //depot/projects/soc2005/ufsj/src/etc/rc.d/pflog#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/pflog,v 1.5 2005/01/16 03:12:03 obrien Exp $
+# $FreeBSD: src/etc/rc.d/pflog,v 1.6 2005/09/24 15:57:17 pjd Exp $
 #
 
 # PROVIDE: pflog
@@ -26,7 +26,7 @@
 pflog_prestart()
 {
 	# load pflog kernel module if needed
-	if ! kldstat -v | grep -q pflog\$; then
+	if ! kldstat -q -m pflog; then
 		if kldload pf; then
 			info 'pflog module loaded.'
 		else

==== //depot/projects/soc2005/ufsj/src/etc/rc.initdiskless#3 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.initdiskless,v 1.44 2005/08/28 18:48:04 bmah Exp $
+# $FreeBSD: src/etc/rc.initdiskless,v 1.45 2005/09/15 16:09:28 rwatson Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
@@ -191,7 +191,7 @@
 	    fi
 	done
 	# Get the values passed with the T134 bootp cookie.
-	class="`/sbin/sysctl -n kern.bootp_cookie`"
+	class="`/sbin/sysctl -qn kern.bootp_cookie`"
 
 	echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca} ${class}"
 fi

==== //depot/projects/soc2005/ufsj/src/games/fortune/datfiles/fortunes#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.190 2005/09/10 08:27:07 schweikh Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.192 2005/09/23 12:15:52 krion Exp $
 
 %
 =======================================================================
@@ -1106,7 +1106,7 @@
 %
 	A novel approach is to remove all power from the system, which
 removes most system overhead so that resources can be fully devoted to
-doing nothing.  Benchmarks on  this technique are promising; tremendous
+doing nothing.  Benchmarks on this technique are promising; tremendous
 amounts of nothing can be produced in this manner.  Certain hardware
 limitations can limit the speed of this method, especially in the
 larger systems which require a more involved & less efficient
@@ -1904,7 +1904,7 @@
 and waist, that it is almost impossible to reach one's shoelaces.  And the
 sizes don't run the way they used to.  The 12's and 14's are so much smaller.
 	Even people are changing.  They are so much younger than they used to
-be when I was their age.  On  the other hand people my age are so much older
+be when I was their age.  On the other hand people my age are so much older
 than I am.
 	I ran into an old classmate the other day and she has aged so much
 that she didn't recognize me.
@@ -2227,7 +2227,7 @@
 	"How many people work here?"
 	"Oh, about half."
 %
-	How many seconds are there in a year?  If I tell you there  are
+	How many seconds are there in a year?  If I tell you there are
 3.155  x  10^7, you won't even try to remember it.  On the other hand, who
 could forget that, to within half a percent, pi seconds is a nanocentury.
 		-- Tom Duff, Bell Labs
@@ -3040,7 +3040,7 @@
 	Never ask if your lover has had therapy.  Only people who have had
 therapy ask if people have had therapy.
 	Don't ask about plaster casts of male sex organs marked JIMI, JIM, etc.
-Assume that she bought them at a flea  market.

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



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