PERFORCE change 109248 for review

Sam Leffler sam at FreeBSD.org
Sun Nov 5 00:02:25 UTC 2006


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

Change 109248 by sam at sam_ebb on 2006/11/05 00:01:41

	IFC @ 109247
	Approved by:	cognet

Affected files ...

.. //depot/projects/arm/src/Makefile#7 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#9 integrate
.. //depot/projects/arm/src/UPDATING#6 integrate
.. //depot/projects/arm/src/bin/cp/cp.1#5 integrate
.. //depot/projects/arm/src/bin/rm/rm.1#2 integrate
.. //depot/projects/arm/src/bin/rm/rm.c#3 integrate
.. //depot/projects/arm/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate
.. //depot/projects/arm/src/contrib/bsnmp/snmpd/action.c#2 integrate
.. //depot/projects/arm/src/contrib/bsnmp/snmpd/tree.def#2 integrate
.. //depot/projects/arm/src/contrib/gcc/function.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/arm/src/etc/defaults/rc.conf#8 integrate
.. //depot/projects/arm/src/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/arm/src/etc/network.subr#5 integrate
.. //depot/projects/arm/src/etc/rc.d/ppp#2 integrate
.. //depot/projects/arm/src/etc/rc.firewall#2 integrate
.. //depot/projects/arm/src/etc/snmpd.config#2 integrate
.. //depot/projects/arm/src/games/fortune/datfiles/fortunes#7 integrate
.. //depot/projects/arm/src/gnu/usr.bin/send-pr/send-pr.sh#2 integrate
.. //depot/projects/arm/src/include/Makefile#5 integrate
.. //depot/projects/arm/src/lib/libc/gmon/Makefile.inc#2 integrate
.. //depot/projects/arm/src/lib/libc/net/inet.3#2 integrate
.. //depot/projects/arm/src/lib/libc/sparc64/sys/Makefile.inc#2 integrate
.. //depot/projects/arm/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 integrate
.. //depot/projects/arm/src/lib/libc/sys/getpid.2#2 integrate
.. //depot/projects/arm/src/lib/libc/sys/statfs.2#2 integrate
.. //depot/projects/arm/src/lib/libcam/camlib.c#2 integrate
.. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/arm/src/lib/libtacplus/libtacplus.3#2 integrate
.. //depot/projects/arm/src/lib/libufs/Makefile#2 integrate
.. //depot/projects/arm/src/lib/libufs/cgread.3#2 integrate
.. //depot/projects/arm/src/lib/libufs/cgroup.c#2 integrate
.. //depot/projects/arm/src/lib/libufs/libufs.3#2 integrate
.. //depot/projects/arm/src/lib/libufs/libufs.h#2 integrate
.. //depot/projects/arm/src/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/arm/src/sbin/dumpfs/dumpfs.c#2 integrate
.. //depot/projects/arm/src/sbin/dumpon/dumpon.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/fsck.h#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/fsutil.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/gjournal.c#1 branch
.. //depot/projects/arm/src/sbin/fsck_ffs/inode.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/main.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/pass5.c#2 integrate
.. //depot/projects/arm/src/sbin/fsck_ffs/setup.c#2 integrate
.. //depot/projects/arm/src/sbin/fsdb/fsdb.c#3 integrate
.. //depot/projects/arm/src/sbin/fsdb/fsdb.h#2 integrate
.. //depot/projects/arm/src/sbin/geom/class/Makefile#3 integrate
.. //depot/projects/arm/src/sbin/geom/class/cache/geom_cache.c#2 integrate
.. //depot/projects/arm/src/sbin/geom/class/journal/Makefile#1 branch
.. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal.c#1 branch
.. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal.h#1 branch
.. //depot/projects/arm/src/sbin/geom/class/journal/geom_journal_ufs.c#1 branch
.. //depot/projects/arm/src/sbin/geom/class/mirror/geom_mirror.c#4 integrate
.. //depot/projects/arm/src/sbin/geom/class/mirror/gmirror.8#3 integrate
.. //depot/projects/arm/src/sbin/geom/class/raid3/geom_raid3.c#4 integrate
.. //depot/projects/arm/src/sbin/geom/class/raid3/graid3.8#2 integrate
.. //depot/projects/arm/src/sbin/ggate/shared/ggate.c#2 integrate
.. //depot/projects/arm/src/sbin/growfs/debug.c#2 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifbridge.c#2 integrate
.. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/arm/src/sbin/mdmfs/mdmfs.8#4 integrate
.. //depot/projects/arm/src/sbin/mdmfs/mdmfs.c#2 integrate
.. //depot/projects/arm/src/sbin/mount/mount.c#3 integrate
.. //depot/projects/arm/src/sbin/newfs/mkfs.c#3 integrate
.. //depot/projects/arm/src/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/arm/src/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/arm/src/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/arm/src/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/arm/src/sbin/tunefs/tunefs.c#2 integrate
.. //depot/projects/arm/src/share/man/man3/pthread_create.3#3 integrate
.. //depot/projects/arm/src/share/man/man4/aac.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/ddb.4#5 integrate
.. //depot/projects/arm/src/share/man/man4/fdc.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/man4.i386/acpi_sony.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/sis.4#4 integrate
.. //depot/projects/arm/src/share/man/man5/elf.5#2 integrate
.. //depot/projects/arm/src/share/man/man5/fs.5#2 integrate
.. //depot/projects/arm/src/share/man/man9/disk.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/g_bio.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/kobj.9#2 integrate
.. //depot/projects/arm/src/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/arm/src/share/misc/usb_hid_usages#2 integrate
.. //depot/projects/arm/src/share/mk/bsd.lib.mk#5 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#5 integrate
.. //depot/projects/arm/src/share/snmp/mibs/FREEBSD-MIB.txt#2 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#3 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#15 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/trap.c#13 integrate
.. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#6 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/arm/src/sys/amd64/include/asmacros.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/include/profile.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#15 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#15 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#15 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate
.. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#15 integrate
.. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#14 integrate
.. //depot/projects/arm/src/sys/arm/arm/genassym.c#4 integrate
.. //depot/projects/arm/src/sys/arm/arm/nexus.c#4 integrate
.. //depot/projects/arm/src/sys/arm/arm/trap.c#13 integrate
.. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#8 integrate
.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#62 integrate
.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#38 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.at91#4 integrate
.. //depot/projects/arm/src/sys/arm/at91/std.kb920x#6 integrate
.. //depot/projects/arm/src/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/arm/src/sys/arm/conf/IQ31244#5 integrate
.. //depot/projects/arm/src/sys/arm/conf/KB920X#40 integrate
.. //depot/projects/arm/src/sys/arm/conf/SIMICS#5 integrate
.. //depot/projects/arm/src/sys/arm/conf/SKYEYE#7 integrate
.. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#7 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate
.. //depot/projects/arm/src/sys/boot/common/Makefile.inc#3 integrate
.. //depot/projects/arm/src/sys/boot/common/bootstrap.h#3 integrate
.. //depot/projects/arm/src/sys/boot/common/devopen.c#2 integrate
.. //depot/projects/arm/src/sys/boot/common/load_elf.c#4 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efi.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efi_nii.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efiapi.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/eficon.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efidebug.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efidef.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efidevp.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efierr.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efifs.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efilib.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efinet.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efipart.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efiprot.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efipxebc.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efiser.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/efistdarg.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/i386/efibind.h#3 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/i386/pe.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/ia64/efibind.h#4 integrate
.. //depot/projects/arm/src/sys/boot/efi/include/ia64/pe.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/devicename.c#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/efiboot.h#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/efifs.c#2 integrate
.. //depot/projects/arm/src/sys/boot/efi/libefi/libefi.c#2 integrate
.. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/bioscd.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/biosdisk.c#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/bootinfo32.c#2 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/devicename.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/elf64_freebsd.c#3 integrate
.. //depot/projects/arm/src/sys/boot/i386/libi386/libi386.h#7 integrate
.. //depot/projects/arm/src/sys/boot/i386/loader/Makefile#4 integrate
.. //depot/projects/arm/src/sys/boot/i386/loader/main.c#6 integrate
.. //depot/projects/arm/src/sys/boot/ia64/common/bootinfo.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/common/copy.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/common/devicename.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/common/exec.c#1 branch
.. //depot/projects/arm/src/sys/boot/ia64/efi/main.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/devicename.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/libski.h#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/ski/main.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ofw/common/main.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ofw/libofw/libofw.h#3 integrate
.. //depot/projects/arm/src/sys/boot/pc98/boot2/boot.c#3 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate
.. //depot/projects/arm/src/sys/boot/pc98/loader/Makefile#4 integrate
.. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#5 integrate
.. //depot/projects/arm/src/sys/boot/sparc64/loader/main.c#3 integrate
.. //depot/projects/arm/src/sys/cam/cam_ccb.h#5 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#10 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#4 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#13 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#3 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#20 integrate
.. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#11 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_aio.c#2 delete
.. //depot/projects/arm/src/sys/compat/linux/linux_aio.h#2 delete
.. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#6 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_emul.h#3 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#16 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_misc.h#1 branch
.. //depot/projects/arm/src/sys/conf/NOTES#36 integrate
.. //depot/projects/arm/src/sys/conf/files#51 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#19 integrate
.. //depot/projects/arm/src/sys/conf/files.i386#21 integrate
.. //depot/projects/arm/src/sys/conf/files.pc98#12 integrate
.. //depot/projects/arm/src/sys/conf/files.sparc64#8 integrate
.. //depot/projects/arm/src/sys/conf/kern.post.mk#13 integrate
.. //depot/projects/arm/src/sys/conf/kern.pre.mk#8 integrate
.. //depot/projects/arm/src/sys/conf/options#32 integrate
.. //depot/projects/arm/src/sys/conf/options.sparc64#3 integrate
.. //depot/projects/arm/src/sys/ddb/db_command.c#8 integrate
.. //depot/projects/arm/src/sys/ddb/db_ps.c#5 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_aiboost.c#1 branch
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_sony.c#4 integrate
.. //depot/projects/arm/src/sys/dev/advansys/advansys.c#4 integrate
.. //depot/projects/arm/src/sys/dev/advansys/advlib.c#4 integrate
.. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aha/aha.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ahb/ahb.c#4 integrate
.. //depot/projects/arm/src/sys/dev/aic/aic.c#3 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate
.. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate
.. //depot/projects/arm/src/sys/dev/amd/amd.c#4 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr.c#12 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr_cam.c#4 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr_disk.c#4 integrate
.. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#5 integrate
.. //depot/projects/arm/src/sys/dev/asr/asr.c#9 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#10 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#13 integrate
.. //depot/projects/arm/src/sys/dev/ata/atapi-cam.c#4 integrate
.. //depot/projects/arm/src/sys/dev/atkbdc/atkbd.c#4 integrate
.. //depot/projects/arm/src/sys/dev/bce/if_bce.c#10 integrate
.. //depot/projects/arm/src/sys/dev/buslogic/bt.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ciss/ciss.c#9 integrate
.. //depot/projects/arm/src/sys/dev/dc/if_dc.c#10 integrate
.. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#5 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#31 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.h#12 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#9 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#8 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#6 integrate
.. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#5 integrate
.. //depot/projects/arm/src/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/iir/iir.c#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp.c#12 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#16 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#13 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_library.c#6 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_library.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#15 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#9 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_stds.h#1 branch
.. //depot/projects/arm/src/sys/dev/isp/isp_target.c#8 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_target.h#6 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#7 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#7 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispreg.h#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispvar.h#11 integrate
.. //depot/projects/arm/src/sys/dev/ispfw/asm_2300.h#3 integrate
.. //depot/projects/arm/src/sys/dev/md/md.c#7 integrate
.. //depot/projects/arm/src/sys/dev/mly/mly.c#4 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#25 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#9 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#6 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcivar.h#7 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#11 integrate
.. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#7 integrate
.. //depot/projects/arm/src/sys/dev/trm/trm.c#5 integrate
.. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#3 integrate
.. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.c#5 integrate
.. //depot/projects/arm/src/sys/dev/uart/uart_kbd_sun.h#2 integrate
.. //depot/projects/arm/src/sys/dev/usb/ubsa.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/ukbd.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/umass.c#13 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#21 integrate
.. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#4 integrate
.. //depot/projects/arm/src/sys/geom/concat/g_concat.c#6 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.c#14 integrate
.. //depot/projects/arm/src/sys/geom/geom.h#7 integrate
.. //depot/projects/arm/src/sys/geom/geom_disk.c#5 integrate
.. //depot/projects/arm/src/sys/geom/geom_disk.h#4 integrate
.. //depot/projects/arm/src/sys/geom/geom_gpt.c#9 integrate
.. //depot/projects/arm/src/sys/geom/geom_io.c#6 integrate
.. //depot/projects/arm/src/sys/geom/geom_slice.c#5 integrate
.. //depot/projects/arm/src/sys/geom/journal/g_journal.c#1 branch
.. //depot/projects/arm/src/sys/geom/journal/g_journal.h#1 branch
.. //depot/projects/arm/src/sys/geom/journal/g_journal_ufs.c#1 branch
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#19 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#9 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#8 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#24 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#9 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#9 integrate
.. //depot/projects/arm/src/sys/geom/shsec/g_shsec.c#5 integrate
.. //depot/projects/arm/src/sys/geom/stripe/g_stripe.c#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#6 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/arm/src/sys/i386/conf/NOTES#21 integrate
.. //depot/projects/arm/src/sys/i386/i386/genassym.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/machdep.c#19 integrate
.. //depot/projects/arm/src/sys/i386/i386/trap.c#10 integrate
.. //depot/projects/arm/src/sys/i386/include/asmacros.h#3 integrate
.. //depot/projects/arm/src/sys/i386/include/profile.h#3 integrate
.. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux.h#7 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#7 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#18 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#18 integrate
.. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#18 integrate
.. //depot/projects/arm/src/sys/i386/linux/syscalls.master#18 integrate
.. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#6 integrate
.. //depot/projects/arm/src/sys/ia64/conf/GENERIC#11 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/genassym.c#3 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/trap.c#8 integrate
.. //depot/projects/arm/src/sys/kern/init_main.c#10 integrate
.. //depot/projects/arm/src/sys/kern/init_sysent.c#19 integrate
.. //depot/projects/arm/src/sys/kern/kern_clock.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_exit.c#19 integrate
.. //depot/projects/arm/src/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_idle.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_kse.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_malloc.c#8 integrate
.. //depot/projects/arm/src/sys/kern/kern_poll.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_proc.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_resource.c#10 integrate
.. //depot/projects/arm/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/arm/src/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_switch.c#7 integrate
.. //depot/projects/arm/src/sys/kern/kern_synch.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#11 integrate
.. //depot/projects/arm/src/sys/kern/kern_thread.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_umtx.c#12 integrate
.. //depot/projects/arm/src/sys/kern/sched_4bsd.c#10 integrate
.. //depot/projects/arm/src/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/arm/src/sys/kern/subr_disk.c#5 integrate
.. //depot/projects/arm/src/sys/kern/subr_prf.c#7 integrate
.. //depot/projects/arm/src/sys/kern/subr_trap.c#7 integrate
.. //depot/projects/arm/src/sys/kern/sys_process.c#9 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.c#19 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#22 integrate
.. //depot/projects/arm/src/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/arm/src/sys/kern/tty.c#9 integrate
.. //depot/projects/arm/src/sys/kern/tty_cons.c#5 integrate
.. //depot/projects/arm/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#15 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#26 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#17 integrate
.. //depot/projects/arm/src/sys/kern/vfs_bio.c#14 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#27 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#21 integrate
.. //depot/projects/arm/src/sys/modules/acpi/Makefile#5 integrate
.. //depot/projects/arm/src/sys/modules/acpi/acpi_aiboost/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/ath_rate_amrr/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/bge/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/geom/geom_journal/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/linux/Makefile#8 integrate
.. //depot/projects/arm/src/sys/modules/nfe/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/powermac_nvram/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/ufs/Makefile#3 integrate
.. //depot/projects/arm/src/sys/net/bridgestp.c#10 integrate
.. //depot/projects/arm/src/sys/net/bridgestp.h#4 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#25 integrate
.. //depot/projects/arm/src/sys/net/if_bridgevar.h#9 integrate
.. //depot/projects/arm/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/arm/src/sys/net/if_tun.c#7 integrate
.. //depot/projects/arm/src/sys/net/ppp_tty.c#3 integrate
.. //depot/projects/arm/src/sys/net/rtsock.c#8 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_device.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/in_proto.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctp.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_auth.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_auth.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_constants.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_crc32.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_header.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_indata.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_input.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_os.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_output.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_peeloff.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_structs.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_timer.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_timer.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_uio.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctp_var.h#1 branch
.. //depot/projects/arm/src/sys/netinet/sctputil.c#1 branch
.. //depot/projects/arm/src/sys/netinet/sctputil.h#1 branch
.. //depot/projects/arm/src/sys/netinet6/in6_proto.c#6 integrate
.. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#1 branch
.. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#1 branch
.. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#14 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#9 integrate
.. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#6 integrate
.. //depot/projects/arm/src/sys/pc98/conf/GENERIC#10 integrate
.. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/arm/src/sys/pci/if_sis.c#6 integrate
.. //depot/projects/arm/src/sys/pci/ncr.c#5 integrate
.. //depot/projects/arm/src/sys/posix4/ksched.c#6 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#3 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#9 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/trap.c#7 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#5 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#19 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/NOTES#10 integrate
.. //depot/projects/arm/src/sys/sparc64/include/endian.h#3 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#9 integrate
.. //depot/projects/arm/src/sys/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/elf.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/endian.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/hypervisor_api.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/hypervisorvar.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/trap.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/include/utrap.h#2 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/exception.S#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/hcall.S#2 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/hvcons.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/trap.c#3 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/wbuf.S#2 integrate
.. //depot/projects/arm/src/sys/sys/bio.h#5 integrate
.. //depot/projects/arm/src/sys/sys/cons.h#3 integrate
.. //depot/projects/arm/src/sys/sys/libkern.h#5 integrate
.. //depot/projects/arm/src/sys/sys/mac_policy.h#9 integrate
.. //depot/projects/arm/src/sys/sys/mbuf.h#15 integrate
.. //depot/projects/arm/src/sys/sys/mount.h#14 integrate
.. //depot/projects/arm/src/sys/sys/param.h#19 integrate
.. //depot/projects/arm/src/sys/sys/pcpu.h#4 integrate
.. //depot/projects/arm/src/sys/sys/proc.h#16 integrate
.. //depot/projects/arm/src/sys/sys/rtprio.h#3 integrate
.. //depot/projects/arm/src/sys/sys/sched.h#6 integrate
.. //depot/projects/arm/src/sys/sys/socket.h#5 integrate
.. //depot/projects/arm/src/sys/sys/soundcard.h#4 integrate
.. //depot/projects/arm/src/sys/sys/syscall.h#19 integrate
.. //depot/projects/arm/src/sys/sys/syscall.mk#19 integrate
.. //depot/projects/arm/src/sys/sys/sysproto.h#20 integrate
.. //depot/projects/arm/src/sys/sys/vnode.h#12 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_extern.h#5 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#13 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#18 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/fs.h#3 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/gjournal.h#1 branch
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_gjournal.c#1 branch
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#8 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/arm/src/sys/vm/uma_core.c#9 integrate
.. //depot/projects/arm/src/sys/vm/vm_glue.c#6 integrate
.. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#6 integrate
.. //depot/projects/arm/src/tools/build/options/WITHOUT_CDDL#1 branch
.. //depot/projects/arm/src/tools/tools/find-sb/mini_ufs.h#2 integrate
.. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#4 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/README#2 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/bridge/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/default/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/firewall/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/minimal/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/vpn/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/wireless/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/wrap/tinybsd.ports#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/arm/src/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/arm/src/usr.bin/awk/tran.c.diff#1 branch
.. //depot/projects/arm/src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#2 integrate
.. //depot/projects/arm/src/usr.bin/lorder/lorder.1#3 integrate
.. //depot/projects/arm/src/usr.bin/tar/getdate.y#2 integrate
.. //depot/projects/arm/src/usr.bin/vmstat/vmstat.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidcontrol/hid.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/client.c#4 integrate
.. //depot/projects/arm/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate
.. //depot/projects/arm/src/usr.sbin/fdcontrol/fdcontrol.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/fwcontrol/Makefile#2 integrate
.. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/fwcontrol/fwdv.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/fwcontrol/fwmethods.h#1 branch
.. //depot/projects/arm/src/usr.sbin/fwcontrol/fwmpegts.c#1 branch
.. //depot/projects/arm/src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/smbmsg/smbmsg.8#2 integrate

Differences ...

==== //depot/projects/arm/src/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.336 2006/10/16 22:18:59 jb Exp $
+# $FreeBSD: src/Makefile,v 1.337 2006/11/01 09:05:40 jb Exp $
 #
 # The user-driven targets are:
 #
@@ -242,7 +242,7 @@
 MMAKE=		${MMAKEENV} make \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WERROR
+		-DNO_CPU_CFLAGS -DNO_WERROR -DNO_CTF
 
 make: .PHONY
 	@echo

==== //depot/projects/arm/src/ObsoleteFiles.inc#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.57 2006/10/31 21:05:35 jmg Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -628,7 +628,9 @@
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
+.if ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/bin/gdbserver
+.endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix

==== //depot/projects/arm/src/UPDATING#6 (text+ko) ====

@@ -21,6 +21,14 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20061026:
+	KSE in the kernel has now been made optional and turned on by
+	default. Use 'nooption KSE' in your kernel config to turn it
+	off. All kernel modules *must* be recompiled after this change.
+	There-after, modules from a KSE kernel should be compatible with
+	modules from a NOKSE kernel due to the temporary padding fields
+	added to 'struct proc'.
+
 20060929:
 	mrouted and its utilities have been removed from the base system.
 
@@ -631,4 +639,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.460 2006/09/30 20:01:15 ru Exp $
+$FreeBSD: src/UPDATING,v 1.462 2006/10/26 22:05:24 jb Exp $

==== //depot/projects/arm/src/bin/cp/cp.1#5 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/cp/cp.1,v 1.37 2006/10/24 18:42:42 trhodes Exp $
+.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $
 .\"
-.Dd October 24, 2006
+.Dd October 27, 2006
 .Dt CP 1
 .Os
 .Sh NAME
@@ -255,23 +255,19 @@
 is different from historical
 .Fx
 behavior.
-Use
-of this option
+Use of this option
 is strongly discouraged as the behavior is
 implementation-dependent.
-In this implementation of
-.Nm ,
+In
+.Fx ,
 .Fl r
-works alike
+is a synonym for
 .Fl RL
-thus all files, including special files, are copied
-in a manner similar to normal files.
-Data within these special files
-will not be copied, only the file itself.
-Historical implemenations
+and works the same unless modified by other flags.
+Historical implementations
 of
 .Fl r
-differ as they could copy the internal contents of special
+differ as they copy special files as normal
 files while recreating a hierarchy.
 .Pp
 The

==== //depot/projects/arm/src/bin/rm/rm.1#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" $FreeBSD: src/bin/rm/rm.1,v 1.39 2005/11/17 12:15:23 ru Exp $
+.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $
 .\"
-.Dd September 29, 2005
+.Dd October 30, 2006
 .Dt RM 1
 .Os
 .Sh NAME
@@ -88,6 +88,10 @@
 Overwrite regular files before deleting them.
 Files are overwritten three times, first with the byte pattern 0xff,
 then 0x00, and then 0xff again, before they are deleted.
+Files with multiple links will not be overwritten nor deleted unless
+.Fl f
+is specified, a warning is generated instead.
+.Pp
 Specifying this flag for a read only file will cause
 .Nm
 to generate an error message and exit.
@@ -168,6 +172,12 @@
 For example:
 .Dl rm /home/user/-filename
 .Dl rm ./-filename
+.Pp
+When
+.Fl P
+is specified with
+.Fl f
+the file will be overwritten and removed even if it has hard links.
 .Sh COMPATIBILITY
 The
 .Nm

==== //depot/projects/arm/src/bin/rm/rm.c#3 (text+ko) ====

@@ -39,7 +39,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.56 2006/10/18 13:16:06 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $");
 
 #include <sys/stat.h>
 #include <sys/param.h>
@@ -400,6 +400,11 @@
 	}
 	if (!S_ISREG(sbp->st_mode))
 		return (1);
+	if (sbp->st_nlink > 1 && !fflag) {
+		warnx("%s (inode %u): not overwritten due to multiple links",
+		    file, sbp->st_ino);
+		return (0);
+	}
 	if ((fd = open(file, O_WRONLY, 0)) == -1)
 		goto err;
 	if (fstatfs(fd, &fsb) == -1)

==== //depot/projects/arm/src/contrib/bsnmp/snmp_mibII/mibII.c#2 (text+ko) ====

@@ -26,12 +26,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $
+ * $Begemot: mibII.c 516 2006-10-27 15:54:02Z brandt_h $
  *
  * Implementation of the standard interfaces and ip MIB.
  */
 #include "mibII.h"
 #include "mibII_oid.h"
+#include <net/if.h>
 #include <net/if_types.h>
 
 
@@ -376,16 +377,16 @@
 	u_int ticks;
 
 	if ((ticks = mibif_force_hc_update_interval) == 0) {
-		if (mibif_maxspeed <= 10000000) {
+		if (mibif_maxspeed <= IF_Mbps(10)) {
 			/* at 10Mbps overflow needs 3436 seconds */
 			ticks = 3000 * 100;	/* 50 minutes */
-		} else if (mibif_maxspeed <= 100000000) {
+		} else if (mibif_maxspeed <= IF_Mbps(100)) {
 			/* at 100Mbps overflow needs 343 seconds */
 			ticks = 300 * 100;	/* 5 minutes */
-		} else if (mibif_maxspeed < 650000000) {
+		} else if (mibif_maxspeed < IF_Mbps(622)) {
 			/* at 622Mbps overflow needs 53 seconds */
 			ticks = 40 * 100;	/* 40 seconds */
-		} else if (mibif_maxspeed <= 1000000000) {
+		} else if (mibif_maxspeed <= IF_Mbps(1000)) {
 			/* at 1Gbps overflow needs  34 seconds */
 			ticks = 20 * 100;	/* 20 seconds */
 		} else {

==== //depot/projects/arm/src/contrib/bsnmp/snmpd/action.c#2 (text+ko) ====

@@ -2,6 +2,9 @@
  * Copyright (c) 2001-2003
  *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
  *	All rights reserved.
+ * Copyright (c) 2004-2006
+ *	Hartmut Brandt.
+ *	All rights reserved.
  *
  * Author: Harti Brandt <harti at freebsd.org>
  * 
@@ -26,13 +29,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmpd/action.c,v 1.58 2004/08/06 08:47:09 brandt Exp $
+ * $Begemot: action.c 517 2006-10-31 08:52:04Z brandt_h $
  *
  * Variable access for SNMPd
  */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -48,6 +52,11 @@
 static const struct asn_oid
 	oid_begemotSnmpdModuleTable = OIDX_begemotSnmpdModuleTable;
 
+#ifdef __FreeBSD__
+static const struct asn_oid
+	oid_freeBSDVersion = OIDX_freeBSDVersion;
+#endif
+
 /*
  * Get a string value from the KERN sysctl subtree.
  */
@@ -100,39 +109,57 @@
 int
 init_actvals(void)
 {
-	char *v[4];
-	u_int i;
+	struct utsname uts;
+	char *hostid;
 	size_t len;
+#ifdef __FreeBSD__
+	char *rel, *p, *end;
+	u_long num;
+#endif
 
-	if ((systemg.name = act_getkernstring(KERN_HOSTNAME)) == NULL)
+	if (uname(&uts) == -1)
+		return (-1);
+
+	if ((systemg.name = strdup(uts.nodename)) == NULL)
+		return (-1);
+
+	if ((hostid = act_getkernint(KERN_HOSTID)) == NULL)
 		return (-1);
 
-	for (i = 0; i < 4; i++)
-		v[1] = NULL;
+	len = strlen(uts.nodename) + 1;
+	len += strlen(hostid) + 1;
+	len += strlen(uts.sysname) + 1;
+	len += strlen(uts.release) + 1;
 
-	if ((v[0] = act_getkernstring(KERN_HOSTNAME)) == NULL)
-		goto err;
-	if ((v[1] = act_getkernint(KERN_HOSTID)) == NULL)
-		goto err;
-	if ((v[2] = act_getkernstring(KERN_OSTYPE)) == NULL)
-		goto err;
-	if ((v[3] = act_getkernstring(KERN_OSRELEASE)) == NULL)
-		goto err;
+	if ((systemg.descr = malloc(len)) == NULL) {
+		free(hostid);
+		return (-1);
+	}
+	sprintf(systemg.descr, "%s %s %s %s", uts.nodename, hostid, uts.sysname,
+	    uts.release);
 
-	for (i = 0, len = 0; i < 4; i++)
-		len += strlen(v[i]) + 1;
+#ifdef __FreeBSD__
+	/*
+	 * Construct a FreeBSD oid
+	 */
+	systemg.object_id = oid_freeBSDVersion;
+	rel = uts.release;
+	while ((p = strsep(&rel, ".")) != NULL &&
+	    systemg.object_id.len < ASN_MAXOIDLEN) {
+		systemg.object_id.subs[systemg.object_id.len] = 0;
+		if (*p != '\0') {
+			num = strtoul(p, &end, 10);
+			if (end == p)
+				break;
+			systemg.object_id.subs[systemg.object_id.len] = num;
+		}
+		systemg.object_id.len++;
+	}
+#endif
 
-	if ((systemg.descr = malloc(len)) == NULL)
-		goto err;
-	sprintf(systemg.descr, "%s %s %s %s", v[0], v[1], v[2], v[3]);
+	free(hostid);
 
 	return (0);
-
-  err:
-	for (i = 0; i < 4; i++)
-		if (v[i] != NULL)
-			free(v[i]);
-	return (-1);
 }
 
 

==== //depot/projects/arm/src/contrib/bsnmp/snmpd/tree.def#2 (text+ko) ====

@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Begemot: bsnmp/snmpd/tree.def,v 1.38 2004/08/06 08:47:17 brandt Exp $
+# $Begemot: tree.def 517 2006-10-31 08:52:04Z brandt_h $
 #
 # System group and private Begemot SNMPd MIB.
 #
@@ -64,11 +64,19 @@
         (32 snmpProxyDrops COUNTER op_snmp GET)
       )
   ))
+
+  (4 private
+    (1 enterprises
+#
+# FreeBSD stuff
 #
+      (2238 freeBSD
+        (4 freeBSDVersion)
+      )
+
+#
 # Private Begemot Stuff
 #
-  (4 private
-    (1 enterprises
       (12325 fokus
         (1 begemot
 

==== //depot/projects/arm/src/contrib/gcc/function.c#2 (text+ko) ====

@@ -19,7 +19,7 @@
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/function.c,v 1.22 2005/06/03 04:02:19 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/function.c,v 1.23 2006/10/25 07:29:22 bde Exp $ */
 
 /* This file handles the generation of rtl code from tree structure
    at the level of the function as a whole.
@@ -7129,7 +7129,9 @@
       if (!initialized)
 	{
 	  mexitcount_libfunc = init_one_libfunc (".mexitcount");
+#if 0 /* Turn this off to prevent erroneous garbage collection.  */
 	  initialized = 1;
+#endif
 	}
       emit_library_call (mexitcount_libfunc, LCT_NORMAL, VOIDmode, 0);
     }

==== //depot/projects/arm/src/contrib/pf/man/pf.conf.5#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.9 2005/09/28 08:11:15 mlaier Exp $
+.\"	$FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.10 2006/10/30 15:15:37 mlaier Exp $
 .\"	$OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
@@ -28,7 +28,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 7, 2005
+.Dd October 30, 2006
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -2851,6 +2851,12 @@
 for the moment.
 This workaround will still produce the LOR, but Giant will protect from the
 deadlock.
+.Pp
+Route labels are not supported by the
+.Fx
+.Xr route 4
+system.
+Rules with a route label do not match any traffic.
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr icmp 4 ,

==== //depot/projects/arm/src/etc/defaults/rc.conf#8 (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.300 2006/10/15 15:55:00 ceri Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.301 2006/10/28 20:08:12 phk Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -104,6 +104,16 @@
 firewall_quiet="NO"		# Set to YES to suppress rule display
 firewall_logging="NO"		# Set to YES to enable events logging
 firewall_flags=""		# Flags passed to ipfw when type is a file
+firewall_myservices=""		# List of TCP ports on which this host
+				#  offers services
+firewall_allowservices=""	# List of IPs which has access to
+				#  $firewall_myservices
+firewall_trusted=""		# List of IPs which has full access to this host
+firewall_logdeny="NO"		# Set to YES to log default denied incoming
+				#  packets.
+firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports
+				#  for which denied incoming packets are not
+				#  logged.
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)

==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.109 2006/10/06 08:27:07 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.110 2006/10/31 22:22:29 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -108,6 +108,8 @@
         ..
         gate
         ..
+        journal
+        ..
         label
         ..
         mirror

==== //depot/projects/arm/src/etc/network.subr#5 (text+ko) ====

@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $
+# $FreeBSD: src/etc/network.subr,v 1.176 2006/10/29 13:29:49 mlaier Exp $
 #
 
 #
@@ -690,7 +690,7 @@
 		if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ]
 		then
 			case ${i} in
-			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*)
+			lo0|gif[0-9]*|stf[0-9]*|faith[0-9]*|lp[0-9]*|sl[0-9]*|tun[0-9]*|pflog[0-9]*|pfsync[0-9]*)
 				;;
 			*)
 				rtsol_interfaces="${rtsol_interfaces} ${i}"

==== //depot/projects/arm/src/etc/rc.d/ppp#2 (text+ko) ====


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


More information about the p4-projects mailing list