PERFORCE change 1176062 for review
Brooks Davis
brooks at FreeBSD.org
Mon Oct 21 22:32:59 UTC 2013
http://p4web.freebsd.org/@@1176062?ac=10
Change 1176062 by brooks at brooks_zenith on 2013/10/21 22:32:07
IFC @ 1175606
Loop back merged functionality plus the latest FreeBSD updates.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#15 integrate
.. //depot/projects/ctsrd/beribsd/src/ObsoleteFiles.inc#12 integrate
.. //depot/projects/ctsrd/beribsd/src/bin/ps/print.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/bin/sh/jobs.c#11 integrate
.. //depot/projects/ctsrd/beribsd/src/bin/sh/miscbltin.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/cddl/lib/libdtrace/psinfo.d#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-arm.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-mips.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-mips.h#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/dwarf2dbg.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmp.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmp.h#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmpagent.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/ChangeLog#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/FREEBSD-diffs#5 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/FREEBSD-upgrade#3 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/VERSION#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/doc/jemalloc.3#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/internal/arena.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/internal/private_namespace.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/internal/tcache.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/jemalloc.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/src/arena.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/src/chunk.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/src/ctl.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/src/jemalloc.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/libcxxrt/typeinfo.cc#4 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/mtree/compare.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/mtree/create.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/mtree/getid.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/contrib/mtree/spec.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/defaults/rc.conf#7 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/login.conf#5 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#9 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/rc#6 edit
.. //depot/projects/ctsrd/beribsd/src/etc/rc.d/jail#6 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/rc.d/sendmail#5 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/sendmail/freebsd.mc#4 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libc/gen/popen.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libc/gen/syslog.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libc/iconv/citrus_mapper.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libc/sys/getrlimit.2#3 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libcrypt/tests/Makefile#2 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libproc/_libproc.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libutil/login_class.3#3 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libutil/login_class.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libvmmapi/vmmapi.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/libz/zopen.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/build/picobsd#7 integrate
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/rc1#3 integrate
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/ssh/sshd_config#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/gvinum/gvinum.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/ifconfig/ifgroup.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/iscontrol/fsm.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/route/keywords#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/route/route.8#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/route/route.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/share/examples/bhyve/vmrun.sh#3 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man4/Makefile#20 edit
.. //depot/projects/ctsrd/beribsd/src/share/man/man4/altera_atse.4#2 edit
.. //depot/projects/ctsrd/beribsd/src/share/man/man5/rc.conf.5#10 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man8/rc.8#6 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man8/rc.sendmail.8#3 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man9/rtentry.9#3 integrate
.. //depot/projects/ctsrd/beribsd/src/share/mk/atf.test.mk#3 integrate
.. //depot/projects/ctsrd/beribsd/src/share/mk/bsd.test.mk#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/include/vmm.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/vmm/intel/vmx.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/vmm/intel/vmx.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/vmm/intel/vmx_controls.h#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/vmm/vmm_dev.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/vmm/x86.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/busdma_machdep-v6.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc_asm_armv7.S#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/fusu.S#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/identcpu.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/locore.S#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/machdep.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/pl310.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/pmap-v6.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c#3 delete
.. //depot/projects/ctsrd/beribsd/src/sys/arm/broadcom/bcm2835/files.bcm2835#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/IMX53-QSB#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/arm/freescale/imx/files.imx53#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/freescale/imx/imx51_ccm.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/include/armreg.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/include/pmap.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/mv/common.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/mv/mvreg.h#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/i80321/ep80219_machdep.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/i8134x/crb_machdep.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/pxa/pxa_machdep.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/digi-ccwmx53.dts#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/imx53-qsb.dts#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_all.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_all.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_da.c#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_pmp.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ata/ata_xpt.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_ccb.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_periph.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_periph.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_queue.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_queue.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_sim.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_sim.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_xpt.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_xpt_internal.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_xpt_periph.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/cam_xpt_sim.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ctl/ctl_frontend_cam_sim.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/ctl/scsi_ctl.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_all.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_all.h#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_cd.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_ch.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_da.c#11 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_enc.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_enc_internal.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_enc_safte.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_enc_ses.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_pass.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_pt.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_sa.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_sg.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_target.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cam/scsi/scsi_xpt.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files#23 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files.powerpc#11 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/options#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/contrib/dev/run/rt2870.fw.uu#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ahci/ahci.c#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ahci/ahci.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/aic7xxx/aic79xx.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/aic7xxx/aic7xxx.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/a_api.h#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#17 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse_fdt.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse_nexus.c#2 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atsereg.h#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#17 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ata/ata-all.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ath/if_ath_tx.c#11 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#22 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/cm.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/cq.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/device.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/ev.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/id_table.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/mem.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/provider.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/qp.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/resource.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/t4.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/iw_cxgbe/user.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/drm2/i915/i915_drv.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/drm2/radeon/radeon_drv.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/etherswitch/arswitch/arswitch.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/etherswitch/arswitch/arswitch_9340.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/etherswitch/arswitch/arswitch_9340.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/etherswitch/arswitch/arswitch_vlans.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/etherswitch/arswitch/arswitchvar.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_common.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_common.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_ic_if.m#4 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdtbus.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/simplebus.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ffec/if_ffec.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ffec/if_ffecreg.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/firewire/sbp_targ.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/isp/isp.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/isp/isp_freebsd.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/isp/isp_freebsd.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/mpt/mpt_cam.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/mvs/mvs.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/ofw_bus_subr.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/random/ivy.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/re/if_re.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/uart/uart_dev_pl011.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/controller/dwc_otg_fdt.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/controller/musb_otg.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/controller/xhci.c#11 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/serial/uslcom.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/wlan/if_run.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/wlan/if_runreg.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_dev.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_disk.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_io.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_slice.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/label/g_label.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_apm.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_ebr.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_mbr.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_pc98.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/part/g_part_vtoc8.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/g_raid.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/g_raid.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/tr_concat.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/tr_raid0.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/tr_raid1.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/tr_raid1e.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/geom/raid/tr_raid5.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/kern_event.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/kern_resource.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/makesyscalls.sh#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/subr_devstat.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/subr_taskqueue.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/uipc_syscalls.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/vfs_bio.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/atheros/ar71xx_spi.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/atheros/if_arge.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/atheros/if_argevar.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_machdep.c#12 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#33 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/DB120#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/DB120.hints#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/Makefile#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/cxgb/Makefile#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/cxgbe/Makefile#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/cxgbe/iw_cxgbe/Makefile#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/net/flowtable.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/ieee8023ad_lacp.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/if_media.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/radix.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/radix.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/route.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/netgraph/ng_base.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/netinet/in.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ofed/drivers/net/mlx4/en_netdev.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/clock.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/interrupt.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/machdep.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/nexus.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/vm_machdep.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/booke/clock.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/booke/machdep.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/booke/vm_machdep.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/conf/GENERIC64#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/mpc85xx/nexus.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/ofw/ofw_pci.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/ofw/ofw_pci.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/ofw/ofw_pcib_pci.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/ofw/ofw_pcibus.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/clock.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/nexus.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/powerpc/vm_machdep.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/pseries/phyp-hvcall.S#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/powerpc/pseries/phyp_llan.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/sys/_task.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/devicestat.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/eventvar.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/param.h#12 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/resource.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/resourcevar.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/sys/taskqueue.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ffs/ffs_extern.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ffs/ffs_softdep.c#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ffs/ffs_vfsops.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ffs/softdep.h#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ufs/ufs_extern.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/ufs/ufs/ufsmount.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/xen/xen-os.h#2 integrate
.. //depot/projects/ctsrd/beribsd/src/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate
.. //depot/projects/ctsrd/beribsd/src/tools/build/options/WITHOUT_RCS#4 edit
.. //depot/projects/ctsrd/beribsd/src/usr.bin/limits/limits.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.bin/pathchk/pathchk.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.bin/procstat/procstat_rlimit.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.bin/uname/uname.1#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.bin/uname/uname.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/bhyverun.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/bhyverun.h#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/mptbl.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_ahci.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_hostbridge.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_virtio_block.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_virtio_net.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/rtc.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/spinup_ap.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyvectl/bhyvectl.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyveload/bhyveload.8#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyveload/bhyveload.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bsdinstall/bsdinstall.8#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bsdinstall/scripts/zfsboot#2 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/kldxref/kldxref.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/pkg/pkg.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/ppp/mppe.c#3 integrate
Differences ...
==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/Makefile.inc1 256298 2013-10-10 20:47:11Z dim $
+# $FreeBSD: head/Makefile.inc1 256842 2013-10-21 10:09:48Z bdrewery $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1722,6 +1722,13 @@
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
fi; \
+ for ext in debug symbols; do \
+ if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
+ "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+ rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
+ <&3; \
+ fi; \
+ done; \
done
@echo ">>> Old libraries removed"
@@ -1733,6 +1740,11 @@
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
echo "${DESTDIR}/$${file}"; \
fi; \
+ for ext in debug symbols; do \
+ if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+ echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
+ fi; \
+ done; \
done
delete-old-dirs:
@@ -1830,7 +1842,7 @@
CPUTYPE=${XDEV_CPUTYPE}
XDDIR=${XDEV_ARCH}-freebsd
-XDTP=/usr/${XDDIR}
+XDTP=usr/${XDDIR}
CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
INSTALL="sh ${.CURDIR}/tools/install.sh"
CDENV= ${CDBENV} \
@@ -1843,8 +1855,8 @@
CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-XDDESTDIR=${DESTDIR}${XDTP}
+CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
+XDDESTDIR=${DESTDIR}/${XDTP}
.if !defined(OSREL)
OSREL!= uname -r | sed -e 's/[-(].*//'
.endif
@@ -1924,6 +1936,7 @@
_xi-links:
${_+_}cd ${XDDESTDIR}/usr/bin; \
+ mkdir -p ../../../../usr/bin; \
for i in *; do \
ln -sf ../../${XDTP}/usr/bin/$$i \
../../../../usr/bin/${XDDIR}-$$i; \
==== //depot/projects/ctsrd/beribsd/src/ObsoleteFiles.inc#12 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: head/ObsoleteFiles.inc 256450 2013-10-14 18:31:15Z bdrewery $
+# $FreeBSD: head/ObsoleteFiles.inc 256787 2013-10-20 13:41:42Z antoine $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -97,7 +97,7 @@
OLD_FILES+=usr/include/lwres/version.h
OLD_FILES+=usr/lib/liblwres.a
OLD_FILES+=usr/lib/liblwres.so
-OLD_LIBS+=usr/lib/liblwres.so.50
+OLD_LIBS+=usr/lib/liblwres.so.90
OLD_FILES+=usr/lib/liblwres_p.a
OLD_FILES+=usr/sbin/arpaname
OLD_FILES+=usr/sbin/ddns-confgen
@@ -107,6 +107,7 @@
OLD_FILES+=usr/sbin/dnssec-revoke
OLD_FILES+=usr/sbin/dnssec-settime
OLD_FILES+=usr/sbin/dnssec-signzone
+OLD_FILES+=usr/sbin/dnssec-verify
OLD_FILES+=usr/sbin/genrandom
OLD_FILES+=usr/sbin/isc-hmac-fixup
OLD_FILES+=usr/sbin/lwresd
@@ -270,6 +271,7 @@
OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
OLD_FILES+=usr/share/man/man8/genrandom.8.gz
OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
OLD_FILES+=usr/share/man/man8/lwresd.8.gz
@@ -304,6 +306,8 @@
OLD_DIRS+=var/named/var/run/named
OLD_DIRS+=var/named/var/stats
OLD_DIRS+=var/run/named
+# 20130923: example moved
+OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
# 20130908: libssh becomes private
OLD_FILES+=usr/lib/libssh.a
OLD_FILES+=usr/lib/libssh.so
==== //depot/projects/ctsrd/beribsd/src/bin/ps/print.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/ps/print.c 238488 2012-07-15 15:22:13Z jilles $");
+__FBSDID("$FreeBSD: head/bin/ps/print.c 256838 2013-10-21 09:12:04Z trasz $");
#include <sys/param.h>
#include <sys/time.h>
@@ -797,8 +797,6 @@
emulname(KINFO *k, VARENT *ve __unused)
{
- if (k->ki_p->ki_emul == NULL)
- return (NULL);
return (strdup(k->ki_p->ki_emul));
}
@@ -827,7 +825,6 @@
char *
loginclass(KINFO *k, VARENT *ve __unused)
{
- char *s;
/*
* Don't display login class for system processes;
@@ -837,8 +834,5 @@
if (k->ki_p->ki_flag & P_SYSTEM) {
return (strdup("-"));
}
- s = k->ki_p->ki_loginclass;
- if (s == NULL)
- return (NULL);
- return (strdup(s));
+ return (strdup(k->ki_p->ki_loginclass));
}
==== //depot/projects/ctsrd/beribsd/src/bin/sh/jobs.c#11 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/jobs.c 255157 2013-09-02 21:57:46Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/jobs.c 256735 2013-10-18 12:35:12Z jilles $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -978,7 +978,6 @@
waitforjob(struct job *jp, int *origstatus)
{
#if JOBS
- pid_t mypgrp = getpgrp();
int propagate_int = jp->jobctl && jp->foreground;
#endif
int status;
@@ -992,7 +991,7 @@
dotrap();
#if JOBS
if (jp->jobctl) {
- if (tcsetpgrp(ttyfd, mypgrp) < 0)
+ if (tcsetpgrp(ttyfd, rootpid) < 0)
error("tcsetpgrp failed, errno=%d\n", errno);
}
if (jp->state == JOBSTOPPED)
==== //depot/projects/ctsrd/beribsd/src/bin/sh/miscbltin.c#6 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/miscbltin.c 250214 2013-05-03 15:28:31Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/miscbltin.c 256850 2013-10-21 16:46:12Z kib $");
/*
* Miscellaneous builtins.
@@ -405,6 +405,9 @@
#ifdef RLIMIT_NPTS
{ "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' },
#endif
+#ifdef RLIMIT_KQUEUES
+ { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' },
+#endif
{ (char *) 0, (char *)0, 0, 0, '\0' }
};
@@ -421,7 +424,7 @@
struct rlimit limit;
what = 'f';
- while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0')
+ while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0')
switch (optc) {
case 'H':
how = HARD;
==== //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#7 (text+ko) ====
@@ -311,6 +311,10 @@
&dt_idops_func, "void(@)" },
{ "memref", DT_IDENT_FUNC, 0, DIF_SUBR_MEMREF, DT_ATTR_STABCMN, DT_VERS_1_1,
&dt_idops_func, "uintptr_t *(void *, size_t)" },
+#if !defined(sun)
+{ "memstr", DT_IDENT_FUNC, 0, DIF_SUBR_MEMSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
+ &dt_idops_func, "string(void *, char, size_t)" },
+#endif
{ "min", DT_IDENT_AGGFUNC, 0, DTRACEAGG_MIN, DT_ATTR_STABCMN, DT_VERS_1_0,
&dt_idops_func, "void(@)" },
{ "mod", DT_IDENT_ACTFUNC, 0, DT_ACT_MOD, DT_ATTR_STABCMN,
==== //depot/projects/ctsrd/beribsd/src/cddl/lib/libdtrace/psinfo.d#4 (text+ko) ====
@@ -21,7 +21,7 @@
*
* Portions Copyright 2006 John Birrell jb at freebsd.org
*
- * $FreeBSD: head/cddl/lib/libdtrace/psinfo.d 239972 2012-09-01 08:14:21Z rpaulo $
+ * $FreeBSD: head/cddl/lib/libdtrace/psinfo.d 256571 2013-10-16 01:39:26Z markj $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
@@ -57,7 +57,8 @@
pr_gid = T->p_ucred->cr_rgid;
pr_egid = T->p_ucred->cr_groups[0];
pr_addr = 0;
- pr_psargs = stringof(T->p_args->ar_args);
+ pr_psargs = (T->p_args->ar_args == 0) ? "" :
+ memstr(T->p_args->ar_args, ' ', T->p_args->ar_length);
pr_arglen = T->p_args->ar_length;
pr_jailid = T->p_ucred->cr_prison->pr_id;
};
==== //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-arm.c#6 (text+ko) ====
@@ -12660,14 +12660,14 @@
/* Conversions without bitshift. */
const char *enc[] =
{
- "ftosis",
- "ftouis",
+ "ftosizs",
+ "ftouizs",
"fsitos",
"fuitos",
"fcvtsd",
"fcvtds",
- "ftosid",
- "ftouid",
+ "ftosizd",
+ "ftouizd",
"fsitod",
"fuitod"
};
==== //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ====
@@ -15420,21 +15420,6 @@
-mno-octeon-useun generate MIPS unaligned load/store instructions\n"));
}
-enum dwarf2_format
-mips_dwarf2_format (void)
-{
- if (HAVE_64BIT_SYMBOLS)
- {
-#ifdef TE_IRIX
- return dwarf2_format_64bit_irix;
-#else
- return dwarf2_format_64bit;
-#endif
- }
- else
- return dwarf2_format_32bit;
-}
-
int
mips_dwarf2_addr_size (void)
{
==== //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-mips.h#2 (text+ko) ====
@@ -155,10 +155,6 @@
extern void mips_enable_auto_align (void);
#define md_elf_section_change_hook() mips_enable_auto_align()
-enum dwarf2_format;
-extern enum dwarf2_format mips_dwarf2_format (void);
-#define DWARF2_FORMAT() mips_dwarf2_format ()
-
extern int mips_dwarf2_addr_size (void);
#define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()
==== //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/dwarf2dbg.c#2 (text+ko) ====
@@ -1271,6 +1271,7 @@
symbolS *line_end;
struct line_seg *s;
enum dwarf2_format d2f;
+ int sizeof_initial_length;
int sizeof_offset;
subseg_set (line_seg, 0);
@@ -1287,27 +1288,24 @@
d2f = DWARF2_FORMAT ();
if (d2f == dwarf2_format_32bit)
{
- expr.X_add_number = -4;
- emit_expr (&expr, 4);
- sizeof_offset = 4;
+ sizeof_initial_length = sizeof_offset = 4;
}
else if (d2f == dwarf2_format_64bit)
{
- expr.X_add_number = -12;
+ sizeof_initial_length = 12;
+ sizeof_offset = 8;
out_four (-1);
- emit_expr (&expr, 8);
- sizeof_offset = 8;
}
else if (d2f == dwarf2_format_64bit_irix)
{
- expr.X_add_number = -8;
- emit_expr (&expr, 8);
- sizeof_offset = 8;
+ sizeof_initial_length = sizeof_offset = 8;
}
else
{
as_fatal (_("internal error: unknown dwarf2 format"));
}
+ expr.X_add_number = -sizeof_initial_length;
+ emit_expr (&expr, sizeof_offset);
/* Version. */
out_two (2);
@@ -1316,7 +1314,7 @@
expr.X_op = O_subtract;
expr.X_add_symbol = prologue_end;
expr.X_op_symbol = line_start;
- expr.X_add_number = - (4 + 2 + 4);
+ expr.X_add_number = - (sizeof_initial_length + 2 + sizeof_offset);
emit_expr (&expr, sizeof_offset);
/* Parameters of the state machine. */
==== //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmp.c#2 (text+ko) ====
@@ -288,11 +288,13 @@
memset(buf, 0, 256);
tb.asn_ptr = buf;
tb.asn_len = 256;
+ u_int len;
- if (asn_get_octetstring(b, buf, &tb.asn_len) != ASN_ERR_OK) {
+ if (asn_get_octetstring(b, buf, &len) != ASN_ERR_OK) {
snmp_error("cannot parse usm header");
return (ASN_ERR_FAILED);
}
+ tb.asn_len = len;
if (asn_get_sequence(&tb, &octs_len) != ASN_ERR_OK) {
snmp_error("cannot decode usm header");
@@ -864,7 +866,7 @@
return (SNMP_CODE_FAILED);
pdu->scoped_len = b->asn_ptr - pdu->scoped_ptr;
- if ((code = snmp_pdu_fix_padd(b, pdu))!= ASN_ERR_OK)
+ if (snmp_pdu_fix_padd(b, pdu) != ASN_ERR_OK)
return (SNMP_CODE_FAILED);
if (pdu->security_model != SNMP_SECMODEL_USM)
@@ -997,7 +999,7 @@
if ((err = snmp_pdu_encode_header(resp_b, pdu)) != SNMP_CODE_OK)
return (err);
for (idx = 0; idx < pdu->nbindings; idx++)
- if ((err = snmp_binding_encode(resp_b, &pdu->bindings[idx]))
+ if (snmp_binding_encode(resp_b, &pdu->bindings[idx])
!= ASN_ERR_OK)
return (SNMP_CODE_FAILED);
==== //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmp.h#2 (text+ko) ====
@@ -182,7 +182,7 @@
/* fixes for encoding */
size_t outer_len;
- size_t scoped_len;
+ asn_len_t scoped_len;
u_char *outer_ptr;
u_char *digest_ptr;
u_char *encrypted_ptr;
==== //depot/projects/ctsrd/beribsd/src/contrib/bsnmp/lib/snmpagent.c#2 (text+ko) ====
@@ -166,7 +166,7 @@
}
static void
-snmp_pdu_create_response(struct snmp_pdu *pdu, struct snmp_pdu *resp)
+snmp_pdu_create_response(const struct snmp_pdu *pdu, struct snmp_pdu *resp)
{
memset(resp, 0, sizeof(*resp));
strcpy(resp->community, pdu->community);
@@ -276,7 +276,12 @@
}
}
- return (snmp_fix_encoding(resp_b, resp));
+ if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+ snmp_debug("get: failed to encode PDU");
+ return (SNMP_RET_ERR);
+ }
+
+ return (SNMP_RET_OK);
}
static struct snmp_node *
@@ -438,7 +443,13 @@
return (SNMP_RET_ERR);
}
}
- return (snmp_fix_encoding(resp_b, resp));
+
+ if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+ snmp_debug("getnext: failed to encode PDU");
+ return (SNMP_RET_ERR);
+ }
+
+ return (SNMP_RET_OK);
}
enum snmp_ret
@@ -537,7 +548,12 @@
}
done:
- return (snmp_fix_encoding(resp_b, resp));
+ if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+ snmp_debug("getnext: failed to encode PDU");
+ return (SNMP_RET_ERR);
+ }
+
+ return (SNMP_RET_OK);
}
/*
@@ -952,18 +968,57 @@
snmp_make_errresp(const struct snmp_pdu *pdu, struct asn_buf *pdu_b,
struct asn_buf *resp_b)
{
+ u_char type;
asn_len_t len;
struct snmp_pdu resp;
enum asn_err err;
enum snmp_code code;
- memset(&resp, 0, sizeof(resp));
+ snmp_pdu_create_response(pdu, &resp);
+
if ((code = snmp_pdu_decode_header(pdu_b, &resp)) != SNMP_CODE_OK)
return (SNMP_RET_IGN);
- if (pdu_b->asn_len < len)
+ if (pdu->version == SNMP_V3) {
+ if (resp.user.priv_proto != SNMP_PRIV_NOPRIV &&
+ (asn_get_header(pdu_b, &type, &resp.scoped_len) != ASN_ERR_OK
+ || type != ASN_TYPE_OCTETSTRING)) {
+ snmp_error("cannot decode encrypted pdu");
+ return (SNMP_RET_IGN);
+ }
+
+ if (asn_get_sequence(pdu_b, &len) != ASN_ERR_OK) {
+ snmp_error("cannot decode scoped pdu header");
+ return (SNMP_RET_IGN);
+ }
+
+ len = SNMP_ENGINE_ID_SIZ;
+ if (asn_get_octetstring(pdu_b, (u_char *)resp.context_engine,
+ &len) != ASN_ERR_OK) {
+ snmp_error("cannot decode msg context engine");
+ return (SNMP_RET_IGN);
+ }
+ resp.context_engine_len = len;
+ len = SNMP_CONTEXT_NAME_SIZ;
+ if (asn_get_octetstring(pdu_b, (u_char *)resp.context_name,
+ &len) != ASN_ERR_OK) {
+ snmp_error("cannot decode msg context name");
+ return (SNMP_RET_IGN);
+ }
+ resp.context_name[len] = '\0';
+ }
+
+
+ if (asn_get_header(pdu_b, &type, &len) != ASN_ERR_OK) {
+ snmp_error("cannot get pdu header");
+ return (SNMP_RET_IGN);
+ }
+
+ if ((type & ~ASN_TYPE_MASK) !=
+ (ASN_TYPE_CONSTRUCTED | ASN_CLASS_CONTEXT)) {
+ snmp_error("bad pdu header tag");
return (SNMP_RET_IGN);
- pdu_b->asn_len = len;
+ }
err = snmp_parse_pdus_hdr(pdu_b, &resp, &len);
if (ASN_ERR_STOPPED(err))
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/ChangeLog#4 (text+ko) ====
@@ -6,6 +6,21 @@
http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git
git://canonware.com/jemalloc.git
+* 3.4.1 (October 20, 2013)
+
+ Bug fixes:
+ - Fix a race in the "arenas.extend" mallctl that could cause memory corruption
+ of internal data structures and subsequent crashes.
+ - Fix Valgrind integration flaws that caused Valgrind warnings about reads of
+ uninitialized memory in:
+ + arena chunk headers
+ + internal zero-initialized data structures (relevant to tcache and prof
+ code)
+ - Preserve errno during the first allocation. A readlink(2) call during
+ initialization fails unless /etc/malloc.conf exists, so errno was typically
+ set during the first allocation prior to this fix.
+ - Fix compilation warnings reported by gcc 4.8.1.
+
* 3.4.0 (June 2, 2013)
This version is essentially a small bugfix release, but the addition of
@@ -60,7 +75,7 @@
Bug fixes:
- Fix "arenas.extend" mallctl to output the number of arenas.
- - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory
+ - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory
is undefined.
- Fix build break on FreeBSD related to alloca.h.
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/FREEBSD-diffs#5 (text+ko) ====
@@ -45,7 +45,7 @@
+ </refsect1>
</refentry>
diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index e46ac54..527449d 100644
+index 53c135c..c547339 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -1,5 +1,8 @@
@@ -97,10 +97,10 @@
bool malloc_mutex_init(malloc_mutex_t *mutex);
diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h
-index 65de316..366676b 100644
+index cdb0b0e..2a98d1f 100644
--- a/include/jemalloc/internal/private_namespace.h
+++ b/include/jemalloc/internal/private_namespace.h
-@@ -216,7 +216,6 @@
+@@ -218,7 +218,6 @@
#define iralloc JEMALLOC_N(iralloc)
#define irallocx JEMALLOC_N(irallocx)
#define isalloc JEMALLOC_N(isalloc)
@@ -244,7 +244,7 @@
+#endif
+
diff --git a/src/jemalloc.c b/src/jemalloc.c
-index bc350ed..352c98e 100644
+index ae56db6..1412a5e 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL)
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/FREEBSD-upgrade#3 (text+ko) ====
@@ -60,7 +60,7 @@
local rev=$1
# Clone.
rm -rf ${work}
- git clone git://canonware.com/jemalloc.git ${work}
+ git clone https://github.com/jemalloc/jemalloc.git ${work}
(
cd ${work}
if [ "x${rev}" != "x" ] ; then
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/VERSION#4 (text+ko) ====
@@ -1,1 +1,1 @@
-3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775
+3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/doc/jemalloc.3#4 (text+ko) ====
@@ -2,12 +2,12 @@
.\" Title: JEMALLOC
.\" Author: Jason Evans
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 06/02/2013
+.\" Date: 10/20/2013
.\" Manual: User Manual
-.\" Source: jemalloc 3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775
+.\" Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0
.\" Language: English
.\"
-.TH "JEMALLOC" "3" "06/02/2013" "jemalloc 3.4.0-0-g0ed518e5dab7" "User Manual"
+.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
jemalloc \- general purpose memory allocation functions
.SH "LIBRARY"
.PP
-This manual describes jemalloc 3\&.4\&.0\-0\-g0ed518e5dab789ad2171bb38977a8927e2a26775\&. More information can be found at the
+This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the
\m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&.
.PP
The following configuration options are enabled in libc\*(Aqs built\-in jemalloc:
==== //depot/projects/ctsrd/beribsd/src/contrib/jemalloc/include/jemalloc/internal/arena.h#4 (text+ko) ====
@@ -441,6 +441,7 @@
#ifndef JEMALLOC_ENABLE_INLINE
arena_chunk_map_t *arena_mapp_get(arena_chunk_t *chunk, size_t pageind);
size_t *arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind);
+size_t arena_mapbitsp_read(size_t *mapbitsp);
size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind);
size_t arena_mapbits_unallocated_size_get(arena_chunk_t *chunk,
size_t pageind);
@@ -451,6 +452,7 @@
size_t arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind);
size_t arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind);
size_t arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind);
+void arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits);
void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind,
size_t size, size_t flags);
void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind,
@@ -498,10 +500,17 @@
}
JEMALLOC_ALWAYS_INLINE size_t
+arena_mapbitsp_read(size_t *mapbitsp)
+{
+
+ return (*mapbitsp);
+}
+
+JEMALLOC_ALWAYS_INLINE size_t
arena_mapbits_get(arena_chunk_t *chunk, size_t pageind)
{
- return (*arena_mapbitsp_get(chunk, pageind));
+ return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind)));
}
JEMALLOC_ALWAYS_INLINE size_t
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list