PERFORCE change 144839 for review

Sam Leffler sam at FreeBSD.org
Mon Jul 7 17:53:15 UTC 2008


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

Change 144839 by sam at sam_ebb on 2008/07/07 17:52:24

	IFC @ 144838

Affected files ...

.. //depot/projects/vap/Makefile.inc1#13 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#13 integrate
.. //depot/projects/vap/UPDATING#14 integrate
.. //depot/projects/vap/bin/setfacl/setfacl.1#3 integrate
.. //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 integrate
.. //depot/projects/vap/etc/devd.conf#5 integrate
.. //depot/projects/vap/etc/periodic/security/800.loginfail#3 integrate
.. //depot/projects/vap/etc/rc.d/ipfw#4 integrate
.. //depot/projects/vap/etc/rc.d/lockd#5 integrate
.. //depot/projects/vap/etc/rc.d/mountcritlocal#5 integrate
.. //depot/projects/vap/etc/rc.d/nfsclient#3 integrate
.. //depot/projects/vap/etc/rc.d/savecore#5 integrate
.. //depot/projects/vap/etc/rc.d/statd#5 integrate
.. //depot/projects/vap/etc/rc.d/syscons#3 integrate
.. //depot/projects/vap/games/fortune/datfiles/fortunes#10 integrate
.. //depot/projects/vap/gnu/lib/Makefile#3 integrate
.. //depot/projects/vap/gnu/lib/csu/Makefile#4 integrate
.. //depot/projects/vap/gnu/lib/libssp/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cvs/contrib/Makefile#5 integrate
.. //depot/projects/vap/lib/csu/Makefile.inc#1 branch
.. //depot/projects/vap/lib/libarchive/archive.h#2 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#7 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_disk.c#10 integrate
.. //depot/projects/vap/lib/libarchive/config_freebsd.h#7 integrate
.. //depot/projects/vap/lib/libarchive/test/Makefile#10 integrate
.. //depot/projects/vap/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_compat_zip_1.zip.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch
.. //depot/projects/vap/lib/libc/Makefile#3 integrate
.. //depot/projects/vap/lib/libc/amd64/gen/_setjmp.S#3 integrate
.. //depot/projects/vap/lib/libc/amd64/gen/setjmp.S#3 integrate
.. //depot/projects/vap/lib/libc/gen/glob.c#3 integrate
.. //depot/projects/vap/lib/libc/i386/gen/_setjmp.S#3 integrate
.. //depot/projects/vap/lib/libc/i386/gen/setjmp.S#3 integrate
.. //depot/projects/vap/lib/libc/net/getaddrinfo.3#3 integrate
.. //depot/projects/vap/lib/libc/stdio/Makefile.inc#4 integrate
.. //depot/projects/vap/lib/libc/stdio/printf-pos.c#1 branch
.. //depot/projects/vap/lib/libc/stdio/printflocal.h#1 branch
.. //depot/projects/vap/lib/libc/stdio/vfprintf.c#4 integrate
.. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#5 integrate
.. //depot/projects/vap/lib/libc/stdlib/hcreate.3#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/hcreate.c#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/system.3#3 integrate
.. //depot/projects/vap/lib/libc/sys/mkdir.2#5 integrate
.. //depot/projects/vap/lib/libc/sys/socket.2#3 integrate
.. //depot/projects/vap/lib/libstand/Makefile#4 integrate
.. //depot/projects/vap/lib/libthr/Makefile#7 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_mutex.c#9 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_umtx.c#5 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_umtx.h#5 integrate
.. //depot/projects/vap/lib/libutil/Makefile#4 integrate
.. //depot/projects/vap/lib/libutil/expand_number.c#3 integrate
.. //depot/projects/vap/lib/libutil/hexdump.3#1 branch
.. //depot/projects/vap/lib/libutil/hexdump.c#1 branch
.. //depot/projects/vap/lib/libutil/libutil.h#4 integrate
.. //depot/projects/vap/lib/msun/man/cos.3#4 integrate
.. //depot/projects/vap/libexec/rtld-elf/Makefile#3 integrate
.. //depot/projects/vap/release/Makefile#5 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/vap/release/picobsd/build/picobsd#3 integrate
.. //depot/projects/vap/release/scripts/src-install.sh#3 integrate
.. //depot/projects/vap/rescue/librescue/Makefile#3 integrate
.. //depot/projects/vap/rescue/rescue/Makefile#6 integrate
.. //depot/projects/vap/sbin/Makefile#5 integrate
.. //depot/projects/vap/sbin/atacontrol/atacontrol.8#4 integrate
.. //depot/projects/vap/sbin/devfs/devfs.8#3 integrate
.. //depot/projects/vap/sbin/dhclient/dhclient.c#8 integrate
.. //depot/projects/vap/sbin/geom/Makefile#5 integrate
.. //depot/projects/vap/sbin/ggate/ggated/ggated.c#4 integrate
.. //depot/projects/vap/sbin/quotacheck/preen.c#4 integrate
.. //depot/projects/vap/sbin/quotacheck/quotacheck.c#5 integrate
.. //depot/projects/vap/sbin/sconfig/sconfig.c#4 integrate
.. //depot/projects/vap/secure/usr.bin/bdes/bdes.ps#3 integrate
.. //depot/projects/vap/share/man/man4/Makefile#15 integrate
.. //depot/projects/vap/share/man/man4/aac.4#4 integrate
.. //depot/projects/vap/share/man/man4/bpf.4#5 integrate
.. //depot/projects/vap/share/man/man4/cnw.4#4 delete
.. //depot/projects/vap/share/man/man4/ed.4#6 integrate
.. //depot/projects/vap/share/man/man4/malo.4#5 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/Makefile#3 integrate
.. //depot/projects/vap/share/man/man4/man4.i386/arl.4#3 delete
.. //depot/projects/vap/share/man/man4/man4.i386/oltr.4#3 delete
.. //depot/projects/vap/share/man/man4/man4.i386/sbni.4#3 delete
.. //depot/projects/vap/share/man/man4/man4.powerpc/Makefile#3 integrate
.. //depot/projects/vap/share/man/man4/man4.powerpc/bm.4#1 branch
.. //depot/projects/vap/share/man/man4/sbsh.4#3 delete
.. //depot/projects/vap/share/man/man4/snd_emu10kx.4#4 integrate
.. //depot/projects/vap/share/man/man4/uftdi.4#3 integrate
.. //depot/projects/vap/share/man/man5/src.conf.5#8 integrate
.. //depot/projects/vap/share/misc/committers-doc.dot#7 integrate
.. //depot/projects/vap/share/misc/committers-ports.dot#7 integrate
.. //depot/projects/vap/share/misc/committers-src.dot#7 integrate
.. //depot/projects/vap/share/mk/bsd.cpu.mk#6 integrate
.. //depot/projects/vap/share/mk/bsd.sys.mk#3 integrate
.. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#20 integrate
.. //depot/projects/vap/sys/amd64/include/iodev.h#3 integrate
.. //depot/projects/vap/sys/amd64/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/amd64/include/pmap.h#7 integrate
.. //depot/projects/vap/sys/amd64/include/vmparam.h#7 integrate
.. //depot/projects/vap/sys/arm/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/boot/Makefile.inc#1 branch
.. //depot/projects/vap/sys/boot/arm/Makefile.inc#1 branch
.. //depot/projects/vap/sys/boot/arm/at91/Makefile.inc#3 integrate
.. //depot/projects/vap/sys/boot/efi/Makefile.inc#3 integrate
.. //depot/projects/vap/sys/boot/forth/loader.conf#9 integrate
.. //depot/projects/vap/sys/boot/i386/Makefile.inc#6 integrate
.. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#6 integrate
.. //depot/projects/vap/sys/boot/i386/loader/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/ia64/Makefile.inc#3 integrate
.. //depot/projects/vap/sys/boot/ia64/common/Makefile#3 integrate
.. //depot/projects/vap/sys/boot/ia64/efi/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/ia64/ski/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/ofw/Makefile.inc#1 branch
.. //depot/projects/vap/sys/boot/pc98/Makefile.inc#5 integrate
.. //depot/projects/vap/sys/boot/pc98/boot2/Makefile#6 integrate
.. //depot/projects/vap/sys/boot/pc98/boot2/README.serial.98#3 delete
.. //depot/projects/vap/sys/boot/pc98/loader/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/powerpc/Makefile.inc#1 branch
.. //depot/projects/vap/sys/boot/powerpc/ofw/Makefile#4 integrate
.. //depot/projects/vap/sys/boot/sparc64/Makefile.inc#3 integrate
.. //depot/projects/vap/sys/boot/sparc64/loader/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/uboot/Makefile.inc#1 branch
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.c#8 delete
.. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.h#3 delete
.. //depot/projects/vap/sys/compat/svr4/svr4_stat.c#6 integrate
.. //depot/projects/vap/sys/conf/NOTES#23 integrate
.. //depot/projects/vap/sys/conf/files.i386#13 integrate
.. //depot/projects/vap/sys/conf/files.pc98#12 integrate
.. //depot/projects/vap/sys/conf/kern.mk#8 integrate
.. //depot/projects/vap/sys/conf/kern.post.mk#8 integrate
.. //depot/projects/vap/sys/contrib/dev/oltr/COPYRIGHT#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr.c#6 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_isa.c#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_pci.c#5 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/if_oltrvar.h#5 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/trlld.h#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/trlldbm.c#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/trlldhm.c#3 delete
.. //depot/projects/vap/sys/contrib/dev/oltr/trlldmac.c#3 delete
.. //depot/projects/vap/sys/dev/aac/aac.c#12 integrate
.. //depot/projects/vap/sys/dev/aac/aac_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#8 integrate
.. //depot/projects/vap/sys/dev/arl/if_arl.c#5 delete
.. //depot/projects/vap/sys/dev/arl/if_arl_isa.c#5 delete
.. //depot/projects/vap/sys/dev/arl/if_arlreg.h#5 delete
.. //depot/projects/vap/sys/dev/bm/if_bm.c#2 integrate
.. //depot/projects/vap/sys/dev/bm/if_bmreg.h#2 integrate
.. //depot/projects/vap/sys/dev/bm/if_bmvar.h#2 integrate
.. //depot/projects/vap/sys/dev/ce/ceddk.h#3 integrate
.. //depot/projects/vap/sys/dev/ce/if_ce.c#3 integrate
.. //depot/projects/vap/sys/dev/cnw/if_cnw.c#6 delete
.. //depot/projects/vap/sys/dev/cnw/if_cnwioctl.h#3 delete
.. //depot/projects/vap/sys/dev/cnw/if_cnwreg.h#3 delete
.. //depot/projects/vap/sys/dev/cp/cpddk.h#3 integrate
.. //depot/projects/vap/sys/dev/cp/if_cp.c#6 integrate
.. //depot/projects/vap/sys/dev/ctau/ctddk.h#3 integrate
.. //depot/projects/vap/sys/dev/ctau/if_ct.c#6 integrate
.. //depot/projects/vap/sys/dev/cx/cxddk.h#3 integrate
.. //depot/projects/vap/sys/dev/cx/if_cx.c#5 integrate
.. //depot/projects/vap/sys/dev/ed/if_ed_pccard.c#6 integrate
.. //depot/projects/vap/sys/dev/io/iodev.c#3 integrate
.. //depot/projects/vap/sys/dev/k8temp/k8temp.c#6 integrate
.. //depot/projects/vap/sys/dev/lmc/if_lmc.c#3 integrate
.. //depot/projects/vap/sys/dev/lmc/if_lmc.h#3 integrate
.. //depot/projects/vap/sys/dev/mfi/mfi.c#9 integrate
.. //depot/projects/vap/sys/dev/mii/rgephy.c#6 integrate
.. //depot/projects/vap/sys/dev/mii/rgephyreg.h#5 integrate
.. //depot/projects/vap/sys/dev/mpt/mpt_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/mpt/mpt_user.c#2 integrate
.. //depot/projects/vap/sys/dev/pccard/pccarddevs#7 integrate
.. //depot/projects/vap/sys/dev/re/if_re.c#12 integrate
.. //depot/projects/vap/sys/dev/sbni/if_sbni.c#5 delete
.. //depot/projects/vap/sys/dev/sbni/if_sbni_isa.c#5 delete
.. //depot/projects/vap/sys/dev/sbni/if_sbni_pci.c#5 delete
.. //depot/projects/vap/sys/dev/sbni/if_sbnireg.h#3 delete
.. //depot/projects/vap/sys/dev/sbni/if_sbnivar.h#5 delete
.. //depot/projects/vap/sys/dev/sbsh/if_sbsh.c#6 delete
.. //depot/projects/vap/sys/dev/sbsh/if_sbshreg.h#3 delete
.. //depot/projects/vap/sys/dev/sound/pci/atiixp.h#3 integrate
.. //depot/projects/vap/sys/dev/syscons/daemon/daemon_saver.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/usb_ethersubr.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#22 integrate
.. //depot/projects/vap/sys/dev/usb/uscanner.c#8 integrate
.. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#3 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#10 integrate
.. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#7 integrate
.. //depot/projects/vap/sys/geom/virstor/g_virstor.c#3 integrate
.. //depot/projects/vap/sys/i386/conf/NOTES#13 integrate
.. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vap/sys/i386/i386/mp_machdep.c#10 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#16 integrate
.. //depot/projects/vap/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate
.. //depot/projects/vap/sys/i386/include/iodev.h#3 integrate
.. //depot/projects/vap/sys/i386/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/ia64/ia64/machdep.c#16 integrate
.. //depot/projects/vap/sys/ia64/include/ia64_cpu.h#5 integrate
.. //depot/projects/vap/sys/ia64/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/kern/kern_alq.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_cpuset.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_descrip.c#16 integrate
.. //depot/projects/vap/sys/kern/kern_event.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_fork.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_intr.c#12 integrate
.. //depot/projects/vap/sys/kern/kern_jail.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_lockf.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_malloc.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_mib.c#9 integrate
.. //depot/projects/vap/sys/kern/kern_poll.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_umtx.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_xxx.c#5 integrate
.. //depot/projects/vap/sys/kern/stack_protector.c#1 branch
.. //depot/projects/vap/sys/kern/subr_param.c#7 integrate
.. //depot/projects/vap/sys/kern/uipc_debug.c#4 integrate
.. //depot/projects/vap/sys/kern/uipc_sem.c#10 integrate
.. //depot/projects/vap/sys/kern/uipc_shm.c#5 integrate
.. //depot/projects/vap/sys/kern/uipc_socket.c#12 integrate
.. //depot/projects/vap/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/vap/sys/mips/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/adm5120reg.h#1 branch
.. //depot/projects/vap/sys/mips/adm5120/admpci.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/console.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/files.adm5120#1 branch
.. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/if_admswreg.h#1 branch
.. //depot/projects/vap/sys/mips/adm5120/if_admswvar.h#1 branch
.. //depot/projects/vap/sys/mips/adm5120/obio.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/obiovar.h#1 branch
.. //depot/projects/vap/sys/mips/adm5120/std.adm5120#1 branch
.. //depot/projects/vap/sys/mips/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/vap/sys/mips/idt/files.idt#1 branch
.. //depot/projects/vap/sys/mips/idt/idt_machdep.c#1 branch
.. //depot/projects/vap/sys/mips/idt/idtpci.c#1 branch
.. //depot/projects/vap/sys/mips/idt/idtreg.h#1 branch
.. //depot/projects/vap/sys/mips/idt/if_kr.c#1 branch
.. //depot/projects/vap/sys/mips/idt/if_krreg.h#1 branch
.. //depot/projects/vap/sys/mips/idt/obio.c#1 branch
.. //depot/projects/vap/sys/mips/idt/obiovar.h#1 branch
.. //depot/projects/vap/sys/mips/idt/std.idt#1 branch
.. //depot/projects/vap/sys/mips/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/vap/sys/mips/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/vap/sys/mips/include/iodev.h#2 integrate
.. //depot/projects/vap/sys/mips/include/memdev.h#2 integrate
.. //depot/projects/vap/sys/mips/malta/files.malta#1 branch
.. //depot/projects/vap/sys/mips/malta/gt.c#1 branch
.. //depot/projects/vap/sys/mips/malta/gt_pci.c#1 branch
.. //depot/projects/vap/sys/mips/malta/gtreg.h#1 branch
.. //depot/projects/vap/sys/mips/malta/gtvar.h#1 branch
.. //depot/projects/vap/sys/mips/malta/malta_machdep.c#1 branch
.. //depot/projects/vap/sys/mips/malta/maltareg.h#1 branch
.. //depot/projects/vap/sys/mips/malta/obio.c#1 branch
.. //depot/projects/vap/sys/mips/malta/obiovar.h#1 branch
.. //depot/projects/vap/sys/mips/malta/std.malta#1 branch
.. //depot/projects/vap/sys/mips/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/vap/sys/mips/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/vap/sys/mips/malta/yamon.c#1 branch
.. //depot/projects/vap/sys/mips/malta/yamon.h#1 branch
.. //depot/projects/vap/sys/mips/mips/pmap.c#5 integrate
.. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120reg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/admpci.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/console.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/files.adm5120#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/if_admsw.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswreg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswvar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/obio.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/obiovar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/std.adm5120#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/files.idt#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/idt_machdep.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/idtpci.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/idtreg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/if_kr.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/if_krreg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/obio.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/obiovar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/std.idt#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/files.malta#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/gt.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/gt_pci.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/gtreg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/gtvar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/malta_machdep.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/maltareg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/obio.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/obiovar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/std.malta#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/yamon.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/malta/yamon.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/files.sentry5#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/obio.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/obiovar.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/s5_machdep.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/s5reg.h#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/siba_cc.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/siba_mips.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/siba_sdram.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete
.. //depot/projects/vap/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete
.. //depot/projects/vap/sys/mips/sentry5/files.sentry5#1 branch
.. //depot/projects/vap/sys/mips/sentry5/obio.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/obiovar.h#1 branch
.. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/s5reg.h#1 branch
.. //depot/projects/vap/sys/mips/sentry5/siba_cc.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/siba_mips.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/siba_sdram.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/vap/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/vap/sys/modules/Makefile#33 integrate
.. //depot/projects/vap/sys/modules/arl/Makefile#6 delete
.. //depot/projects/vap/sys/modules/cnw/Makefile#2 delete
.. //depot/projects/vap/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/oltr/Makefile#4 delete
.. //depot/projects/vap/sys/modules/pecoff/Makefile#5 delete
.. //depot/projects/vap/sys/modules/ralfw/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/sbni/Makefile#3 delete
.. //depot/projects/vap/sys/modules/sbsh/Makefile#3 delete
.. //depot/projects/vap/sys/modules/sem/Makefile#5 integrate
.. //depot/projects/vap/sys/net/bpf.c#16 integrate
.. //depot/projects/vap/sys/net/bpf.h#7 integrate
.. //depot/projects/vap/sys/net/bpf_zerocopy.c#5 integrate
.. //depot/projects/vap/sys/net/bpf_zerocopy.h#3 integrate
.. //depot/projects/vap/sys/net/if.c#14 integrate
.. //depot/projects/vap/sys/net/if_bridge.c#5 integrate
.. //depot/projects/vap/sys/net/if_gre.c#9 integrate
.. //depot/projects/vap/sys/net/if_lagg.c#5 integrate
.. //depot/projects/vap/sys/net/if_loop.c#10 integrate
.. //depot/projects/vap/sys/net/if_ppp.c#6 integrate
.. //depot/projects/vap/sys/net/if_var.h#10 integrate
.. //depot/projects/vap/sys/net/netisr.c#6 integrate
.. //depot/projects/vap/sys/net/netisr.h#4 integrate
.. //depot/projects/vap/sys/net/raw_cb.c#7 integrate
.. //depot/projects/vap/sys/net/raw_cb.h#3 integrate
.. //depot/projects/vap/sys/net/raw_usrreq.c#5 integrate
.. //depot/projects/vap/sys/net/rtsock.c#9 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#24 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#52 integrate
.. //depot/projects/vap/sys/netatalk/ddp_usrreq.c#6 integrate
.. //depot/projects/vap/sys/netgraph/netgraph.h#9 integrate
.. //depot/projects/vap/sys/netgraph/ng_base.c#19 integrate
.. //depot/projects/vap/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/vap/sys/netinet/in.c#7 integrate
.. //depot/projects/vap/sys/netinet/ip_gre.c#5 integrate
.. //depot/projects/vap/sys/netinet/ip_input.c#9 integrate
.. //depot/projects/vap/sys/netinet/raw_ip.c#10 integrate
.. //depot/projects/vap/sys/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/vap/sys/netinet6/frag6.c#6 integrate
.. //depot/projects/vap/sys/netinet6/icmp6.c#9 integrate
.. //depot/projects/vap/sys/netinet6/in6.c#9 integrate
.. //depot/projects/vap/sys/netinet6/in6_ifattach.c#8 integrate
.. //depot/projects/vap/sys/netinet6/in6_rmx.c#7 integrate
.. //depot/projects/vap/sys/netinet6/ip6_forward.c#6 integrate
.. //depot/projects/vap/sys/netinet6/ip6_input.c#8 integrate
.. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#5 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.c#10 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#10 integrate
.. //depot/projects/vap/sys/netipsec/key.c#8 integrate
.. //depot/projects/vap/sys/netipx/ipx_input.c#6 integrate
.. //depot/projects/vap/sys/netnatm/natm_proto.c#6 integrate
.. //depot/projects/vap/sys/nfsclient/bootp_subr.c#8 integrate
.. //depot/projects/vap/sys/nfsclient/nfs.h#6 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_node.c#8 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#13 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#13 integrate
.. //depot/projects/vap/sys/nfsclient/nfsmount.h#5 integrate
.. //depot/projects/vap/sys/nfsclient/nfsnode.h#8 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#7 integrate
.. //depot/projects/vap/sys/nlm/nlm.h#2 integrate
.. //depot/projects/vap/sys/nlm/nlm_advlock.c#1 branch
.. //depot/projects/vap/sys/nlm/nlm_prot.h#2 integrate
.. //depot/projects/vap/sys/nlm/nlm_prot_clnt.c#2 integrate
.. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#6 integrate
.. //depot/projects/vap/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/vap/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/vap/sys/pc98/include/bus.h#5 integrate
.. //depot/projects/vap/sys/pc98/pc98/busiosubr.c#3 integrate
.. //depot/projects/vap/sys/pci/if_rlreg.h#11 integrate
.. //depot/projects/vap/sys/powerpc/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/vap/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/vap/sys/rpc/clnt.h#2 integrate
.. //depot/projects/vap/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/vap/sys/rpc/clnt_rc.c#3 integrate
.. //depot/projects/vap/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/vap/sys/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/vap/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/vap/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/vap/sys/security/mac/mac_policy.h#7 integrate
.. //depot/projects/vap/sys/security/mac/mac_posix_sem.c#5 integrate
.. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#8 integrate
.. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#9 integrate
.. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#9 integrate
.. //depot/projects/vap/sys/security/mac_test/mac_test.c#9 integrate
.. //depot/projects/vap/sys/sparc64/include/in_cksum.h#5 integrate
.. //depot/projects/vap/sys/sparc64/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/in_cksum.c#3 integrate
.. //depot/projects/vap/sys/sun4v/include/in_cksum.h#3 integrate
.. //depot/projects/vap/sys/sun4v/include/memdev.h#3 integrate
.. //depot/projects/vap/sys/sys/event.h#7 integrate
.. //depot/projects/vap/sys/sys/fcntl.h#6 integrate
.. //depot/projects/vap/sys/sys/file.h#8 integrate
.. //depot/projects/vap/sys/sys/kernel.h#11 integrate
.. //depot/projects/vap/sys/sys/ksem.h#3 integrate
.. //depot/projects/vap/sys/sys/lockf.h#8 integrate
.. //depot/projects/vap/sys/sys/param.h#24 integrate
.. //depot/projects/vap/sys/sys/priv.h#6 integrate
.. //depot/projects/vap/sys/sys/semaphore.h#3 integrate
.. //depot/projects/vap/sys/sys/socketvar.h#11 integrate
.. //depot/projects/vap/sys/sys/umtx.h#8 integrate
.. //depot/projects/vap/sys/sys/user.h#10 integrate
.. //depot/projects/vap/sys/vm/vm_kern.h#5 integrate
.. //depot/projects/vap/tools/build/options/WITHOUT_SSP#3 integrate
.. //depot/projects/vap/tools/regression/file/flock/flock.c#2 integrate
.. //depot/projects/vap/tools/regression/lib/libc/stdio/Makefile#3 integrate
.. //depot/projects/vap/tools/regression/lib/libc/stdio/test-print-positional.c#1 branch
.. //depot/projects/vap/tools/regression/lib/msun/Makefile#7 integrate
.. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.c#1 branch
.. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.t#1 branch
.. //depot/projects/vap/tools/regression/posixsem/Makefile#1 branch
.. //depot/projects/vap/tools/regression/posixsem/posixsem.c#1 branch
.. //depot/projects/vap/tools/regression/posixsem/posixsem.t#1 branch
.. //depot/projects/vap/tools/regression/posixsem/test.c#1 branch
.. //depot/projects/vap/tools/regression/posixsem/test.h#1 branch
.. //depot/projects/vap/tools/regression/posixshm/test.c#2 integrate
.. //depot/projects/vap/usr.bin/cpio/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/cpio/config_freebsd.h#2 integrate
.. //depot/projects/vap/usr.bin/cpio/cpio.c#3 integrate
.. //depot/projects/vap/usr.bin/gzip/gzip.1#3 integrate
.. //depot/projects/vap/usr.bin/gzip/unbzip2.c#3 integrate
.. //depot/projects/vap/usr.bin/gzip/znew#4 integrate
.. //depot/projects/vap/usr.bin/ldd/ldd.1#4 integrate
.. //depot/projects/vap/usr.bin/ldd/ldd.c#3 integrate
.. //depot/projects/vap/usr.bin/make/make.1#6 integrate
.. //depot/projects/vap/usr.bin/procstat/procstat_files.c#4 integrate
.. //depot/projects/vap/usr.bin/su/su.1#3 integrate
.. //depot/projects/vap/usr.bin/tar/Makefile#7 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.h#7 integrate
.. //depot/projects/vap/usr.bin/tar/config_freebsd.h#6 integrate
.. //depot/projects/vap/usr.bin/tar/read.c#7 integrate
.. //depot/projects/vap/usr.bin/tar/write.c#8 integrate
.. //depot/projects/vap/usr.bin/unzip/unzip.1#2 integrate
.. //depot/projects/vap/usr.bin/unzip/unzip.c#2 integrate
.. //depot/projects/vap/usr.sbin/Makefile#9 integrate
.. //depot/projects/vap/usr.sbin/arlcontrol/Makefile#3 delete
.. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.8#3 delete
.. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.c#3 delete
.. //depot/projects/vap/usr.sbin/config/mkmakefile.c#5 integrate
.. //depot/projects/vap/usr.sbin/cron/cron/cron.8#3 integrate
.. //depot/projects/vap/usr.sbin/cron/cron/cron.c#3 integrate
.. //depot/projects/vap/usr.sbin/cron/cron/cron.h#3 integrate
.. //depot/projects/vap/usr.sbin/cron/cron/do_command.c#3 integrate
.. //depot/projects/vap/usr.sbin/edquota/edquota.c#3 integrate
.. //depot/projects/vap/usr.sbin/mountd/exports.5#3 integrate
.. //depot/projects/vap/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate
.. //depot/projects/vap/usr.sbin/ngctl/main.c#3 integrate
.. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#4 integrate
.. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#4 integrate
.. //depot/projects/vap/usr.sbin/quot/quot.c#3 integrate
.. //depot/projects/vap/usr.sbin/quotaon/quotaon.c#3 integrate
.. //depot/projects/vap/usr.sbin/repquota/repquota.c#3 integrate
.. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#7 integrate
.. //depot/projects/vap/usr.sbin/rpc.statd/file.c#3 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate

Differences ...

==== //depot/projects/vap/Makefile.inc1#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -225,6 +225,7 @@
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
+		-DWITHOUT_SSP \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
@@ -235,7 +236,7 @@
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
-		-DNO_WARNS -DNO_CTF
+		-DNO_WARNS -DNO_CTF -DWITHOUT_SSP
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -452,7 +453,7 @@
 .if ${MK_KERBEROS} != "no"
 .for _t in obj depend all
 	cd ${.CURDIR}/kerberos5/tools; \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t}
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t}
 .endfor
 .endif
 .for _t in obj includes
@@ -474,7 +475,7 @@
 .endfor
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools
 .endfor
 	cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 libraries
@@ -760,14 +761,14 @@
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \
+	    ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \
 	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
 # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
 .for target in obj depend all
 	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
 	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target}
+	    ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target}
 .endfor
 .endif
 .if !defined(NO_KERNELDEPEND)

==== //depot/projects/vap/ObsoleteFiles.inc#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,49 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080706: bsdlabel(8) removed on powerpc
+.if ${TARGET_ARCH} == "powerpc"
+OLD_FILES+=sbin/bsdlabel
+OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
+.endif
+# 20080704: sbsh(4) removed
+OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
+OLD_FILES+=usr/share/man/man4/sbsh.4.gz
+# 20080704: sbni(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz
+OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz
+.endif
+# 20080704: cnw(4) removed
+OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
+OLD_FILES+=usr/share/man/man4/cnw.4.gz
+# 20080704: oltr(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
+OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
+.endif
+# 20080704: arl(4) removed
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/sbin/arlcontrol
+OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
+OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
+.endif
+# 20080703: sunlabel only for sparc64
+.if ${TARGET_ARCH} != "sparc64"
+OLD_FILES+=sbin/sunlabel
+OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
+.endif
+# 20080703: bsdlabel & fdisk removed on ia64
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=sbin/bsdlabel
+OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
+OLD_FILES+=usr/share/man/man8/disklabel.8.gz
+OLD_FILES+=sbin/fdisk
+OLD_FILES+=usr/share/man/man8/fdisk.8.gz
+.endif
+# 20080701: wpa_supplicant.conf moved to share/examples/etc/
+OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
+OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h

==== //depot/projects/vap/UPDATING#14 (text+ko) ====

@@ -413,6 +413,20 @@
 	   This does not affect those who are using "/dev/dsp".
 
 20061122:
+	geom(4)'s gmirror(8) class metadata structure has been
+	rev'd from v3 to v4. If you update across this point and
+	your metadata is converted for you, you will not be easily
+	able to downgrade since the /boot/kernel.old/geom_mirror.ko
+	kernel module will be unable to read the v4 metadata.  You
+	can resolve this by doing from the loader(8) prompt:
+
+		set vfs.root.mountfrom="ufs:/dev/XXX"
+
+	where XXX is the root slice of one of the disks that composed
+	the mirror (i.e.: /dev/ad0s1a). You can then rebuild
+	the array the same way you built it originally.
+
+20061122:
 	The following binaries have been disconnected from the build:
 	mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs,
 	and mount_std.  The functionality of these programs has been
@@ -1053,4 +1067,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $
+$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $

==== //depot/projects/vap/bin/setfacl/setfacl.1#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $
 .\"
 .Dd January 7, 2001
 .Dt SETFACL 1
@@ -234,9 +234,27 @@
 .Pp
 Multiple ACL entries specified on the command line are
 separated by commas.
+.Pp
+It is possible for files and directories to inherit ACL entries from their
+parent directory.
+This is accomplished through the use of the default ACL.
+It should be noted that before you can specify a default ACL, the mandatory
+ACL entries for user, group, other and mask must be set.
+For more details see the examples below.
+Default ACLs can be created by using
+.Fl d .
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
+.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir
+.Dl setfacl -d -m g:admins:rwx dir
+.Pp
+The first command sets the mandatory elements of the default ACL.
+The second command specifies that users in group admins can have read, write, and execute
+permissions for directory named "dir".
+It should be noted that any files or directories created underneath "dir" will
+inherit these default ACLs upon creation.
+.Pp
 .Dl setfacl -m u::rwx,g:mail:rw file
 .Pp
 Sets read, write, and execute permissions for the

==== //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 (text+ko) ====

@@ -22,7 +22,7 @@
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.73 2007/05/19 02:30:20 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */
 
 #undef  CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
@@ -54,7 +54,7 @@
 /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h
    but trashed by config/<cpu>/<file.h>. */
 
-#undef STARTFILE_SPEC
+#undef  STARTFILE_SPEC
 #define STARTFILE_SPEC FBSD_STARTFILE_SPEC
 
 /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386.  */
@@ -78,13 +78,13 @@
 #undef  WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE	(TARGET_64BIT ? 32 : BITS_PER_WORD)
 
-#undef  SUBTARGET_EXTRA_SPECS  /* i386.h bogusly defines it.  */
+#undef  SUBTARGET_EXTRA_SPECS	/* i386.h bogusly defines it.  */
 #define SUBTARGET_EXTRA_SPECS \
   { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }
 
 #define TARGET_VERSION	fprintf (stderr, " (i386 FreeBSD/ELF)");
 
-#define TARGET_ELF			1
+#define TARGET_ELF	1
 
 /* This goes away when the math emulator is fixed.  */
 #undef  TARGET_SUBTARGET_DEFAULT
@@ -101,7 +101,7 @@
 
 /* FreeBSD sets the rounding precision of the FPU to 53 bits.  Let the
    compiler get the contents of <float.h> and std::numeric_limits correct.  */
-#undef TARGET_96_ROUND_53_LONG_DOUBLE
+#undef  TARGET_96_ROUND_53_LONG_DOUBLE
 #define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT)
 
 /* Tell final.c that we don't need a label passed to mcount.  */
@@ -110,7 +110,7 @@
 /* Output assembler code to FILE to begin profiling of the current function.
    LABELNO is an optional label.  */
 
-#undef MCOUNT_NAME
+#undef  MCOUNT_NAME
 #define MCOUNT_NAME ".mcount"
 
 /* Output assembler code to FILE to end profiling of the current function.  */
@@ -145,7 +145,7 @@
 	else								\
 	  fprintf ((FILE), "%s", xname);				\
       }									\
-    else 								\
+    else								\
       {									\
 	  if (xname[0] == '%')						\
 	    xname += 2;							\
@@ -191,7 +191,7 @@
    uninitialized global data will be output in the data section if
    `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
    used.  */
-#undef BSS_SECTION_ASM_OP
+#undef  BSS_SECTION_ASM_OP
 #define BSS_SECTION_ASM_OP "\t.section\t.bss"
 
 /* Like `ASM_OUTPUT_BSS' except takes the required alignment as a
@@ -202,7 +202,7 @@
 
    Try to use function `asm_output_aligned_bss' defined in file
    `varasm.c' when defining this macro.  */
-#undef ASM_OUTPUT_ALIGNED_BSS
+#undef  ASM_OUTPUT_ALIGNED_BSS
 #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
   asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
 
@@ -230,7 +230,7 @@
     assemble_name (asm_out_file, NAME);					\
         fputc ('-', asm_out_file);					\
         assemble_name (asm_out_file,					\
-	      	 XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));	\
+		 XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));	\
     fprintf (asm_out_file, "\n");					\
   } while (0)
 

==== //depot/projects/vap/etc/devd.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -255,6 +255,28 @@
 	action "/etc/rc.resume acpi $notify";
 };
 
+# The next blocks enable volume hotkeys that can be found on the Asus EeePC
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x13";
+        action                  "mixer 0";
+};
+
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x14";
+        action                  "mixer vol -10";
+};
+
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x15";
+        action                  "mixer vol +10";
+};
+
 /* EXAMPLES TO END OF FILE
 
 # The following might be an example of something that a vendor might

==== //depot/projects/vap/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.9 2008/06/30 08:01:47 mtm Exp $
 #
 
 # Show login failures
@@ -59,7 +59,7 @@
     [Yy][Ee][Ss])
 	echo ""
 	echo "${host} login failures:"
-	n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" |
+	n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" |
 	    tee /dev/stderr | wc -l)
 	[ $n -gt 0 ] && rc=1 || rc=0;;
     *)	rc=0;;

==== //depot/projects/vap/etc/rc.d/ipfw#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $
 #
 
 # PROVIDE: ipfw
@@ -51,7 +51,9 @@
 
 	# Enable the firewall
 	#
-	${SYSCTL_W} net.inet.ip.fw.enable=1
+	if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then
+		warn "failed to enable firewall"
+	fi
 }
 
 ipfw_stop()

==== //depot/projects/vap/etc/rc.d/lockd#5 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
-# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $
+# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $
 #
 
 # PROVIDE: lockd
@@ -15,7 +15,7 @@
 rcvar=rpc_lockd_enable
 command="/usr/sbin/rpc.${name}"
 start_precmd='lockd_precmd'
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
 status_precmd=$stop_precmd
 
 # Make sure that we are either an NFS client or server, and that we get
@@ -26,7 +26,7 @@
 	local ret
 	ret=0
 
-	if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable
+	if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
 	then
 		ret=1
 	fi

==== //depot/projects/vap/etc/rc.d/mountcritlocal#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $
 #
 
 # PROVIDE: mountcritlocal
@@ -28,7 +28,7 @@
 	esac
 
 	# Mount everything except nfs filesystems.
-	echo -n 'Mounting local file systems:'
+	[ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:'
 	mount_excludes='no'
 	for i in ${netfs_types}; do
 		fstype=${i%:*}
@@ -37,7 +37,7 @@
 	mount_excludes=${mount_excludes%,}
 	mount -a -t ${mount_excludes}
 	err=$?
-	echo '.'
+	[ -z "${rc_quiet}" ] && echo '.'
 
 	case ${err} in
 	0)

==== //depot/projects/vap/etc/rc.d/nfsclient#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $
 #
 
 # PROVIDE: nfsclient
@@ -22,11 +22,15 @@
 	#
 
 	if [ -n "${nfs_access_cache}" ]; then
-		echo "NFS access cache time=${nfs_access_cache}"
-		sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null
+		[ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}"
+		if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then
+			warn "failed to set access cache timeout"
+		fi
 	fi
 	if [ -n "${nfs_bufpackets}" ]; then
-		 sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null
+		if ! sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null; then
+			warn "failed to set vfs.nfs.bufpackets"
+		fi
 	fi
 
 	unmount_all

==== //depot/projects/vap/etc/rc.d/savecore#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $
+# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $
 #
 
 # PROVIDE: savecore
@@ -17,11 +17,6 @@
 
 savecore_prestart()
 {
-	#	${DUMPDIR} should be a directory or a symbolic link
-	#	to the crash directory if core dumps are to be saved.
-	#
-	DUMPDIR="${dumpdir:-/var/crash}"
-
 	# Quit if we have no dump device
 	case ${dumpdev} in
 	[Nn][Oo] | '')
@@ -57,8 +52,19 @@
 
 savecore_start()
 {
-	if savecore -C >/dev/null; then
-		savecore ${savecore_flags} ${DUMPDIR} ${dumpdev}
+	local dev
+
+	case "${dumpdev}" in
+	[Aa][Uu][Tt][Oo])
+		dev=
+		;;
+	*)
+		dev="${dumpdev}"
+		;;
+	esac
+
+	if savecore -C "${dumpdir}" "${dev}" >/dev/null; then
+		savecore ${savecore_flags} ${dumpdir} ${dumpdev}
 	else
 		[ -z "${rc_quiet}" ] && echo "No core dumps found"
 	fi

==== //depot/projects/vap/etc/rc.d/statd#5 (text+ko) ====

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


More information about the p4-projects mailing list