Date: Sun, 28 Oct 2007 02:53:37 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 128222 for review Message-ID: <200710280253.l9S2rbmW001134@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=128222 Change 128222 by kmacy@kmacy_home:ethng on 2007/10/28 02:53:30 IFC #128215 Affected files ... .. //depot/projects/ethng/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/ethng/src/UPDATING#6 integrate .. //depot/projects/ethng/src/bin/ps/extern.h#2 integrate .. //depot/projects/ethng/src/bin/ps/keyword.c#2 integrate .. //depot/projects/ethng/src/bin/ps/print.c#3 integrate .. //depot/projects/ethng/src/bin/ps/ps.c#3 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/ethng/src/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/ethng/src/etc/rc.d/amd#3 integrate .. //depot/projects/ethng/src/etc/rc.d/named#2 integrate .. //depot/projects/ethng/src/etc/rc.d/nfslocking#3 delete .. //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/ethng/src/include/_ctype.h#3 integrate .. //depot/projects/ethng/src/lib/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/ethng/src/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/ethng/src/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/elf_update.3#3 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/ethng/src/lib/libelf/gelf_newphdr.3#3 integrate .. //depot/projects/ethng/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/ethng/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/ethng/src/lib/libstand/Makefile#3 integrate .. //depot/projects/ethng/src/lib/libthr/libthr.3#2 integrate .. //depot/projects/ethng/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/gpt/Makefile#2 integrate .. //depot/projects/ethng/src/sbin/gpt/add.c#2 integrate .. //depot/projects/ethng/src/sbin/gpt/boot.c#1 branch .. //depot/projects/ethng/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/ethng/src/sbin/gpt/gpt.c#2 integrate .. //depot/projects/ethng/src/sbin/gpt/gpt.h#2 integrate .. //depot/projects/ethng/src/sbin/gpt/show.c#2 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/ethng/src/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr_get_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_barrier_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_barrierattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cleanup_pop.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cleanup_push.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_broadcast.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_signal.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_cond_wait.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_create.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_detach.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_equal.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_exit.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_getconcurrency.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_getspecific.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_key_create.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_key_delete.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_kill.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_main_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_multi_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_lock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_timedlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_trylock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutex_unlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutexattr.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_once.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_resume_all_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_resume_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_rdlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_unlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_destroy.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_getpshared.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_schedparam.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_self.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_set_name_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_setspecific.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_sigmask.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_spin_init.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_spin_lock.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_testcancel.3#2 integrate .. //depot/projects/ethng/src/share/man/man3/pthread_yield.3#2 integrate .. //depot/projects/ethng/src/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#6 integrate .. //depot/projects/ethng/src/share/man/man9/kproc.9#2 integrate .. //depot/projects/ethng/src/share/man/man9/kthread.9#3 integrate .. //depot/projects/ethng/src/share/misc/committers-doc.dot#2 integrate .. //depot/projects/ethng/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/ethng/src/share/mk/sys.mk#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/ethng/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/ethng/src/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/ethng/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/ethng/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/ethng/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/ethng/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/ethng/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/ethng/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/ethng/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/ethng/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/ethng/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/ethng/src/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/ethng/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/ethng/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/ethng/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/ethng/src/sys/conf/files#8 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#7 integrate .. //depot/projects/ethng/src/sys/conf/files.arm#2 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#5 integrate .. //depot/projects/ethng/src/sys/conf/files.ia64#2 integrate .. //depot/projects/ethng/src/sys/conf/files.pc98#2 integrate .. //depot/projects/ethng/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/ethng/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/ethng/src/sys/conf/options.arm#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/ethng/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/ethng/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/ethng/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/ethng/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/ethng/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/ethng/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/ethng/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/ethng/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/ethng/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.h#3 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/ethng/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/ethng/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/ethng/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/ethng/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/ethng/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/ethng/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/ethng/src/sys/kern/init_main.c#5 integrate .. //depot/projects/ethng/src/sys/kern/kern_acct.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/ethng/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/ethng/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/ethng/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/ethng/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/ethng/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/ethng/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/ethng/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/ethng/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/ethng/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/ethng/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/ethng/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/ethng/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/ethng/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/ethng/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/modules/Makefile#6 integrate .. //depot/projects/ethng/src/sys/modules/geom/Makefile#2 integrate .. //depot/projects/ethng/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/ethng/src/sys/net/bpf.c#4 integrate .. //depot/projects/ethng/src/sys/net/bsd_comp.c#2 integrate .. //depot/projects/ethng/src/sys/net/if.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_disc.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/ethng/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_gif.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_loop.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/ethng/src/sys/net/if_stf.c#3 integrate .. //depot/projects/ethng/src/sys/net/if_tun.c#2 integrate .. //depot/projects/ethng/src/sys/net/route.c#8 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/ethng/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/ethng/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/ethng/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/ethng/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/ethng/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/ethng/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/ethng/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/ethng/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/ethng/src/sys/sys/gpt.h#3 integrate .. //depot/projects/ethng/src/sys/sys/kthread.h#3 integrate .. //depot/projects/ethng/src/sys/sys/linker.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#7 integrate .. //depot/projects/ethng/src/sys/sys/pciio.h#3 integrate .. //depot/projects/ethng/src/sys/sys/priv.h#2 integrate .. //depot/projects/ethng/src/sys/sys/proc.h#4 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/ethng/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/ethng/src/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/init-a.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/init.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-copy.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-data.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/integrity-hmac.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/onetime-a.t#3 integrate .. //depot/projects/ethng/src/tools/regression/geom_eli/onetime.t#3 integrate .. //depot/projects/ethng/src/usr.bin/awk/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/ethng/src/usr.bin/awk/tran.c.diff#2 delete .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/ethng/src/usr.bin/top/machine.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/traceroute6/traceroute6.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/hostapd/hostapd.8#2 integrate Differences ... ==== //depot/projects/ethng/src/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd +OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached @@ -579,11 +581,17 @@ # 20070201: remove libmytinfo link OLD_FILES+=usr/lib/libmytinfo.a OLD_FILES+=usr/lib/libmytinfo.so -OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfo_p.a +OLD_FILES+=usr/lib/libmytinfow.a +OLD_FILES+=usr/lib/libmytinfow.so +OLD_FILES+=usr/lib/libmytinfow_p.a .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a +OLD_FILES+=usr/lib32/libmytinfow.a +OLD_FILES+=usr/lib32/libmytinfow.so +OLD_FILES+=usr/lib32/libmytinfow_p.a .endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig ==== //depot/projects/ethng/src/UPDATING#6 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20071024: + It has been decided that it is desirable to provide ABI + backwards compatibility to the FreeBSD 4/5/6 versions of the + PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs, which was + broken with the introduction of PCI domain support (see the + 20070930 entry). Unfortunately, this required the ABI of + PCIOCGETCONF to be broken again in order to be able to + provide backwards compatibility to the old version of that + IOCTL. Thus consumers of PCIOCGETCONF have to be recompiled + again. As for prominent ports this affects neither pciutils + nor xorg-server this time, the hal port needs to be rebuilt + however. + 20071020: The misnamed kthread_create() and friends have been renamed to kproc_create() etc. Many of the callers already @@ -921,4 +934,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.510 2007/10/21 04:27:07 julian Exp $ +$FreeBSD: src/UPDATING,v 1.511 2007/10/24 20:51:43 marius Exp $ ==== //depot/projects/ethng/src/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ */ struct kinfo; @@ -39,7 +39,7 @@ extern int cflag, eval, fscale, nlistread, rawcpu; extern unsigned long mempages; extern time_t now; -extern int sumrusage, termwidth, totwidth; +extern int showthreads, sumrusage, termwidth, totwidth; extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS @@ -78,6 +78,7 @@ void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); ==== //depot/projects/ethng/src/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.76 2006/04/06 03:24:31 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.77 2007/10/26 08:00:40 julian Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -187,6 +187,8 @@ UINT, UIDFMT, 0}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, + {"tdnam", "THRDNAME", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, + NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, ==== //depot/projects/ethng/src/bin/ps/print.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.96 2007/10/26 08:00:40 julian Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -129,9 +129,11 @@ v = ve->var; if (cflag) { /* If it is the last field, then don't pad */ - if (STAILQ_NEXT(ve, next_ve) == NULL) + if (STAILQ_NEXT(ve, next_ve) == NULL) { (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); return; } @@ -178,13 +180,28 @@ VAR *v; v = ve->var; - if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); - else + if (showthreads && k->ki_p->ki_numthreads > 1) + printf("/%s", k->ki_p->ki_ocomm); + } else (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void +tdnam(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + if (showthreads && k->ki_p->ki_numthreads > 1) + (void)printf("%-*s", v->width, k->ki_p->ki_ocomm); + else + (void)printf("%-*s", v->width, " " ); + +} + +void logname(KINFO *k, VARENT *ve) { VAR *v; ==== //depot/projects/ethng/src/bin/ps/ps.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.112 2007/10/26 08:00:40 julian Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -98,6 +98,7 @@ int sumrusage; /* -S */ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ +int showthreads; /* will threads be shown? */ struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); @@ -175,7 +176,7 @@ char *cols; int all, ch, elem, flag, _fmt, i, lineno; int nentries, nkept, nselectors; - int prtheader, showthreads, wflag, what, xkeep, xkeep_implied; + int prtheader, wflag, what, xkeep, xkeep_implied; char errbuf[_POSIX2_LINE_MAX]; (void) setlocale(LC_ALL, ""); ==== //depot/projects/ethng/src/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,14 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Oct 23, 2007: + minor fix in lib.c: increase inputFS to 100, change malloc + for fields to n+1. + + fixed memory fault caused by out of order test in setsval. + + thanks to david o'brien, freebsd, for both fixes. + May 1, 2007: fiddle in makefile to fix for BSD make; thanks to igor sobrado. ==== //depot/projects/ethng/src/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.10 2007/06/05 15:34:40 rafan Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.11 2007/10/25 12:38:34 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). -Original sources were taken from the Brian Kernighan's home page -(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -May 01, 2007. +Original sources were taken from the Brian Kernighan's AWK page +http://www.cs.princeton.edu/~bwk/btl.mirror +and include bug fixes up thru Oct 23, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20071023 ==== //depot/projects/ethng/src/contrib/one-true-awk/lib.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ int fieldssize = RECSIZE; Cell **fldtab; /* pointers to Cells */ -char inputFS[10] = " "; +char inputFS[100] = " "; #define MAXFLD 2 int nfields = MAXFLD; /* last allocated slot for $i */ @@ -58,7 +58,7 @@ void recinit(unsigned int n) { if ( (record = (char *) malloc(n)) == NULL - || (fields = (char *) malloc(n)) == NULL + || (fields = (char *) malloc(n+1)) == NULL || (fldtab = (Cell **) malloc((nfields+1) * sizeof(Cell *))) == NULL || (fldtab[0] = (Cell *) malloc(sizeof(Cell))) == NULL ) FATAL("out of space for $0 and fields"); ==== //depot/projects/ethng/src/contrib/one-true-awk/tran.c#2 (text+ko) ==== @@ -332,10 +332,10 @@ donerec = 1; } t = tostring(s); /* in case it's self-assign */ + if (freeable(vp)) + xfree(vp->sval); vp->tval &= ~NUM; vp->tval |= STR; - if (freeable(vp)) - xfree(vp->sval); vp->tval &= ~DONTFREE; dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) ); ==== //depot/projects/ethng/src/etc/rc.d/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.86 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ .include <bsd.own.mk> @@ -25,7 +25,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/ethng/src/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.19 2007/10/19 22:55:42 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ # # PROVIDE: amd @@ -47,7 +47,7 @@ ;; *) rc_flags="-p ${rc_flags}" - command_args=" > /var/run/amd.pid 2> /dev/null" + command_args="> /var/run/amd.pid 2> /dev/null" ;; esac return 0 ==== //depot/projects/ethng/src/etc/rc.d/named#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/named,v 1.26 2006/04/20 12:30:12 delphij Exp $ +# $FreeBSD: src/etc/rc.d/named,v 1.27 2007/10/22 09:38:44 dougb Exp $ # # PROVIDE: named @@ -82,20 +82,28 @@ named_reload() { - rndc reload + ${command%/named}/rndc reload } named_stop() { - echo -n "Stopping named" - if rndc stop 2>/dev/null; then - echo . + # This duplicates an undesirably large amount of code from the stop + # routine in rc.subr in order to use rndc to shut down the process, + # and to give it a second chance in case rndc fails. + rc_pid=$(check_pidfile $pidfile $command) + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping named.' + if ${command%/named}/rndc stop 2>/dev/null; then + wait_for_pids $rc_pid else - echo -n ": rndc failed, trying killall: " - if killall named; then - echo . - fi - fi + echo -n 'rndc failed, trying kill: ' + kill -TERM $rc_pid + wait_for_pids $rc_pid + fi } named_poststop() @@ -121,13 +129,13 @@ if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then return 0 fi - confgen_command="rndc-confgen -a -b256 -u $named_uid \ + confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then - if [ ! `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` = \ - "$named_uid" ]; then - $confgen_command - fi + case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in + root|$named_uid) ;; + *) $confgen_command ;; + esac else $confgen_command fi ==== //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.60 2007/10/15 08:06:42 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.61 2007/10/22 10:01:58 ru Exp $ .\" .\" %beginstrip% . @@ -48,6 +48,7 @@ .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) .ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) .ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) +.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) .ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) .ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) .ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) ==== //depot/projects/ethng/src/include/_ctype.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + return (_c & ~0x7F) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/ethng/src/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.224 2007/10/09 23:31:10 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.225 2007/10/26 11:07:25 ru Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ # built are visible: # # csu must be built before all shared libaries for ELF. -# libc must be built before all other shared libraries +# libc must be built before all other shared libraries. # libcom_err must be built before libkrb5 and libpam. # libcrypt must be built before libkrb5 and libpam. # libkvm must be built before libdevstat. ==== //depot/projects/ethng/src/lib/libarchive/archive_read_support_compression_none.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.17 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_none.c,v 1.18 2007/10/27 22:45:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -334,7 +334,7 @@ const void* dummy_buffer; ssize_t bytes_read; bytes_read = archive_decompressor_none_read_ahead(a, - &dummy_buffer, request); + &dummy_buffer, 1); if (bytes_read < 0) return (bytes_read); if (bytes_read == 0) { ==== //depot/projects/ethng/src/lib/libarchive/archive_read_support_format_tar.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.61 2007/08/18 21:53:25 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.62 2007/10/24 04:01:31 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -164,6 +164,7 @@ struct sparse_block *sparse_last; int64_t sparse_offset; int64_t sparse_numbytes; + int64_t sparse_realsize; int sparse_gnu_major; int sparse_gnu_minor; char sparse_gnu_pending; @@ -440,6 +441,7 @@ free(sp); } tar->sparse_last = NULL; + tar->sparse_realsize = -1; /* Mark this as "unset" */ r = tar_read_header(a, tar, entry); @@ -1388,9 +1390,10 @@ } if (wcscmp(key, L"GNU.sparse.name") == 0) archive_entry_copy_pathname_w(entry, value); - if (wcscmp(key, L"GNU.sparse.realsize") == 0) - archive_entry_set_size(entry, - tar_atol10(value, wcslen(value))); + if (wcscmp(key, L"GNU.sparse.realsize") == 0) { + tar->sparse_realsize = tar_atol10(value, wcslen(value)); + archive_entry_set_size(entry, tar->sparse_realsize); + } break; case 'L': /* Our extensions */ @@ -1471,11 +1474,22 @@ /* POSIX has reserved 'security.*' */ /* Someday: if (wcscmp(key, L"security.acl")==0) { ... } */ if (wcscmp(key, L"size")==0) { - tar->entry_bytes_remaining = tar_atol10(value, wcslen(value)); - archive_entry_set_size(entry, tar->entry_bytes_remaining); + /* "size" is the size of the data in the entry. */ + tar->entry_bytes_remaining + = tar_atol10(value, wcslen(value)); + /* + * But, "size" is not necessarily the size of + * the file on disk; if this is a sparse file, + * the disk size may have already been set from + * GNU.sparse.realsize. + */ + if (tar->sparse_realsize < 0) { + archive_entry_set_size(entry, + tar->entry_bytes_remaining); + tar->sparse_realsize + = tar->entry_bytes_remaining; + } } - tar->entry_bytes_remaining = 0; - break; case 'u': if (wcscmp(key, L"uid")==0) ==== //depot/projects/ethng/src/lib/libc/locale/iswctype.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.9 2007/10/23 17:39:28 ache Exp $"); #include <wctype.h> @@ -61,7 +61,7 @@ iswascii(wc) wint_t wc; { - return (wc < 0x80); + return ((wc & ~0x7F) == 0); } #undef iswblank ==== //depot/projects/ethng/src/lib/libc/sys/kldstat.2#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.20 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldstat.2,v 1.22 2007/10/22 21:49:39 jb Exp $ .\" .Dd March 3, 1999 .Dt KLDSTAT 2 @@ -53,6 +53,7 @@ int id; caddr_t address; /* load address */ size_t size; /* size in bytes */ + char pathname[MAXPATHLEN]; }; .Ed .Pp @@ -77,6 +78,10 @@ The load address of the kld file. .It size The size of the file. +.It pathname +The full name of the file referred to by +.Fa fileid , +including the path. .El .Sh RETURN VALUES .Rv -std kldstat @@ -123,3 +128,7 @@ .Nm kld interface first appeared in .Fx 3.0 . +.Sh BUGS +The pathname many not be accurate if the file system mounts have +changed since the module was loaded, or if this function is called +within a chrooted environment. ==== //depot/projects/ethng/src/lib/libelf/elf_flagdata.3#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2006,2007 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.2 2006/11/13 09:46:15 ru Exp $ +.\" $FreeBSD: src/lib/libelf/elf_flagdata.3,v 1.3 2007/10/22 03:38:43 jkoshy Exp $ .\" -.Dd August 10, 2006 +.Dd October 22, 2007 .Os .Dt ELF_FLAGDATA 3 .Sh NAME @@ -51,7 +51,7 @@ .Ft "unsigned int" .Fn elf_flagshdr "Elf_Scn *scn" "Elf_Cmd cmd" "unsigned int flags" .Sh DESCRIPTION -These functions are used to query, set or reset flag bits on data +These functions are used to query, set or reset flags on data structures associated with an ELF file. .Pp Arguments @@ -59,7 +59,7 @@ .Ar elf and .Ar scn -denote the data structures whose status bits need to be changed. +denote the data structures whose flags need to be changed. These values are allowed to be NULL to simplify error handling in application code. .Pp @@ -70,16 +70,16 @@ .It Dv ELF_C_CLR The argument .Ar flags -specifies the bits to be cleared. +specifies the flags to be cleared. .It Dv ELF_C_SET >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710280253.l9S2rbmW001134>