PERFORCE change 197722 for review
Matt Jacob
mjacob at FreeBSD.org
Tue Aug 16 13:58:24 UTC 2011
http://p4web.freebsd.org/@@197722?ac=10
Change 197722 by mjacob at mjacob-sandbox on 2011/08/16 13:57:39
IFC
Affected files ...
.. //depot/projects/mjacob-dev/MAINTAINERS#5 integrate
.. //depot/projects/mjacob-dev/Makefile.inc1#10 integrate
.. //depot/projects/mjacob-dev/UPDATING#8 integrate
.. //depot/projects/mjacob-dev/contrib/gdb/FREEBSD-diffs#2 integrate
.. //depot/projects/mjacob-dev/contrib/gdb/gdb/sparc64fbsd-tdep.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/FIXES#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/awkgram.y#2 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/b.c#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/lex.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/lib.c#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/main.c#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/makefile#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/proto.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/run.c#3 integrate
.. //depot/projects/mjacob-dev/contrib/one-true-awk/tran.c#2 integrate
.. //depot/projects/mjacob-dev/etc/Makefile#3 integrate
.. //depot/projects/mjacob-dev/etc/nsswitch.conf#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_read.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_read_support_compression_uu.c#3 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_read_support_format_mtree.c#3 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_write_open_fd.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_write_open_file.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_write_set_compression_xz.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_write_set_format_zip.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/Makefile#4 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/test_open_failure.c#1 branch
.. //depot/projects/mjacob-dev/lib/libarchive/test/test_read_format_mtree.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/test_write_compress_lzma.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/test_write_compress_xz.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/net/ethers.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/dup.2#2 integrate
.. //depot/projects/mjacob-dev/lib/libkvm/kvm_ia64.c#3 integrate
.. //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.c#5 integrate
.. //depot/projects/mjacob-dev/lib/libprocstat/libprocstat.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthread_db/arch/sparc64/libpthread_md.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/mjacob-dev/release/Makefile.sysinstall#4 integrate
.. //depot/projects/mjacob-dev/release/powerpc/mkisoimages.sh#6 integrate
.. //depot/projects/mjacob-dev/sbin/rcorder/rcorder.8#3 integrate
.. //depot/projects/mjacob-dev/share/man/man4/carp.4#2 integrate
.. //depot/projects/mjacob-dev/share/man/man8/diskless.8#2 integrate
.. //depot/projects/mjacob-dev/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/mjacob-dev/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/mjacob-dev/sys/amd64/linux32/linux32_machdep.c#4 integrate
.. //depot/projects/mjacob-dev/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/CAMBRIA#5 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/CNS11XXNAS#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/CRB#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/DB-78XXX#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/DB-88F5XXX#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/DB-88F6XXX#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/DOCKSTAR#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/EP80219#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/HL200#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/HL201#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/LN2410SBC#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/NSLU#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/QILA9G20#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/SAM9G20EK#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/SHEEVAPLUG#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/mjacob-dev/sys/arm/conf/TS7800#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/common/util.c#2 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/Makefile#4 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/conf.c#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/devicename.c#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/lv1call.S#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/lv1call.h#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/main.c#3 integrate
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/ps3cdrom.c#1 branch
.. //depot/projects/mjacob-dev/sys/boot/powerpc/ps3/ps3stor.c#2 integrate
.. //depot/projects/mjacob-dev/sys/cam/cam_xpt.c#7 integrate
.. //depot/projects/mjacob-dev/sys/cam/cam_xpt.h#4 integrate
.. //depot/projects/mjacob-dev/sys/cddl/compat/opensolaris/sys/file.h#3 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate
.. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate
.. //depot/projects/mjacob-dev/sys/compat/freebsd32/freebsd32_ioctl.c#3 integrate
.. //depot/projects/mjacob-dev/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/mjacob-dev/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/mjacob-dev/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/mjacob-dev/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/mjacob-dev/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/mjacob-dev/sys/compat/svr4/svr4_ioctl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/mjacob-dev/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/mjacob-dev/sys/conf/files.powerpc#6 integrate
.. //depot/projects/mjacob-dev/sys/conf/kern.pre.mk#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/aac/aac_linux.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/amr/amr_linux.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_dfs/null/dfs_null.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah.c#7 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah.h#9 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_internal.h#8 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_regdomain.c#5 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5212/ar5212.h#7 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#7 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416.h#9 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#9 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#8 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/if_athdfs.h#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/ath/if_athvar.h#8 integrate
.. //depot/projects/mjacob-dev/sys/dev/hwpmc/hwpmc_logging.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/ichsmb/ichsmb_pci.c#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/ipmi/ipmi_linux.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/iscsi/initiator/iscsi.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp.c#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#7 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/isp_pci.c#4 integrate
.. //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/mfi/mfi_linux.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_cam.c#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/tdfx/tdfx_linux.c#2 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_dev.c#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_device.h#3 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/mjacob-dev/sys/dev/usb/usbdi.h#6 integrate
.. //depot/projects/mjacob-dev/sys/fs/coda/coda_psdev.c#2 integrate
.. //depot/projects/mjacob-dev/sys/fs/devfs/devfs_devs.c#3 integrate
.. //depot/projects/mjacob-dev/sys/fs/fdescfs/fdesc_vnops.c#4 integrate
.. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clport.c#6 integrate
.. //depot/projects/mjacob-dev/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate
.. //depot/projects/mjacob-dev/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/mjacob-dev/sys/fs/portalfs/portal_vnops.c#3 integrate
.. //depot/projects/mjacob-dev/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate
.. //depot/projects/mjacob-dev/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/mjacob-dev/sys/i386/conf/XBOX#4 integrate
.. //depot/projects/mjacob-dev/sys/i386/conf/XEN#3 integrate
.. //depot/projects/mjacob-dev/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/mjacob-dev/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate
.. //depot/projects/mjacob-dev/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/mjacob-dev/sys/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/mjacob-dev/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/mjacob-dev/sys/ia64/ia64/dump_machdep.c#3 integrate
.. //depot/projects/mjacob-dev/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/mjacob-dev/sys/kern/capabilities.conf#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/mjacob-dev/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/mjacob-dev/sys/kern/kern_event.c#3 integrate
.. //depot/projects/mjacob-dev/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/mjacob-dev/sys/kern/sys_capability.c#6 integrate
.. //depot/projects/mjacob-dev/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/syscalls.c#5 integrate
.. //depot/projects/mjacob-dev/sys/kern/tty.c#5 integrate
.. //depot/projects/mjacob-dev/sys/kern/uipc_mqueue.c#4 integrate
.. //depot/projects/mjacob-dev/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/mjacob-dev/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/mjacob-dev/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/mjacob-dev/sys/mips/cavium/asm_octeon.S#2 integrate
.. //depot/projects/mjacob-dev/sys/mips/cavium/octeon_mp.c#5 integrate
.. //depot/projects/mjacob-dev/sys/mips/mips/dump_machdep.c#4 integrate
.. //depot/projects/mjacob-dev/sys/mips/mips/pmap.c#7 integrate
.. //depot/projects/mjacob-dev/sys/modules/portalfs/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sys/net/route.c#6 integrate
.. //depot/projects/mjacob-dev/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/mjacob-dev/sys/netgraph/ng_socket.c#4 integrate
.. //depot/projects/mjacob-dev/sys/netinet/in.c#6 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctp_structs.h#8 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctp_uio.h#7 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/mjacob-dev/sys/netinet/sctputil.c#9 integrate
.. //depot/projects/mjacob-dev/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/mjacob-dev/sys/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/mjacob-dev/sys/nfsserver/nfs_srvkrpc.c#3 integrate
.. //depot/projects/mjacob-dev/sys/pc98/conf/GENERIC#5 integrate
.. //depot/projects/mjacob-dev/sys/powerpc/aim/mmu_oea.c#7 integrate
.. //depot/projects/mjacob-dev/sys/powerpc/aim/mmu_oea64.c#7 integrate
.. //depot/projects/mjacob-dev/sys/powerpc/booke/pmap.c#7 integrate
.. //depot/projects/mjacob-dev/sys/powerpc/include/pmap.h#5 integrate
.. //depot/projects/mjacob-dev/sys/powerpc/ps3/ps3cdrom.c#1 branch
.. //depot/projects/mjacob-dev/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/mjacob-dev/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/mjacob-dev/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/mjacob-dev/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/mjacob-dev/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/mjacob-dev/sys/sparc64/sparc64/pmap.c#9 integrate
.. //depot/projects/mjacob-dev/sys/sparc64/sparc64/tsb.c#3 integrate
.. //depot/projects/mjacob-dev/sys/sys/capability.h#4 integrate
.. //depot/projects/mjacob-dev/sys/sys/file.h#4 integrate
.. //depot/projects/mjacob-dev/sys/sys/filedesc.h#4 integrate
.. //depot/projects/mjacob-dev/sys/sys/namei.h#2 integrate
.. //depot/projects/mjacob-dev/sys/sys/param.h#9 integrate
.. //depot/projects/mjacob-dev/sys/sys/syscall.h#5 integrate
.. //depot/projects/mjacob-dev/sys/sys/syscall.mk#5 integrate
.. //depot/projects/mjacob-dev/sys/sys/sysproto.h#5 integrate
.. //depot/projects/mjacob-dev/sys/sys/time.h#2 integrate
.. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_alloc.c#10 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_mmap.c#6 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_object.c#7 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_page.c#6 integrate
.. //depot/projects/mjacob-dev/sys/vm/vm_page.h#5 integrate
.. //depot/projects/mjacob-dev/tools/regression/netinet/tcpdrop/tcpdrop.c#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/security/cap_test/Makefile#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test.c#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test.h#3 integrate
.. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_capabilities.c#2 integrate
.. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_relative.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/README#4 integrate
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/Makefile#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/cxgbtool.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/reg_defs.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/reg_defs_t3.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/reg_defs_t3b.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/reg_defs_t3c.c#1 branch
.. //depot/projects/mjacob-dev/tools/tools/cxgbtool/version.h#1 branch
.. //depot/projects/mjacob-dev/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/mjacob-dev/usr.bin/procstat/procstat.c#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/procstat/procstat.h#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/procstat/procstat_cred.c#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/procstat/procstat_files.c#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/tail/forward.c#3 integrate
.. //depot/projects/mjacob-dev/usr.bin/xlint/lint1/tree.c#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/Makefile#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/cxgbtool.c#3 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/reg_defs.c#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/reg_defs_t3.c#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/reg_defs_t3b.c#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/reg_defs_t3c.c#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/cxgbtool/version.h#2 delete
.. //depot/projects/mjacob-dev/usr.sbin/jls/jls.c#4 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660.h#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660/cd9660_conversion.c#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660/cd9660_eltorito.c#4 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660/cd9660_write.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/makefs/cd9660/iso9660_rrip.c#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/mergemaster/mergemaster.8#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/mergemaster/mergemaster.sh#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/pmcstat/pmcstat.c#3 integrate
.. //depot/projects/mjacob-dev/usr.sbin/pmcstat/pmcstat.h#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/pmcstat/pmcstat_log.c#2 integrate
.. //depot/projects/mjacob-dev/usr.sbin/service/service.8#2 integrate
Differences ...
==== //depot/projects/mjacob-dev/MAINTAINERS#5 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.165 2011/05/14 17:44:12 cperciva Exp $
+$FreeBSD: src/MAINTAINERS,v 1.166 2011/08/10 15:49:24 rafan Exp $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -115,7 +115,6 @@
usr.bin/bluetooth emax Pre-commit review preferred.
usr.sbin/bluetooth emax Pre-commit review preferred.
gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
-ncurses rafan Heads-up appreciated, try not to break it.
*env(3) secteam Due to the problematic security history of this
code, please have patches reviewed by secteam.
share/zoneinfo edwin Heads-up appreciated, since our data is coming
==== //depot/projects/mjacob-dev/Makefile.inc1#10 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.701 2011/06/16 12:28:37 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.702 2011/08/11 10:29:10 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1014,6 +1014,10 @@
_yacc= usr.bin/yacc
.endif
+.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
+_awk= usr.bin/awk
+.endif
+
.if ${BOOTSTRAPPING} < 700018
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
@@ -1052,6 +1056,7 @@
${_groff} \
${_ar} \
${_dtc} \
+ ${_awk} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
==== //depot/projects/mjacob-dev/UPDATING#8 (text+ko) ====
@@ -22,6 +22,16 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110815:
+ During the merge of Capsicum features, the fget(9) KPI was modified.
+ This may require the rebuilding of out-of-tree device drivers --
+ issues have been reported specifically with the nVidia device driver.
+ __FreeBSD_version is bumped to 900041.
+
+ Also, there is a period between 20110811 and 20110814 where the
+ special devices /dev/{stdin,stdout,stderr} did not work correctly.
+ Building world from a kernel during that window may not work.
+
20110628:
The packet filter (pf) code has been updated to OpenBSD 4.5.
You need to update userland tools to be in sync with kernel.
@@ -1473,4 +1483,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.698 2011/06/29 13:12:15 bz Exp $
+$FreeBSD: src/UPDATING,v 1.699 2011/08/15 07:30:48 rwatson Exp $
==== //depot/projects/mjacob-dev/contrib/gdb/FREEBSD-diffs#2 (text+ko) ====
@@ -927,3 +927,39 @@
+#include "ia64/tm-ia64.h"
+
+#endif /* TM_FBSD_H */
+Index: gdb/sparc64fbsd-tdep.c
+===================================================================
+--- gdb/sparc64fbsd-tdep.c (revision 223862)
++++ gdb/sparc64fbsd-tdep.c (working copy)
+@@ -64,6 +64,31 @@ sparc64fbsd_supply_fpregset (const struct regset *
+ {
+ sparc64_supply_fpregset (regcache, regnum, fpregs);
+ }
++
++void
++supply_gregset (const void *gregs)
++{
++ sparc64_supply_gregset (&sparc64fbsd_gregset, current_regcache, -1, gregs);
++}
++
++void
++supply_fpregset (const void *fpregs)
++{
++ sparc64_supply_fpregset (current_regcache, -1, fpregs);
++}
++
++void
++fill_gregset (void *gregs, int regnum)
++{
++ sparc64_collect_gregset (&sparc64fbsd_gregset, current_regcache, regnum,
++ gregs);
++}
++
++void
++fill_fpregset (void *fpregs, int regnum)
++{
++ sparc64_collect_fpregset (current_regcache, regnum, fpregs);
++}
+
+
+ /* Signal trampolines. */
==== //depot/projects/mjacob-dev/contrib/gdb/gdb/sparc64fbsd-tdep.c#2 (text+ko) ====
@@ -64,6 +64,31 @@
{
sparc64_supply_fpregset (regcache, regnum, fpregs);
}
+
+void
+supply_gregset (const void *gregs)
+{
+ sparc64_supply_gregset (&sparc64fbsd_gregset, current_regcache, -1, gregs);
+}
+
+void
+supply_fpregset (const void *fpregs)
+{
+ sparc64_supply_fpregset (current_regcache, -1, fpregs);
+}
+
+void
+fill_gregset (void *gregs, int regnum)
+{
+ sparc64_collect_gregset (&sparc64fbsd_gregset, current_regcache, regnum,
+ gregs);
+}
+
+void
+fill_fpregset (void *fpregs, int regnum)
+{
+ sparc64_collect_fpregset (current_regcache, regnum, fpregs);
+}
/* Signal trampolines. */
==== //depot/projects/mjacob-dev/contrib/one-true-awk/FIXES#3 (text+ko) ====
@@ -25,6 +25,28 @@
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Aug 10, 2011:
+ another fix to avoid core dump with delete(ARGV); again, many thanks
+ to ruslan ermilov.
+
+Aug 7, 2011:
+ split(s, a, //) now behaves the same as split(s, a, "")
+
+Jun 12, 2011:
+ /pat/, \n /pat/ {...} is now legal, though bad style to use.
+
+ added checks to new -v code that permits -vnospace; thanks to
+ ruslan ermilov for spotting this and providing the patch.
+
+ removed fixed limit on number of open files; thanks to aleksey
+ cheusov and christos zoulos.
+
+ fixed day 1 bug that resurrected deleted elements of ARGV when
+ used as filenames (in lib.c).
+
+ minor type fiddles to make gcc -Wall -pedantic happier (but not
+ totally so); turned on -fno-strict-aliasing in makefile.
+
May 6, 2011:
added #ifdef for isblank.
now allows -ffoo as well as -f foo arguments.
==== //depot/projects/mjacob-dev/contrib/one-true-awk/awkgram.y#2 (text+ko) ====
@@ -174,8 +174,8 @@
pa_stat:
pa_pat { $$ = stat2(PASTAT, $1, stat2(PRINT, rectonode(), NIL)); }
| pa_pat lbrace stmtlist '}' { $$ = stat2(PASTAT, $1, $3); }
- | pa_pat ',' pa_pat { $$ = pa2stat($1, $3, stat2(PRINT, rectonode(), NIL)); }
- | pa_pat ',' pa_pat lbrace stmtlist '}' { $$ = pa2stat($1, $3, $5); }
+ | pa_pat ',' opt_nl pa_pat { $$ = pa2stat($1, $4, stat2(PRINT, rectonode(), NIL)); }
+ | pa_pat ',' opt_nl pa_pat lbrace stmtlist '}' { $$ = pa2stat($1, $4, $6); }
| lbrace stmtlist '}' { $$ = stat2(PASTAT, NIL, $2); }
| XBEGIN lbrace stmtlist '}'
{ beginloc = linkum(beginloc, $3); $$ = 0; }
==== //depot/projects/mjacob-dev/contrib/one-true-awk/b.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
/* lasciate ogne speranza, voi ch'intrate. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/one-true-awk/b.c,v 1.4 2011/05/03 11:47:19 ru Exp $");
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/b.c,v 1.5 2011/08/09 12:54:43 ru Exp $");
#define DEBUG
@@ -234,7 +234,7 @@
/* in the parsing of regular expressions, metacharacters like . have */
/* to be seen literally; \056 is not a metacharacter. */
-int hexstr(char **pp) /* find and eval hex string at pp, return new p */
+int hexstr(uschar **pp) /* find and eval hex string at pp, return new p */
{ /* only pick up one 8-bit byte (2 chars) */
uschar *p;
int n = 0;
@@ -248,16 +248,16 @@
else if (*p >= 'A' && *p <= 'F')
n = 16 * n + *p - 'A' + 10;
}
- *pp = (char *) p;
+ *pp = (uschar *) p;
return n;
}
#define isoctdigit(c) ((c) >= '0' && (c) <= '7') /* multiple use of arg */
-int quoted(char **pp) /* pick up next thing after a \\ */
+int quoted(uschar **pp) /* pick up next thing after a \\ */
/* and increment *pp */
{
- char *p = *pp;
+ uschar *p = *pp;
int c;
if ((c = *p++) == 't')
@@ -314,13 +314,13 @@
bp = buf;
for (i = 0; (c = *p++) != 0; ) {
if (c == '\\') {
- c = quoted((char **) &p);
+ c = quoted(&p);
} else if (c == '-' && i > 0 && bp[-1] != 0) {
if (*p != 0) {
c = bp[-1];
c2 = *p++;
if (c2 == '\\')
- c2 = quoted((char **) &p);
+ c2 = quoted(&p);
if (collate_range_cmp(c, c2) > 0) {
bp--;
i--;
@@ -807,7 +807,7 @@
case ')':
return c;
case '\\':
- rlxval = quoted((char **) &prestr);
+ rlxval = quoted(&prestr);
return CHAR;
default:
rlxval = c;
==== //depot/projects/mjacob-dev/contrib/one-true-awk/lex.c#2 (text+ko) ====
@@ -411,7 +411,7 @@
}
*px = 0;
unput(c);
- sscanf(xbuf, "%x", &n);
+ sscanf(xbuf, "%x", (unsigned int *) &n);
*bp++ = n;
break;
}
==== //depot/projects/mjacob-dev/contrib/one-true-awk/lib.c#3 (text+ko) ====
@@ -89,8 +89,13 @@
char *p;
for (i = 1; i < *ARGC; i++) {
- if (!isclvar(p = getargv(i))) { /* find 1st real filename */
- setsval(lookup("FILENAME", symtab), getargv(i));
+ p = getargv(i); /* find 1st real filename */
+ if (p == NULL || *p == '\0') { /* deleted or zapped */
+ argno++;
+ continue;
+ }
+ if (!isclvar(p)) {
+ setsval(lookup("FILENAME", symtab), p);
return;
}
setclvar(p); /* a commandline assignment before filename */
@@ -124,7 +129,7 @@
dprintf( ("argno=%d, file=|%s|\n", argno, file) );
if (infile == NULL) { /* have to open a new file */
file = getargv(argno);
- if (*file == '\0') { /* it's been zapped */
+ if (file == NULL || *file == '\0') { /* deleted or zapped */
argno++;
continue;
}
@@ -187,6 +192,7 @@
if (strlen(*FS) >= sizeof(inputFS))
FATAL("field separator %.10s... is too long", *FS);
+ /*fflush(stdout); avoids some buffering problem but makes it 25% slower*/
strcpy(inputFS, *FS); /* for subsequent field splitting */
if ((sep = **RS) == 0) {
sep = '\n';
@@ -227,6 +233,8 @@
extern Array *ARGVtab;
sprintf(temp, "%d", n);
+ if (lookup(temp, ARGVtab) == NULL)
+ return NULL;
x = setsymtab(temp, "", 0.0, STR, ARGVtab);
s = getsval(x);
dprintf( ("getargv(%d) returns |%s|\n", n, s) );
@@ -477,14 +485,14 @@
if (!adjbuf(&record, &recsize, 2+r-record, recsize, &r, "recbld 3"))
FATAL("built giant record `%.30s...'", record);
*r = '\0';
- dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, fldtab[0]) );
+ dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, (void*)fldtab[0]) );
if (freeable(fldtab[0]))
xfree(fldtab[0]->sval);
fldtab[0]->tval = REC | STR | DONTFREE;
fldtab[0]->sval = record;
- dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, fldtab[0]) );
+ dprintf( ("in recbld inputFS=%s, fldtab[0]=%p\n", inputFS, (void*)fldtab[0]) );
dprintf( ("recbld = |%s|\n", record) );
donerec = 1;
}
==== //depot/projects/mjacob-dev/contrib/one-true-awk/main.c#3 (text+ko) ====
@@ -23,9 +23,9 @@
****************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/one-true-awk/main.c,v 1.5 2011/05/06 14:21:46 ru Exp $");
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/main.c,v 1.7 2011/08/11 10:29:10 ru Exp $");
-const char *version = "version 20110506 (FreeBSD)";
+const char *version = "version 20110810 (FreeBSD)";
#define DEBUG
#include <stdio.h>
@@ -125,10 +125,20 @@
WARNING("field separator FS is empty");
break;
case 'v': /* -v a=1 to be done NOW. one -v for each */
- if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
- setclvar(argv[1]);
- else if (argv[1][2] != '\0')
- setclvar(&argv[1][2]);
+ if (argv[1][2] != 0) { /* arg is -vsomething */
+ if (isclvar(&argv[1][2]))
+ setclvar(&argv[1][2]);
+ else
+ FATAL("invalid -v option argument: %s", &argv[1][2]);
+ } else { /* arg is -v something */
+ argc--; argv++;
+ if (argc <= 1)
+ FATAL("no variable name");
+ if (isclvar(argv[1]))
+ setclvar(argv[1]);
+ else
+ FATAL("invalid -v option argument: %s", argv[1]);
+ }
break;
case 'd':
dbg = atoi(&argv[1][2]);
==== //depot/projects/mjacob-dev/contrib/one-true-awk/makefile#3 (text+ko) ====
@@ -30,7 +30,7 @@
CC = cc
CC = gcc -Wall -g -Wwrite-strings
CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
-CC = gcc -O4
+CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
YACC = bison -y
YACC = yacc
==== //depot/projects/mjacob-dev/contrib/one-true-awk/proto.h#2 (text+ko) ====
@@ -43,8 +43,8 @@
extern int makeinit(fa *, int);
extern void penter(Node *);
extern void freetr(Node *);
-extern int hexstr(char **);
-extern int quoted(char **);
+extern int hexstr(uschar **);
+extern int quoted(uschar **);
extern char *cclenter(const char *);
extern void overflo(const char *);
extern void cfoll(fa *, Node *);
==== //depot/projects/mjacob-dev/contrib/one-true-awk/run.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
****************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/one-true-awk/run.c,v 1.4 2011/05/03 11:47:19 ru Exp $");
+__FBSDID("$FreeBSD: src/contrib/one-true-awk/run.c,v 1.5 2011/08/09 12:54:43 ru Exp $");
#define DEBUG
#include <stdio.h>
@@ -1239,6 +1239,12 @@
ap->sval = (char *) makesymtab(NSYMTAB);
n = 0;
+ if (arg3type == REGEXPR && strlen((char*)((fa*)a[2])->restr) == 0) {
+ /* split(s, a, //); have to arrange that it looks like empty sep */
+ arg3type = 0;
+ fs = "";
+ sep = 0;
+ }
if (*s != '\0' && (strlen(fs) > 1 || arg3type == REGEXPR)) { /* reg expr */
fa *pfa;
if (arg3type == REGEXPR) { /* it's ready already */
@@ -1621,17 +1627,25 @@
FILE *fp;
const char *fname;
int mode; /* '|', 'a', 'w' => LE/LT, GT */
-} files[FOPEN_MAX] ={
- { NULL, "/dev/stdin", LT }, /* watch out: don't free this! */
- { NULL, "/dev/stdout", GT },
- { NULL, "/dev/stderr", GT }
-};
+} *files;
+
+int nfiles;
void stdinit(void) /* in case stdin, etc., are not constants */
{
- files[0].fp = stdin;
- files[1].fp = stdout;
- files[2].fp = stderr;
+ nfiles = FOPEN_MAX;
+ files = calloc(nfiles, sizeof(*files));
+ if (files == NULL)
+ FATAL("can't allocate file memory for %u files", nfiles);
+ files[0].fp = stdin;
+ files[0].fname = "/dev/stdin";
+ files[0].mode = LT;
+ files[1].fp = stdout;
+ files[1].fname = "/dev/stdout";
+ files[1].mode = GT;
+ files[2].fp = stderr;
+ files[2].fname = "/dev/stderr";
+ files[2].mode = GT;
}
FILE *openfile(int a, const char *us)
@@ -1642,7 +1656,7 @@
if (*s == '\0')
FATAL("null file name in print or getline");
- for (i=0; i < FOPEN_MAX; i++)
+ for (i=0; i < nfiles; i++)
if (files[i].fname && strcmp(s, files[i].fname) == 0) {
if (a == files[i].mode || (a==APPEND && files[i].mode==GT))
return files[i].fp;
@@ -1652,11 +1666,19 @@
if (a == FFLUSH) /* didn't find it, so don't create it! */
return NULL;
- for (i=0; i < FOPEN_MAX; i++)
+ for (i=0; i < nfiles; i++)
if (files[i].fp == 0)
break;
- if (i >= FOPEN_MAX)
- FATAL("%s makes too many open files", s);
+ if (i >= nfiles) {
+ struct files *nf;
+ int nnf = nfiles + FOPEN_MAX;
+ nf = realloc(files, nnf * sizeof(*nf));
+ if (nf == NULL)
+ FATAL("cannot grow files for %s and %d files", s, nnf);
+ memset(&nf[nfiles], 0, FOPEN_MAX * sizeof(*nf));
+ nfiles = nnf;
+ files = nf;
+ }
fflush(stdout); /* force a semblance of order */
m = a;
if (a == GT) {
@@ -1684,7 +1706,7 @@
{
int i;
- for (i = 0; i < FOPEN_MAX; i++)
+ for (i = 0; i < nfiles; i++)
if (fp == files[i].fp)
return files[i].fname;
return "???";
@@ -1699,7 +1721,7 @@
x = execute(a[0]);
getsval(x);
stat = -1;
- for (i = 0; i < FOPEN_MAX; i++) {
+ for (i = 0; i < nfiles; i++) {
if (files[i].fname && strcmp(x->sval, files[i].fname) == 0) {
if (ferror(files[i].fp))
WARNING( "i/o error occurred on %s", files[i].fname );
@@ -1743,7 +1765,7 @@
{
int i;
- for (i = 0; i < FOPEN_MAX; i++)
+ for (i = 0; i < nfiles; i++)
if (files[i].fp)
fflush(files[i].fp);
}
==== //depot/projects/mjacob-dev/contrib/one-true-awk/tran.c#2 (text+ko) ====
@@ -212,7 +212,7 @@
if (n != NULL && (p = lookup(n, tp)) != NULL) {
dprintf( ("setsymtab found %p: n=%s s=\"%s\" f=%g t=%o\n",
- p, NN(p->nval), NN(p->sval), p->fval, p->tval) );
+ (void*)p, NN(p->nval), NN(p->sval), p->fval, p->tval) );
return(p);
}
p = (Cell *) malloc(sizeof(Cell));
@@ -231,7 +231,7 @@
p->cnext = tp->tab[h];
tp->tab[h] = p;
dprintf( ("setsymtab set %p: n=%s s=\"%s\" f=%g t=%o\n",
- p, p->nval, p->sval, p->fval, p->tval) );
+ (void*)p, p->nval, p->sval, p->fval, p->tval) );
return(p);
}
@@ -298,7 +298,7 @@
xfree(vp->sval); /* free any previous string */
vp->tval &= ~STR; /* mark string invalid */
vp->tval |= NUM; /* mark number ok */
- dprintf( ("setfval %p: %s = %g, t=%o\n", vp, NN(vp->nval), f, vp->tval) );
+ dprintf( ("setfval %p: %s = %g, t=%o\n", (void*)vp, NN(vp->nval), f, vp->tval) );
return vp->fval = f;
}
@@ -318,7 +318,7 @@
int fldno;
dprintf( ("starting setsval %p: %s = \"%s\", t=%o, r,f=%d,%d\n",
- vp, NN(vp->nval), s, vp->tval, donerec, donefld) );
+ (void*)vp, NN(vp->nval), s, vp->tval, donerec, donefld) );
if ((vp->tval & (NUM | STR)) == 0)
funnyvar(vp, "assign to");
if (isfld(vp)) {
@@ -338,7 +338,7 @@
vp->tval |= STR;
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) );
+ (void*)vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );
return(vp->sval = t);
}
@@ -355,7 +355,8 @@
if (is_number(vp->sval) && !(vp->tval&CON))
vp->tval |= NUM; /* make NUM only sparingly */
}
- dprintf( ("getfval %p: %s = %g, t=%o\n", vp, NN(vp->nval), vp->fval, vp->tval) );
+ dprintf( ("getfval %p: %s = %g, t=%o\n",
+ (void*)vp, NN(vp->nval), vp->fval, vp->tval) );
return(vp->fval);
}
@@ -381,7 +382,8 @@
vp->tval &= ~DONTFREE;
vp->tval |= STR;
}
- dprintf( ("getsval %p: %s = \"%s (%p)\", t=%o\n", vp, NN(vp->nval), vp->sval, vp->sval, vp->tval) );
+ dprintf( ("getsval %p: %s = \"%s (%p)\", t=%o\n",
+ (void*)vp, NN(vp->nval), vp->sval, vp->sval, vp->tval) );
return(vp->sval);
}
==== //depot/projects/mjacob-dev/etc/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.387 2011/02/22 08:13:49 uqs Exp $
+# $FreeBSD: src/etc/Makefile,v 1.390 2011/08/10 20:52:02 dougb Exp $
.include <bsd.own.mk>
@@ -256,6 +256,10 @@
${DESTDIR}/boot/device.hints
.endif
.endif
+.if ${MK_NIS} == "no"
+ sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+ ${DESTDIR}/etc/nsswitch.conf
+.endif
distrib-dirs:
mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
==== //depot/projects/mjacob-dev/etc/nsswitch.conf#2 (text) ====
@@ -1,6 +1,6 @@
#
# nsswitch.conf(5) - name service switch configuration file
-# $FreeBSD: src/etc/nsswitch.conf,v 1.1 2006/05/03 15:14:47 ume Exp $
+# $FreeBSD: src/etc/nsswitch.conf,v 1.3 2011/08/10 20:52:02 dougb Exp $
#
group: compat
group_compat: nis
==== //depot/projects/mjacob-dev/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ====
@@ -1,6 +1,7 @@
-# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.3 2004/12/05 06:59:01 marcel Exp $
+# $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/Makefile,v 1.4 2011/08/06 17:53:45 marius Exp $
.if !defined(GDB_CROSS_DEBUGGER)
+LIBSRCS+= fbsd-threads.c
LIBSRCS+= solib.c solib-legacy.c solib-svr4.c
LIBSRCS+= sparc-nat.c sparc64-nat.c sparc64fbsd-nat.c
.endif
==== //depot/projects/mjacob-dev/gnu/usr.bin/gdb/arch/sparc64/init.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/init.c,v 1.2 2004/12/05 06:59:01 marcel Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/gdb/arch/sparc64/init.c,v 1.3 2011/08/06 17:53:45 marius Exp $ */
/* Do not modify this file. */
/* It is created automatically by the Makefile. */
@@ -11,6 +11,7 @@
extern initialize_file_ftype _initialize_ser_hardwire;
extern initialize_file_ftype _initialize_ser_pipe;
extern initialize_file_ftype _initialize_ser_tcp;
+extern initialize_file_ftype _initialize_thread_db;
extern initialize_file_ftype _initialize_sparc64fbsd_nat;
extern initialize_file_ftype _initialize_sparc64_nat;
extern initialize_file_ftype _initialize_sparc_nat;
@@ -124,6 +125,7 @@
_initialize_ser_pipe ();
_initialize_ser_tcp ();
#ifndef CROSS_DEBUGGER
+ _initialize_thread_db ();
_initialize_sparc64fbsd_nat ();
_initialize_sparc64_nat ();
_initialize_sparc_nat ();
==== //depot/projects/mjacob-dev/lib/libarchive/archive_read.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.56 2010/11/05 05:11:54 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.57 2011/08/07 08:42:36 mm Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -377,6 +377,12 @@
/* If no bidder, we're done. */
if (best_bidder == NULL) {
+ /* Verify the final pipelin by asking it for some data. */
+ __archive_read_filter_ahead(a->filter, 1, &avail);
+ if (avail < 0) {
+ cleanup_filters(a);
+ return (ARCHIVE_FATAL);
+ }
a->archive.compression_name = a->filter->name;
a->archive.compression_code = a->filter->code;
return (ARCHIVE_OK);
@@ -389,18 +395,12 @@
filter->bidder = best_bidder;
filter->archive = a;
filter->upstream = a->filter;
- r = (best_bidder->init)(filter);
+ a->filter = filter;
+ r = (best_bidder->init)(a->filter);
if (r != ARCHIVE_OK) {
- free(filter);
+ cleanup_filters(a);
return (r);
}
- a->filter = filter;
- /* Verify the filter by asking it for some data. */
- __archive_read_filter_ahead(filter, 1, &avail);
- if (avail < 0) {
- cleanup_filters(a);
- return (ARCHIVE_FATAL);
- }
}
}
==== //depot/projects/mjacob-dev/lib/libarchive/archive_read_support_compression_uu.c#3 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_uu.c,v 1.2 2011/07/17 21:27:38 mm Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_uu.c,v 1.3 2011/08/07 08:42:36 mm Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -381,7 +381,17 @@
unsigned char *ptr;
size_t newsize;
- newsize = uudecode->in_allocated << 1;
+ /*
+ * Calculate a new buffer size for in_buff.
+ * Increase its value until it has enough size we need.
+ */
+ newsize = uudecode->in_allocated;
+ do {
+ if (newsize < IN_BUFF_SIZE*32)
+ newsize <<= 1;
+ else
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list