PERFORCE change 74481 for review
Peter Wemm
peter at FreeBSD.org
Mon Apr 4 17:40:54 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=74481
Change 74481 by peter at peter_daintree on 2005/04/05 00:40:31
IFC @74479
Affected files ...
.. //depot/projects/hammer/etc/defaults/rc.conf#51 integrate
.. //depot/projects/hammer/etc/periodic/weekly/330.catman#2 integrate
.. //depot/projects/hammer/etc/rc.d/pf#7 integrate
.. //depot/projects/hammer/etc/rc.d/ugidfw#3 integrate
.. //depot/projects/hammer/include/Makefile#40 integrate
.. //depot/projects/hammer/include/pthread.h#7 integrate
.. //depot/projects/hammer/include/time.h#4 integrate
.. //depot/projects/hammer/lib/Makefile#48 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#19 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#20 integrate
.. //depot/projects/hammer/lib/libc/gen/errlst.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#18 integrate
.. //depot/projects/hammer/lib/libc/net/name6.c#14 integrate
.. //depot/projects/hammer/lib/libc/string/strcspn.c#2 integrate
.. //depot/projects/hammer/lib/libc/string/strspn.c#2 integrate
.. //depot/projects/hammer/lib/libdisk/change.c#6 integrate
.. //depot/projects/hammer/lib/libthr/Makefile#8 integrate
.. //depot/projects/hammer/lib/libthr/arch/alpha/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/_curthread.c#3 delete
.. //depot/projects/hammer/lib/libthr/arch/alpha/alpha/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/alpha/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_setcurthread.c#2 delete
.. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/arm/Makefile.inc#1 branch
.. //depot/projects/hammer/lib/libthr/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_curthread.S#4 delete
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#17 delete
.. //depot/projects/hammer/lib/libthr/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/ia64/ia64/_curthread.c#4 delete
.. //depot/projects/hammer/lib/libthr/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/powerpc/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/powerpc/powerpc/_curthread.c#2 delete
.. //depot/projects/hammer/lib/libthr/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/arch/sparc64/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/hammer/lib/libthr/arch/sparc64/sparc64/_setcurthread.c#3 delete
.. //depot/projects/hammer/lib/libthr/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/hammer/lib/libthr/pthread.map#1 branch
.. //depot/projects/hammer/lib/libthr/sys/Makefile.inc#2 integrate
.. //depot/projects/hammer/lib/libthr/sys/thr_error.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_atfork.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_barrier.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_barrierattr.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cancel.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_clean.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_concurrency.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_cond.c#12 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_condattr.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_condattr_destroy.c#2 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_condattr_init.c#2 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_create.c#14 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_detach.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#14 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_find_thread.c#4 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_getschedparam.c#3 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_info.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_init.c#15 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_join.c#10 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kern.c#12 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_kill.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_list.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_main_np.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mattr_init.c#2 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_mattr_kind_np.c#3 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#22 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex_prioceiling.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex_protocol.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_mutexattr_destroy.c#2 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_printf.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_private.h#23 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_pspinlock.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_resume_np.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_rwlock.c#6 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_self.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_seterrno.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_setschedparam.c#7 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_sigmask.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_single_np.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#2 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_spinlock.c#9 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#5 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_subr.c#2 delete
.. //depot/projects/hammer/lib/libthr/thread/thr_suspend_np.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_switch_np.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_symbols.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#8 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.c#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#1 branch
.. //depot/projects/hammer/lib/libthread_db/libthr_db.c#3 integrate
.. //depot/projects/hammer/libexec/rtld-elf/rtld.c#29 integrate
.. //depot/projects/hammer/release/Makefile#70 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#74 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#13 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#7 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#9 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#89 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#25 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate
.. //depot/projects/hammer/release/scripts/package-split.py#2 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#13 integrate
.. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.8#6 integrate
.. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.c#7 integrate
.. //depot/projects/hammer/sbin/growfs/Makefile#7 integrate
.. //depot/projects/hammer/sbin/restore/dirs.c#7 integrate
.. //depot/projects/hammer/sbin/restore/restore.h#6 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.8#5 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#11 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#67 integrate
.. //depot/projects/hammer/share/man/man4/arcmsr.4#1 branch
.. //depot/projects/hammer/share/man/man4/cpufreq.4#4 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#52 integrate
.. //depot/projects/hammer/share/man/man9/devclass_get_drivers.9#1 branch
.. //depot/projects/hammer/share/man/man9/devclass_get_maxunit.9#2 integrate
.. //depot/projects/hammer/sys/alpha/alpha/critical.c#4 delete
.. //depot/projects/hammer/sys/alpha/alpha/machdep.c#34 integrate
.. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#15 integrate
.. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#21 integrate
.. //depot/projects/hammer/sys/alpha/include/critical.h#6 delete
.. //depot/projects/hammer/sys/alpha/include/proc.h#4 integrate
.. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#10 integrate
.. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/critical.c#15 delete
.. //depot/projects/hammer/sys/amd64/amd64/db_disasm.c#9 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#120 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#86 integrate
.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#67 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#68 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#59 integrate
.. //depot/projects/hammer/sys/amd64/include/critical.h#22 delete
.. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/proc.h#15 integrate
.. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#6 integrate
.. //depot/projects/hammer/sys/arm/arm/critical.c#3 delete
.. //depot/projects/hammer/sys/arm/arm/machdep.c#12 integrate
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#10 integrate
.. //depot/projects/hammer/sys/arm/include/critical.h#3 delete
.. //depot/projects/hammer/sys/arm/include/proc.h#4 integrate
.. //depot/projects/hammer/sys/boot/pc98/boot2/Makefile#8 integrate
.. //depot/projects/hammer/sys/cam/cam_xpt.c#19 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#14 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#14 integrate
.. //depot/projects/hammer/sys/coda/coda_fbsd.c#17 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#23 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#9 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#27 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#28 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#27 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#27 integrate
.. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#8 integrate
.. //depot/projects/hammer/sys/conf/Makefile.alpha#9 integrate
.. //depot/projects/hammer/sys/conf/Makefile.amd64#17 integrate
.. //depot/projects/hammer/sys/conf/Makefile.arm#7 integrate
.. //depot/projects/hammer/sys/conf/Makefile.i386#7 integrate
.. //depot/projects/hammer/sys/conf/Makefile.ia64#9 integrate
.. //depot/projects/hammer/sys/conf/Makefile.pc98#7 integrate
.. //depot/projects/hammer/sys/conf/Makefile.powerpc#12 integrate
.. //depot/projects/hammer/sys/conf/Makefile.sparc64#8 integrate
.. //depot/projects/hammer/sys/conf/NOTES#85 integrate
.. //depot/projects/hammer/sys/conf/files#109 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#20 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#66 integrate
.. //depot/projects/hammer/sys/conf/files.arm#3 integrate
.. //depot/projects/hammer/sys/conf/files.i386#55 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#25 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#42 integrate
.. //depot/projects/hammer/sys/conf/files.powerpc#12 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#28 integrate
.. //depot/projects/hammer/sys/conf/kern.mk#20 integrate
.. //depot/projects/hammer/sys/conf/kern.post.mk#30 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#37 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#45 integrate
.. //depot/projects/hammer/sys/conf/majors#28 delete
.. //depot/projects/hammer/sys/conf/majors.awk#2 delete
.. //depot/projects/hammer/sys/conf/options#71 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#58 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#30 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#42 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#19 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#20 integrate
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#1 branch
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.h#1 branch
.. //depot/projects/hammer/sys/dev/asr/asr.c#16 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#44 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-card.c#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#10 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#52 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-commands.h#3 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#29 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.h#7 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#18 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-isa.c#11 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#26 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#28 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#27 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-queue.c#23 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.h#10 integrate
.. //depot/projects/hammer/sys/dev/ata/ata_if.m#1 branch
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#8 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#12 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-fd.h#6 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#15 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-tape.h#6 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate
.. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#29 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#8 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athrate.h#3 integrate
.. //depot/projects/hammer/sys/dev/ath/if_athvar.h#14 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#11 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwdev.c#17 integrate
.. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#3 integrate
.. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#4 integrate
.. //depot/projects/hammer/sys/dev/mlx/mlx.c#10 integrate
.. //depot/projects/hammer/sys/dev/mse/msevar.h#4 integrate
.. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#20 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#37 integrate
.. //depot/projects/hammer/sys/dev/pci/pcireg.h#7 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#11 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/snp/snp.c#18 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#17 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#14 integrate
.. //depot/projects/hammer/sys/dev/syscons/apm/apm_saver.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/ukbd.c#13 integrate
.. //depot/projects/hammer/sys/dev/vkbd/vkbd.c#5 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#11 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#31 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#7 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#13 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#24 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#25 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#14 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98.c#24 integrate
.. //depot/projects/hammer/sys/geom/geom_sunlabel_enc.c#5 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_lookup.c#11 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#36 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#65 integrate
.. //depot/projects/hammer/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/hammer/sys/i386/cpufreq/powernow.c#2 integrate
.. //depot/projects/hammer/sys/i386/i386/critical.c#7 delete
.. //depot/projects/hammer/sys/i386/i386/machdep.c#48 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#40 integrate
.. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#41 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#13 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#10 integrate
.. //depot/projects/hammer/sys/i386/include/apm_bios.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/bus.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/bus_at386.h#8 delete
.. //depot/projects/hammer/sys/i386/include/bus_pc98.h#6 delete
.. //depot/projects/hammer/sys/i386/include/critical.h#9 delete
.. //depot/projects/hammer/sys/i386/include/floatingpoint.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/legacyvar.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/md_var.h#13 integrate
.. //depot/projects/hammer/sys/i386/include/pci_cfgreg.h#8 integrate
.. //depot/projects/hammer/sys/i386/include/proc.h#8 integrate
.. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#11 integrate
.. //depot/projects/hammer/sys/ia64/ia64/critical.c#3 delete
.. //depot/projects/hammer/sys/ia64/ia64/machdep.c#49 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#10 integrate
.. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#27 integrate
.. //depot/projects/hammer/sys/ia64/include/critical.h#6 delete
.. //depot/projects/hammer/sys/ia64/include/proc.h#5 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#26 integrate
.. //depot/projects/hammer/sys/kern/imgact_gzip.c#8 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#32 integrate
.. //depot/projects/hammer/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/hammer/sys/kern/kern_fork.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_idle.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_lockf.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_ntptime.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#45 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#40 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#48 integrate
.. //depot/projects/hammer/sys/kern/kern_time.c#17 integrate
.. //depot/projects/hammer/sys/kern/subr_bus.c#38 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#22 integrate
.. //depot/projects/hammer/sys/kern/tty_pty.c#27 integrate
.. //depot/projects/hammer/sys/kern/tty_tty.c#10 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#47 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#12 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#38 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#14 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#53 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#79 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#33 integrate
.. //depot/projects/hammer/sys/libkern/strspn.c#2 integrate
.. //depot/projects/hammer/sys/modules/Makefile#72 integrate
.. //depot/projects/hammer/sys/modules/arcmsr/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/Makefile.inc#1 branch
.. //depot/projects/hammer/sys/modules/ata/ata/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atacam/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atacard/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atacbus/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atadisk/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/ataisa/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atapci/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atapicd/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atapifd/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/atapist/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ata/ataraid/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/cpufreq/Makefile#4 integrate
.. //depot/projects/hammer/sys/net/bpf.c#30 integrate
.. //depot/projects/hammer/sys/net/if_tap.c#21 integrate
.. //depot/projects/hammer/sys/net/if_tun.c#24 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#3 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_input.c#17 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_node.h#13 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#8 integrate
.. //depot/projects/hammer/sys/netgraph/ng_iface.c#18 integrate
.. //depot/projects/hammer/sys/netinet/ip_carp.c#4 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#19 integrate
.. //depot/projects/hammer/sys/netsmb/smb_dev.c#11 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#20 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_node.c#19 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#40 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#31 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#38 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#42 integrate
.. //depot/projects/hammer/sys/pc98/include/_inttypes.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/_limits.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/_stdint.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/_types.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/apm_bios.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/apm_segments.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/asm.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/asmacros.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/atomic.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bootinfo.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bus.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bus_dma.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bus_memio.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bus_pio.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/clock.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/cpu.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/cpufunc.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/cputypes.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/cserial.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/db_machdep.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/elf.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/endian.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/exec.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/float.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/floatingpoint.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/frame.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/gdb_machdep.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_cause.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_debug.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_ioctl.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_rbch_ioctl.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_tel_ioctl.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/i4b_trace.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/ieeefp.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/in_cksum.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/intr_machdep.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/iodev.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/kdb.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/legacyvar.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/limits.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/md_var.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/memdev.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/metadata.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/mp_watchdog.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/mptable.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/mutex.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/npx.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/param.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pc/bios.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pc/display.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pc/vesa.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pcaudio.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pcb.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pcb_ext.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pci_cfgreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pcpu.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pecoff_machdep.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/perfmon.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pmap.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/privatespace.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/proc.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/profile.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/psl.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/ptrace.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/pvct_ioctl.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/reg.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/reloc.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/resource.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/runq.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/segments.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/setjmp.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/sf_buf.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/sigframe.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/signal.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/smapi.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/smp.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/speaker.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/specialreg.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/stdarg.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/sysarch.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/trap.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/tss.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/ucontext.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/varargs.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/vm86.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/vmparam.h#1 branch
.. //depot/projects/hammer/sys/pc98/linux/linux.h#1 branch
.. //depot/projects/hammer/sys/pc98/linux/linux_ipc64.h#1 branch
.. //depot/projects/hammer/sys/pc98/linux/linux_proto.h#1 branch
.. //depot/projects/hammer/sys/pci/agp_amd64.c#6 integrate
.. //depot/projects/hammer/sys/pci/agp_nvidia.c#5 integrate
.. //depot/projects/hammer/sys/pci/if_ti.c#28 integrate
.. //depot/projects/hammer/sys/posix4/p1003_1b.c#6 integrate
.. //depot/projects/hammer/sys/powerpc/include/critical.h#6 delete
.. //depot/projects/hammer/sys/powerpc/include/proc.h#2 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#7 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#11 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/critical.c#4 delete
.. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#35 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#23 integrate
.. //depot/projects/hammer/sys/powerpc/psim/ata_iobus.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/include/critical.h#6 delete
.. //depot/projects/hammer/sys/sparc64/include/proc.h#4 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/critical.c#3 delete
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#39 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#14 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#21 integrate
.. //depot/projects/hammer/sys/sys/ata.h#9 integrate
.. //depot/projects/hammer/sys/sys/bus.h#18 integrate
.. //depot/projects/hammer/sys/sys/conf.h#32 integrate
.. //depot/projects/hammer/sys/sys/errno.h#6 integrate
.. //depot/projects/hammer/sys/sys/lock.h#7 integrate
.. //depot/projects/hammer/sys/sys/lockmgr.h#9 integrate
.. //depot/projects/hammer/sys/sys/mman.h#8 integrate
.. //depot/projects/hammer/sys/sys/mutex.h#17 integrate
.. //depot/projects/hammer/sys/sys/namei.h#9 integrate
.. //depot/projects/hammer/sys/sys/proc.h#77 integrate
.. //depot/projects/hammer/sys/sys/shm.h#6 integrate
.. //depot/projects/hammer/sys/sys/sun_disklabel.h#9 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#18 integrate
.. //depot/projects/hammer/sys/sys/systm.h#33 integrate
.. //depot/projects/hammer/sys/sys/time.h#9 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#51 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#11 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#15 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#36 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#27 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#48 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#34 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#18 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#12 integrate
.. //depot/projects/hammer/sys/vm/vm.h#6 integrate
.. //depot/projects/hammer/sys/vm/vm_extern.h#15 integrate
.. //depot/projects/hammer/sys/vm/vm_meter.c#16 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#31 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#53 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#22 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#33 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-rem.t#1 branch
.. //depot/projects/hammer/tools/tools/ath/80211watch.c#2 integrate
.. //depot/projects/hammer/tools/tools/ath/athstats.c#6 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#10 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#33 integrate
.. //depot/projects/hammer/usr.bin/find/find.1#15 integrate
.. //depot/projects/hammer/usr.bin/find/misc.c#3 integrate
.. //depot/projects/hammer/usr.bin/make/arch.c#17 integrate
.. //depot/projects/hammer/usr.bin/make/arch.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/buf.c#10 integrate
.. //depot/projects/hammer/usr.bin/make/cond.c#17 integrate
.. //depot/projects/hammer/usr.bin/make/cond.h#2 integrate
.. //depot/projects/hammer/usr.bin/make/globals.h#3 integrate
.. //depot/projects/hammer/usr.bin/make/job.c#24 integrate
.. //depot/projects/hammer/usr.bin/make/job.h#13 integrate
.. //depot/projects/hammer/usr.bin/make/lst.c#4 integrate
.. //depot/projects/hammer/usr.bin/make/main.c#31 integrate
.. //depot/projects/hammer/usr.bin/make/make.1#20 integrate
.. //depot/projects/hammer/usr.bin/make/make.c#13 integrate
.. //depot/projects/hammer/usr.bin/make/parse.c#27 integrate
.. //depot/projects/hammer/usr.bin/make/parse.h#2 integrate
.. //depot/projects/hammer/usr.bin/make/str.c#13 integrate
.. //depot/projects/hammer/usr.bin/make/targ.c#14 integrate
.. //depot/projects/hammer/usr.bin/make/util.h#4 integrate
.. //depot/projects/hammer/usr.bin/make/var.c#26 integrate
.. //depot/projects/hammer/usr.bin/make/var_modify.c#9 integrate
.. //depot/projects/hammer/usr.bin/mt/mt.1#8 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#11 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#62 integrate
.. //depot/projects/hammer/usr.sbin/config/config.h#7 integrate
.. //depot/projects/hammer/usr.sbin/config/config.y#9 integrate
.. //depot/projects/hammer/usr.sbin/config/configvers.h#6 integrate
.. //depot/projects/hammer/usr.sbin/config/main.c#7 integrate
.. //depot/projects/hammer/usr.sbin/memcontrol/memcontrol.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mtree/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/mtree/compare.c#9 integrate
.. //depot/projects/hammer/usr.sbin/mtree/create.c#9 integrate
.. //depot/projects/hammer/usr.sbin/mtree/misc.c#5 integrate
.. //depot/projects/hammer/usr.sbin/mtree/mtree.8#12 integrate
.. //depot/projects/hammer/usr.sbin/mtree/mtree.h#3 integrate
.. //depot/projects/hammer/usr.sbin/mtree/spec.c#6 integrate
.. //depot/projects/hammer/usr.sbin/mtree/specspec.c#5 integrate
.. //depot/projects/hammer/usr.sbin/mtree/test/test03.sh#2 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#16 integrate
Differences ...
==== //depot/projects/hammer/etc/defaults/rc.conf#51 (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.243 2005/03/12 21:09:15 trhodes Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.244 2005/04/03 21:45:20 njl Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -474,9 +474,9 @@
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
performance_cx_lowest="HIGH" # Online CPU idle state
-performance_cpu_freq="NONE" # Online CPU frequency
+performance_cpu_freq="HIGH" # Online CPU frequency
economy_cx_lowest="HIGH" # Offline CPU idle state
-economy_cpu_freq="NONE" # Offline CPU frequency
+economy_cpu_freq="HIGH" # Offline CPU frequency
virecover_enable="YES" # Perform housekeeping for the vi(1) editor
ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot
bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4)
==== //depot/projects/hammer/etc/periodic/weekly/330.catman#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.9 2002/03/05 19:13:05 cjc Exp $
+# $FreeBSD: src/etc/periodic/weekly/330.catman,v 1.10 2005/03/30 18:02:49 ru Exp $
#
# If there is a global system configuration file, suck it in.
@@ -34,7 +34,7 @@
rc=0
# Preformat original, non-localized manpages
- echo /usr/libexec/catman.local "$MANPATH" |
+ echo /usr/libexec/catman.local -r "$MANPATH" |
su -fm man || rc=3
# Preformat localized manpages.
@@ -42,7 +42,7 @@
then
for i in $man_locales
do
- echo /usr/libexec/catman.local -L \
+ echo /usr/libexec/catman.local -Lr \
"$MANPATH" | LC_ALL=$i su -fm man || rc=3
done
fi
==== //depot/projects/hammer/etc/rc.d/pf#7 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/pf,v 1.6 2004/10/25 08:12:28 pjd Exp $
+# $FreeBSD: src/etc/rc.d/pf,v 1.7 2005/04/04 23:06:10 seanc Exp $
#
# PROVIDE: pf
@@ -75,7 +75,9 @@
echo "Reloading pf rules."
${pf_program:-/sbin/pfctl} -n -f "${pf_rules}" || return 1
- ${pf_program:-/sbin/pfctl} -Fa > /dev/null 2>&1
+ # Flush everything but existing state entries that way when
+ # rules are read in, it doesn't break established connections.
+ ${pf_program:-/sbin/pfctl} -Fnat -Fqueue -Frules -FSources -Finfo -FTables -Fosfp > /dev/null 2>&1
${pf_program:-/sbin/pfctl} -f "${pf_rules}" ${pf_flags}
}
==== //depot/projects/hammer/etc/rc.d/ugidfw#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ugidfw,v 1.2 2004/10/14 04:37:57 trhodes Exp $
+# $FreeBSD: src/etc/rc.d/ugidfw,v 1.3 2005/04/02 00:01:03 trhodes Exp $
# PROVIDE: ugidfw
# REQUIRE:
@@ -15,6 +15,14 @@
start_precmd="ugidfw_precmd"
stop_cmd="ugidfw_stop"
+ugidfw_load()
+{
+ if [ -r "${bsdextended_script}" ]; then
+ . "${bsdextended_script}"
+ echo -n " ${_bsdextended_profile}"
+ fi
+}
+
ugidfw_precmd()
{
if ! sysctl security.mac.bsdextended
@@ -31,13 +39,19 @@
ugidfw_start()
{
- # set the default policy script if none was specified
- [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended
+ # check for existing profiles and set the default policy script
+ # if none was specified
+ [ -z "${bsdextended_profiles}" ] && {
+ bsdextended_profiles=default
+ [ -z "${bsdextended_script}" ] && bsdextended_script=/etc/rc.bsdextended
+ bsdextended_default_script=/etc/rc.bsdextended
+ }
- if [ -r "${bsdextended_script}" ]; then
- . "${bsdextended_script}"
- echo -n 'MAC bsdextended rules loaded sucessfully.'
- fi
+ echo -n "Loading MAC bsdextended rules:"
+ for _bsdextended_profile in ${bsdextended_profiles}; do
+ eval bsdextended_script=\"\$bsdextended_${_bsdextended_profile}_script\"
+ ugidfw_load
+ done
echo '.'
}
==== //depot/projects/hammer/include/Makefile#40 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.237 2005/03/11 17:24:46 ume Exp $
+# $FreeBSD: src/include/Makefile,v 1.239 2005/04/03 04:53:23 imp Exp $
#
# Doing a "make install" builds /usr/include.
@@ -87,6 +87,10 @@
INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i
.endfor
+.if ${MACHINE} != ${MACHINE_ARCH}
+_MARCH=${MACHINE_ARCH}
+.endif
+
.include <bsd.prog.mk>
installincludes: ${SHARED}
@@ -94,7 +98,7 @@
# Take care of stale directory-level symlinks.
compat:
-.for i in ${LDIRS} ${LSUBDIRS} machine crypto
+.for i in ${LDIRS} ${LSUBDIRS} machine ${_MARCH} crypto
if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \
rm -f ${DESTDIR}${INCLUDEDIR}/$i; \
fi
@@ -109,7 +113,8 @@
.endif
copies:
-.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \
+ ${_MARCH}
.if exists(${DESTDIR}${INCLUDEDIR}/$i)
cd ${DESTDIR}${INCLUDEDIR}/$i; \
for h in *.h; do \
@@ -143,14 +148,28 @@
cd ${.CURDIR}/../sys/opencrypto; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/crypto
- cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
+ cd ${.CURDIR}/../sys/${MACHINE}/include; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/machine
-.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc)
- cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \
+.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
+ cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/machine/pc
.endif
+.if defined(_MARCH)
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
+ cd ${.CURDIR}/../sys/${_MARCH}/include; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}
+.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
+ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc
+.endif
+.endif
symlinks:
@${ECHO} "Setting up symlinks to kernel source tree..."
@@ -207,15 +226,33 @@
ln -fs ../../../sys/opencrypto/$$h \
${DESTDIR}${INCLUDEDIR}/crypto; \
done
- cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
+ cd ${.CURDIR}/../sys/${MACHINE}/include; \
for h in *.h; do \
- ln -fs ../../../sys/${MACHINE_ARCH}/include/$$h \
+ ln -fs ../../../sys/${MACHINE}/include/$$h \
${DESTDIR}${INCLUDEDIR}/machine; \
done
-.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc)
- cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \
+.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
+ cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
for h in *.h; do \
- ln -fs ../../../../sys/${MACHINE_ARCH}/include/pc/$$h \
+ ln -fs ../../../../sys/${MACHINE}/include/pc/$$h \
${DESTDIR}${INCLUDEDIR}/machine/pc; \
done
.endif
+.if defined(_MARCH)
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
+ cd ${.CURDIR}/../sys/${_MARCH}/include; \
+ for h in *.h; do \
+ ln -fs ../../../sys/${_MARCH}/include/$$h \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
+ done
+.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
+ ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
+ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
+ for h in *.h; do \
+ ln -fs ../../../../sys/${_MARCH}/include/pc/$$h \
+ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
+ done
+.endif
+.endif
==== //depot/projects/hammer/include/pthread.h#7 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread.h,v 1.33 2005/01/08 11:07:13 davidxu Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.34 2005/04/03 23:55:02 davidxu Exp $
*/
#ifndef _PTHREAD_H_
#define _PTHREAD_H_
@@ -225,6 +225,10 @@
void pthread_cleanup_push(void (*) (void *), void *routine_arg);
int pthread_condattr_destroy(pthread_condattr_t *);
int pthread_condattr_init(pthread_condattr_t *);
+int pthread_condattr_getclock(const pthread_condattr_t *,
+ clockid_t *);
+int pthread_condattr_setclock(pthread_condattr_t *,
+ clockid_t);
int pthread_cond_broadcast(pthread_cond_t *);
int pthread_cond_destroy(pthread_cond_t *);
==== //depot/projects/hammer/include/time.h#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
/*
- * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $
+ * $FreeBSD: src/include/time.h,v 1.32 2005/04/02 12:33:27 das Exp $
*/
#ifndef _TIME_H_
@@ -92,6 +92,23 @@
#include <sys/timespec.h>
#endif /* __POSIX_VISIBLE >= 199309 */
+/* These macros are also in sys/time.h. */
+#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112
+#define CLOCK_REALTIME 0
+#ifdef __BSD_VISIBLE
+#define CLOCK_VIRTUAL 1
+#define CLOCK_PROF 2
+#endif
+#define CLOCK_MONOTONIC 4
+#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
+
+#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112
+#if __BSD_VISIBLE
+#define TIMER_RELTIME 0x0 /* relative timer */
+#endif
+#define TIMER_ABSTIME 0x1 /* absolute timer */
+#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 */
+
struct tm {
int tm_sec; /* seconds after the minute [0-60] */
int tm_min; /* minutes after the hour [0-59] */
@@ -115,6 +132,7 @@
clock_t clock(void);
char *ctime(const time_t *);
double difftime(time_t, time_t);
+/* XXX missing: getdate() */
struct tm *gmtime(const time_t *);
struct tm *localtime(const time_t *);
time_t mktime(struct tm *);
@@ -130,6 +148,7 @@
int clock_getres(clockid_t, struct timespec *);
int clock_gettime(clockid_t, struct timespec *);
int clock_settime(clockid_t, const struct timespec *);
+/* XXX missing: clock_nanosleep() */
int nanosleep(const struct timespec *, struct timespec *);
#endif /* __POSIX_VISIBLE >= 199309 */
@@ -146,7 +165,7 @@
#endif
#if __BSD_VISIBLE
-char *timezone(int, int);
+char *timezone(int, int); /* XXX XSI conflict */
void tzsetwall(void);
time_t timelocal(struct tm * const);
time_t timegm(struct tm * const);
==== //depot/projects/hammer/lib/Makefile#48 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.201 2005/02/06 16:45:57 phk Exp $
+# $FreeBSD: src/lib/Makefile,v 1.203 2005/04/02 01:40:12 davidxu Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -96,12 +96,12 @@
_libpthread= libpthread
.endif
-.if ${MACHINE_ARCH} != "arm" && !defined(NO_LIBTHR)
-_libthr= libthr
+.if !defined(NO_LIBTHR)
+_libthr= libthr
.endif
.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
-_libthread_db= libthread_db
+_libthread_db= libthread_db
.endif
.if !defined(NO_USB)
==== //depot/projects/hammer/lib/libarchive/Makefile#19 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.31 2005/03/13 02:53:42 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $
#
# Use "make distfile" to build a conventional tar.gz archive
@@ -7,7 +7,7 @@
LIB= archive
-VERSION= 1.02.013
+VERSION= 1.02.016
ARCHIVE_API_FEATURE= 2
ARCHIVE_API_VERSION= 1
SHLIB_MAJOR= ${ARCHIVE_API_VERSION}
==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#20 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.37 2005/03/13 02:53:42 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $");
#include <sys/types.h>
#ifdef HAVE_SYS_ACL_H
@@ -185,15 +185,16 @@
/*
* If pathname is longer than PATH_MAX, record starting directory
- * and move to a suitable intermediate dir.
+ * and chdir to a suitable intermediate dir.
*/
if (strlen(archive_entry_pathname(entry)) > PATH_MAX) {
+ char *intdir, *tail;
+
/*
* Yes, the copy here is necessary because we edit
* the pathname in-place to create intermediate dirnames.
*/
original_filename = strdup(archive_entry_pathname(entry));
- char *intdir, *tail;
restore_pwd = open(".", O_RDONLY);
/*
@@ -203,28 +204,28 @@
intdir = tail = original_filename;
while (strlen(tail) > PATH_MAX) {
intdir = tail;
+
+ /* Locate a dir prefix shorter than PATH_MAX. */
tail = intdir + PATH_MAX - 8;
while (tail > intdir && *tail != '/')
tail--;
if (tail <= intdir) {
- close(restore_pwd);
archive_set_error(a, EPERM,
"Path element too long");
- return (ARCHIVE_WARN);
+ ret = ARCHIVE_WARN;
+ goto cleanup;
}
+
+ /* Create intdir and chdir to it. */
*tail = '\0'; /* Terminate dir portion */
- if (create_dir(a, intdir, flags) != ARCHIVE_OK) {
- fchdir(restore_pwd);
- close(restore_pwd);
- return (ARCHIVE_WARN);
- }
- if (chdir(intdir) != 0) {
+ ret = create_dir(a, intdir, flags);
+ if (ret == ARCHIVE_OK && chdir(intdir) != 0) {
archive_set_error(a, errno, "Couldn't chdir");
- fchdir(restore_pwd);
- close(restore_pwd);
- return (ARCHIVE_WARN);
+ ret = ARCHIVE_WARN;
}
*tail = '/'; /* Restore the / we removed. */
+ if (ret != ARCHIVE_OK)
+ goto cleanup;
tail++;
}
archive_entry_set_pathname(entry, tail);
@@ -266,9 +267,12 @@
}
}
+
+cleanup:
/* If we changed directory above, restore it here. */
if (restore_pwd >= 0 && original_filename != NULL) {
fchdir(restore_pwd);
+ close(restore_pwd);
archive_entry_copy_pathname(entry, original_filename);
free(original_filename);
}
==== //depot/projects/hammer/lib/libc/gen/errlst.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)errlst.c 8.2 (Berkeley) 11/16/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.7 2002/10/09 08:04:24 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list