Date: Sun, 21 Feb 2016 13:49:26 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295845 - in projects/clang380-import: . bin/dd bin/sh bin/sh/tests bin/sh/tests/parser cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/usr.sbin/dtrace/tests/co... Message-ID: <201602211349.u1LDnQlI048467@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Feb 21 13:49:26 2016 New Revision: 295845 URL: https://svnweb.freebsd.org/changeset/base/295845 Log: Merge ^/head r295601 through r295844. Added: projects/clang380-import/bin/dd/ref.obs_zeroes - copied unchanged from r295844, head/bin/dd/ref.obs_zeroes projects/clang380-import/bin/sh/tests/parser/comment1.0 - copied unchanged from r295844, head/bin/sh/tests/parser/comment1.0 projects/clang380-import/bin/sh/tests/parser/comment2.42 - copied unchanged from r295844, head/bin/sh/tests/parser/comment2.42 projects/clang380-import/bin/sh/tests/parser/nul1.0 - copied unchanged from r295844, head/bin/sh/tests/parser/nul1.0 projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmlibdriver/Makefile.depend projects/clang380-import/lib/clang/libllvmlto/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmlto/Makefile.depend projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmmirparser/Makefile.depend projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmorcjit/Makefile.depend projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend - copied unchanged from r295844, head/lib/clang/libllvmpasses/Makefile.depend projects/clang380-import/lib/libpe/Makefile.depend - copied unchanged from r295844, head/lib/libpe/Makefile.depend projects/clang380-import/libexec/makewhatis.local/ - copied from r295844, head/libexec/makewhatis.local/ projects/clang380-import/sys/arm/allwinner/a10_codec.c - copied unchanged from r295844, head/sys/arm/allwinner/a10_codec.c projects/clang380-import/sys/arm/allwinner/a10_dmac.c - copied unchanged from r295844, head/sys/arm/allwinner/a10_dmac.c projects/clang380-import/sys/arm/allwinner/a10_dmac.h - copied unchanged from r295844, head/sys/arm/allwinner/a10_dmac.h projects/clang380-import/sys/arm/allwinner/a10_padconf.c - copied unchanged from r295844, head/sys/arm/allwinner/a10_padconf.c projects/clang380-import/sys/arm/allwinner/a20/a20_padconf.c - copied unchanged from r295844, head/sys/arm/allwinner/a20/a20_padconf.c projects/clang380-import/sys/arm/allwinner/allwinner_pinctrl.h - copied unchanged from r295844, head/sys/arm/allwinner/allwinner_pinctrl.h projects/clang380-import/sys/arm/allwinner/axp209.c - copied unchanged from r295844, head/sys/arm/allwinner/axp209.c projects/clang380-import/sys/arm/allwinner/sunxi_dma_if.m - copied unchanged from r295844, head/sys/arm/allwinner/sunxi_dma_if.m projects/clang380-import/sys/arm/arm/busdma_machdep-v4.c - copied unchanged from r295844, head/sys/arm/arm/busdma_machdep-v4.c projects/clang380-import/sys/arm/arm/pmap-v4.c - copied unchanged from r295844, head/sys/arm/arm/pmap-v4.c projects/clang380-import/sys/arm/arm/trap-v4.c - copied unchanged from r295844, head/sys/arm/arm/trap-v4.c projects/clang380-import/sys/arm/include/pmap-v4.h - copied unchanged from r295844, head/sys/arm/include/pmap-v4.h projects/clang380-import/sys/arm/include/pte-v4.h - copied unchanged from r295844, head/sys/arm/include/pte-v4.h projects/clang380-import/sys/arm/ti/omap4/omap4_wugen.c - copied unchanged from r295844, head/sys/arm/ti/omap4/omap4_wugen.c projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.h - copied unchanged from r295844, head/sys/arm64/cavium/thunder_pcie_pem.h projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem_fdt.c - copied unchanged from r295844, head/sys/arm64/cavium/thunder_pcie_pem_fdt.c projects/clang380-import/sys/dev/iicbus/twsi/ - copied from r295844, head/sys/dev/iicbus/twsi/ projects/clang380-import/usr.bin/bmake/tests/Makefile.inc - copied unchanged from r295844, head/usr.bin/bmake/tests/Makefile.inc projects/clang380-import/usr.bin/clang/bugpoint/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/bugpoint/Makefile.depend projects/clang380-import/usr.bin/clang/llc/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llc/Makefile.depend projects/clang380-import/usr.bin/clang/lli/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/lli/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-ar/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-ar/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-as/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-as/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-bcanalyzer/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-bcanalyzer/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-cov/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-cov/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-cxxdump/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-cxxdump/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-diff/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-diff/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-dis/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-dis/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-dwarfdump/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-dwarfdump/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-extract/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-extract/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-link/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-link/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-lto/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-lto/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-mc/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-mc/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-nm/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-nm/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-objdump/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-objdump/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-pdbdump/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-pdbdump/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-profdata/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-profdata/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-rtdyld/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-rtdyld/Makefile.depend projects/clang380-import/usr.bin/clang/llvm-symbolizer/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/llvm-symbolizer/Makefile.depend projects/clang380-import/usr.bin/clang/opt/Makefile.depend - copied unchanged from r295844, head/usr.bin/clang/opt/Makefile.depend projects/clang380-import/usr.bin/truss/Makefile.depend - copied unchanged from r295844, head/usr.bin/truss/Makefile.depend Replaced: projects/clang380-import/sys/arm/include/pmap.h - copied unchanged from r295844, head/sys/arm/include/pmap.h Deleted: projects/clang380-import/sys/arm/arm/busdma_machdep.c projects/clang380-import/sys/arm/arm/pmap.c projects/clang380-import/sys/arm/arm/trap.c projects/clang380-import/sys/arm/include/pte.h projects/clang380-import/sys/arm/mv/twsi.c projects/clang380-import/usr.bin/truss/Makefile.depend.amd64 Modified: projects/clang380-import/Makefile.inc1 projects/clang380-import/bin/dd/Makefile projects/clang380-import/bin/dd/dd.c projects/clang380-import/bin/dd/dd.h projects/clang380-import/bin/dd/gen.c projects/clang380-import/bin/sh/input.c projects/clang380-import/bin/sh/tests/Makefile projects/clang380-import/bin/sh/tests/parser/Makefile projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile projects/clang380-import/contrib/elftoolchain/elfcopy/main.c projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms projects/clang380-import/include/signal.h projects/clang380-import/lib/libc/gen/directory.3 projects/clang380-import/lib/libc/stdio/fgetln.3 projects/clang380-import/lib/libc/stdio/fgetln.c projects/clang380-import/lib/libc/stdio/fputs.c projects/clang380-import/lib/libc/sys/lseek.2 projects/clang380-import/lib/libc/tests/Makefile projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile projects/clang380-import/lib/libc/tests/sys/Makefile projects/clang380-import/lib/libkvm/kvm_arm.c projects/clang380-import/lib/libkvm/kvm_arm.h projects/clang380-import/libexec/Makefile projects/clang380-import/libexec/rtld-elf/tests/Makefile projects/clang380-import/sbin/ifconfig/ifclone.c projects/clang380-import/sbin/ifconfig/ifconfig.c projects/clang380-import/sbin/ifconfig/ifconfig.h projects/clang380-import/sbin/kldstat/Makefile.depend projects/clang380-import/secure/lib/libssh/Makefile.depend projects/clang380-import/share/man/man4/geom_uncompress.4 projects/clang380-import/share/man/man5/mailer.conf.5 projects/clang380-import/share/misc/committers-ports.dot projects/clang380-import/share/mk/bsd.dep.mk projects/clang380-import/share/mk/bsd.init.mk projects/clang380-import/share/mk/bsd.lib.mk projects/clang380-import/share/mk/bsd.obj.mk projects/clang380-import/share/mk/bsd.prog.mk projects/clang380-import/share/mk/bsd.subdir.mk projects/clang380-import/share/mk/bsd.test.mk projects/clang380-import/share/mk/local.meta.sys.mk projects/clang380-import/sys/arm/allwinner/a10_ahci.c projects/clang380-import/sys/arm/allwinner/a10_clk.c projects/clang380-import/sys/arm/allwinner/a10_clk.h projects/clang380-import/sys/arm/allwinner/a10_gpio.c projects/clang380-import/sys/arm/allwinner/a20/a20_if_dwc.c projects/clang380-import/sys/arm/allwinner/a20/files.a20 projects/clang380-import/sys/arm/allwinner/allwinner_machdep.c projects/clang380-import/sys/arm/allwinner/allwinner_machdep.h projects/clang380-import/sys/arm/allwinner/files.a10 projects/clang380-import/sys/arm/allwinner/files.allwinner projects/clang380-import/sys/arm/allwinner/if_emac.c projects/clang380-import/sys/arm/arm/bus_space_generic.c projects/clang380-import/sys/arm/arm/devmap.c projects/clang380-import/sys/arm/arm/elf_trampoline.c projects/clang380-import/sys/arm/arm/fiq.c projects/clang380-import/sys/arm/arm/genassym.c projects/clang380-import/sys/arm/arm/generic_timer.c projects/clang380-import/sys/arm/arm/locore-v4.S projects/clang380-import/sys/arm/arm/locore-v6.S projects/clang380-import/sys/arm/arm/nexus.c projects/clang380-import/sys/arm/arm/ofw_machdep.c projects/clang380-import/sys/arm/arm/pmap-v6.c projects/clang380-import/sys/arm/arm/syscall.c projects/clang380-import/sys/arm/at91/at91.c projects/clang380-import/sys/arm/at91/at91_machdep.c projects/clang380-import/sys/arm/at91/at91_pinctrl.c projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_dma.c projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_dma.h projects/clang380-import/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/clang380-import/sys/arm/cavium/cns11xx/econa.c projects/clang380-import/sys/arm/cavium/cns11xx/econa_machdep.c projects/clang380-import/sys/arm/conf/A10 projects/clang380-import/sys/arm/conf/A20 projects/clang380-import/sys/arm/conf/ARMADA38X projects/clang380-import/sys/arm/conf/ARMADAXP projects/clang380-import/sys/arm/conf/CUBIEBOARD projects/clang380-import/sys/arm/conf/DB-78XXX projects/clang380-import/sys/arm/conf/DB-88F5XXX projects/clang380-import/sys/arm/conf/DB-88F6XXX projects/clang380-import/sys/arm/conf/DOCKSTAR projects/clang380-import/sys/arm/conf/DREAMPLUG-1001 projects/clang380-import/sys/arm/conf/NOTES projects/clang380-import/sys/arm/freescale/imx/imx6_machdep.c projects/clang380-import/sys/arm/include/devmap.h projects/clang380-import/sys/arm/include/pmap-v6.h projects/clang380-import/sys/arm/include/pmap_var.h projects/clang380-import/sys/arm/include/pte-v6.h projects/clang380-import/sys/arm/include/vm.h projects/clang380-import/sys/arm/mv/files.mv projects/clang380-import/sys/arm/mv/mv_localbus.c projects/clang380-import/sys/arm/mv/mv_machdep.c projects/clang380-import/sys/arm/mv/mv_pci.c projects/clang380-import/sys/arm/mv/orion/db88f5xxx.c projects/clang380-import/sys/arm/ti/omap4/files.omap4 projects/clang380-import/sys/arm/ti/ti_scm.c projects/clang380-import/sys/arm/versatile/versatile_machdep.c projects/clang380-import/sys/arm/xscale/i8134x/crb_machdep.c projects/clang380-import/sys/arm/xscale/ixp425/avila_machdep.c projects/clang380-import/sys/arm/xscale/pxa/pxa_machdep.c projects/clang380-import/sys/arm64/arm64/gic_fdt.c projects/clang380-import/sys/arm64/arm64/gic_v3_fdt.c projects/clang380-import/sys/arm64/arm64/gic_v3_its.c projects/clang380-import/sys/arm64/arm64/nexus.c projects/clang380-import/sys/arm64/arm64/ofw_machdep.c projects/clang380-import/sys/arm64/cavium/thunder_pcie.c projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.h projects/clang380-import/sys/arm64/cavium/thunder_pcie_fdt.c projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.c projects/clang380-import/sys/arm64/include/devmap.h projects/clang380-import/sys/boot/efi/boot1/Makefile projects/clang380-import/sys/boot/efi/boot1/Makefile.depend projects/clang380-import/sys/boot/efi/loader/arch/arm64/exec.c projects/clang380-import/sys/boot/fdt/dts/arm/bananapi.dts projects/clang380-import/sys/boot/fdt/dts/arm/cubieboard.dts projects/clang380-import/sys/boot/fdt/dts/arm/pandaboard-common.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/clang380-import/sys/boot/i386/boot2/Makefile projects/clang380-import/sys/boot/i386/pxeldr/Makefile projects/clang380-import/sys/boot/i386/zfsboot/Makefile projects/clang380-import/sys/cam/scsi/scsi_da.c projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/clang380-import/sys/compat/x86bios/x86bios.c projects/clang380-import/sys/conf/files.arm projects/clang380-import/sys/conf/files.arm64 projects/clang380-import/sys/conf/kern.mk projects/clang380-import/sys/conf/kern.post.mk projects/clang380-import/sys/conf/kmod.mk projects/clang380-import/sys/conf/options.arm projects/clang380-import/sys/contrib/x86emu/x86emu.c projects/clang380-import/sys/dev/acpica/acpi.c projects/clang380-import/sys/dev/acpica/acpi_hpet.c projects/clang380-import/sys/dev/acpica/acpi_package.c projects/clang380-import/sys/dev/acpica/acpivar.h projects/clang380-import/sys/dev/ae/if_ae.c projects/clang380-import/sys/dev/age/if_age.c projects/clang380-import/sys/dev/alc/if_alc.c projects/clang380-import/sys/dev/ale/if_ale.c projects/clang380-import/sys/dev/arcmsr/arcmsr.c projects/clang380-import/sys/dev/ata/chipsets/ata-promise.c projects/clang380-import/sys/dev/ata/chipsets/ata-serverworks.c projects/clang380-import/sys/dev/bxe/bxe.c projects/clang380-import/sys/dev/bxe/bxe.h projects/clang380-import/sys/dev/bxe/bxe_stats.c projects/clang380-import/sys/dev/bxe/ecore_init.h projects/clang380-import/sys/dev/cxgbe/adapter.h projects/clang380-import/sys/dev/cxgbe/common/common.h projects/clang380-import/sys/dev/cxgbe/common/t4_hw.h projects/clang380-import/sys/dev/cxgbe/common/t4_msg.h projects/clang380-import/sys/dev/cxgbe/common/t4_regs.h projects/clang380-import/sys/dev/cxgbe/common/t4_regs_values.h projects/clang380-import/sys/dev/cxgbe/common/t4_tcb.h projects/clang380-import/sys/dev/cxgbe/tom/t4_connect.c projects/clang380-import/sys/dev/cy/cy_isa.c projects/clang380-import/sys/dev/cy/cy_pci.c projects/clang380-import/sys/dev/ed/if_ed_pccard.c projects/clang380-import/sys/dev/eisa/eisaconf.c projects/clang380-import/sys/dev/fb/s3_pci.c projects/clang380-import/sys/dev/fdc/fdc_pccard.c projects/clang380-import/sys/dev/fdt/simplebus.c projects/clang380-import/sys/dev/filemon/filemon_wrapper.c projects/clang380-import/sys/dev/firewire/sbp_targ.c projects/clang380-import/sys/dev/gpio/gpiobus.c projects/clang380-import/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/clang380-import/sys/dev/hptiop/hptiop.c projects/clang380-import/sys/dev/hptmv/entry.c projects/clang380-import/sys/dev/hptnr/hptnr_osm_bsd.c projects/clang380-import/sys/dev/hptrr/hptrr_osm_bsd.c projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang380-import/sys/dev/ichsmb/ichsmb_pci.c projects/clang380-import/sys/dev/ioat/ioat.c projects/clang380-import/sys/dev/ioat/ioat_hw.h projects/clang380-import/sys/dev/ioat/ioat_internal.h projects/clang380-import/sys/dev/isci/isci.c projects/clang380-import/sys/dev/iwn/if_iwn.c projects/clang380-import/sys/dev/ixgb/if_ixgb.c projects/clang380-import/sys/dev/ixl/if_ixl.c projects/clang380-import/sys/dev/ixl/ixl_txrx.c projects/clang380-import/sys/dev/jme/if_jme.c projects/clang380-import/sys/dev/lmc/if_lmc.c projects/clang380-import/sys/dev/mca/mca_bus.c projects/clang380-import/sys/dev/mmc/mmcsd.c projects/clang380-import/sys/dev/mrsas/mrsas.c projects/clang380-import/sys/dev/msk/if_msk.c projects/clang380-import/sys/dev/mxge/if_mxge.c projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.c projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.h projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_regs.h projects/clang380-import/sys/dev/nvme/nvme_ctrlr.c projects/clang380-import/sys/dev/ofw/ofw_subr.c projects/clang380-import/sys/dev/ofw/ofwbus.c projects/clang380-import/sys/dev/ofw/openfirm.h projects/clang380-import/sys/dev/pccard/pccard.c projects/clang380-import/sys/dev/pci/pci_pci.c projects/clang380-import/sys/dev/pci/pci_user.c projects/clang380-import/sys/dev/qlxgb/qla_hw.c projects/clang380-import/sys/dev/quicc/quicc_core.c projects/clang380-import/sys/dev/random/nehemiah.c projects/clang380-import/sys/dev/rl/if_rl.c projects/clang380-import/sys/dev/siba/siba.c projects/clang380-import/sys/dev/sound/pci/envy24.c projects/clang380-import/sys/dev/sound/pci/envy24ht.c projects/clang380-import/sys/dev/sound/pci/hdspe.c projects/clang380-import/sys/dev/sound/pci/vibes.c projects/clang380-import/sys/dev/stge/if_stge.c projects/clang380-import/sys/dev/tsec/if_tsec_fdt.c projects/clang380-import/sys/dev/twa/tw_osl_freebsd.c projects/clang380-import/sys/dev/tws/tws.c projects/clang380-import/sys/dev/uart/uart_cpu_fdt.c projects/clang380-import/sys/dev/uart/uart_cpu_powerpc.c projects/clang380-import/sys/dev/usb/net/if_smsc.c projects/clang380-import/sys/dev/usb/wlan/if_rum.c projects/clang380-import/sys/dev/usb/wlan/if_rumreg.h projects/clang380-import/sys/dev/virtio/block/virtio_blk.c projects/clang380-import/sys/dev/vnic/mrml_bridge.c projects/clang380-import/sys/dev/vt/hw/ofwfb/ofwfb.c projects/clang380-import/sys/dev/vte/if_vte.c projects/clang380-import/sys/dev/xen/blkfront/blkfront.c projects/clang380-import/sys/fs/ext2fs/ext2_vnops.c projects/clang380-import/sys/fs/nullfs/null_vnops.c projects/clang380-import/sys/geom/geom.h projects/clang380-import/sys/geom/geom_io.c projects/clang380-import/sys/geom/journal/g_journal.c projects/clang380-import/sys/geom/mirror/g_mirror.c projects/clang380-import/sys/geom/raid/g_raid.c projects/clang380-import/sys/geom/raid3/g_raid3.c projects/clang380-import/sys/isa/isa_common.c projects/clang380-import/sys/isa/vga_isa.c projects/clang380-import/sys/kern/bus_if.m projects/clang380-import/sys/kern/kern_event.c projects/clang380-import/sys/kern/kern_physio.c projects/clang380-import/sys/kern/subr_bus.c projects/clang380-import/sys/kern/subr_intr.c projects/clang380-import/sys/kern/vfs_subr.c projects/clang380-import/sys/mips/adm5120/obio.c projects/clang380-import/sys/mips/alchemy/obio.c projects/clang380-import/sys/mips/atheros/apb.c projects/clang380-import/sys/mips/beri/beri_simplebus.c projects/clang380-import/sys/mips/idt/obio.c projects/clang380-import/sys/mips/mips/nexus.c projects/clang380-import/sys/mips/mips/ofw_machdep.c projects/clang380-import/sys/mips/nlm/xlp_simplebus.c projects/clang380-import/sys/mips/rt305x/obio.c projects/clang380-import/sys/mips/sibyte/ata_zbbus.c projects/clang380-import/sys/mips/sibyte/sb_zbbus.c projects/clang380-import/sys/net/if_lagg.c projects/clang380-import/sys/net80211/ieee80211.h projects/clang380-import/sys/net80211/ieee80211_adhoc.c projects/clang380-import/sys/net80211/ieee80211_hostap.c projects/clang380-import/sys/net80211/ieee80211_mesh.c projects/clang380-import/sys/net80211/ieee80211_proto.c projects/clang380-import/sys/net80211/ieee80211_sta.c projects/clang380-import/sys/net80211/ieee80211_wds.c projects/clang380-import/sys/netinet/sctp_asconf.c projects/clang380-import/sys/netinet/sctp_bsd_addr.c projects/clang380-import/sys/netinet/sctp_input.c projects/clang380-import/sys/netinet/sctp_output.c projects/clang380-import/sys/netinet/sctp_pcb.c projects/clang380-import/sys/netinet/sctp_pcb.h projects/clang380-import/sys/netinet/sctp_timer.c projects/clang380-import/sys/netinet/sctp_timer.h projects/clang380-import/sys/netinet/sctputil.c projects/clang380-import/sys/netinet/tcp_lro.c projects/clang380-import/sys/netinet/tcp_lro.h projects/clang380-import/sys/netinet6/in6.c projects/clang380-import/sys/netinet6/nd6.h projects/clang380-import/sys/netinet6/nd6_nbr.c projects/clang380-import/sys/netinet6/nd6_rtr.c projects/clang380-import/sys/netinet6/sctp6_usrreq.c projects/clang380-import/sys/netpfil/ipfw/ip_fw_sockopt.c projects/clang380-import/sys/netpfil/pf/pf.c projects/clang380-import/sys/powerpc/booke/pmap.c projects/clang380-import/sys/powerpc/include/pte.h projects/clang380-import/sys/powerpc/mpc85xx/isa.c projects/clang380-import/sys/powerpc/ofw/ofw_machdep.c projects/clang380-import/sys/powerpc/ofw/ofw_syscons.c projects/clang380-import/sys/powerpc/powerpc/nexus.c projects/clang380-import/sys/powerpc/ps3/ps3bus.c projects/clang380-import/sys/riscv/include/atomic.h projects/clang380-import/sys/riscv/include/ucontext.h projects/clang380-import/sys/riscv/include/vmparam.h projects/clang380-import/sys/riscv/riscv/locore.S projects/clang380-import/sys/riscv/riscv/nexus.c projects/clang380-import/sys/riscv/riscv/pmap.c projects/clang380-import/sys/riscv/riscv/swtch.S projects/clang380-import/sys/riscv/riscv/vm_machdep.c projects/clang380-import/sys/sparc64/central/central.c projects/clang380-import/sys/sparc64/ebus/ebus.c projects/clang380-import/sys/sparc64/fhc/fhc.c projects/clang380-import/sys/sparc64/isa/isa.c projects/clang380-import/sys/sparc64/pci/apb.c projects/clang380-import/sys/sparc64/sbus/sbus.c projects/clang380-import/sys/sparc64/sparc64/nexus.c projects/clang380-import/sys/sparc64/sparc64/upa.c projects/clang380-import/sys/sys/bus.h projects/clang380-import/sys/sys/param.h projects/clang380-import/sys/sys/rman.h projects/clang380-import/sys/sys/sockbuf.h projects/clang380-import/sys/sys/socketvar.h projects/clang380-import/sys/x86/iommu/intel_drv.c projects/clang380-import/sys/x86/isa/isa.c projects/clang380-import/sys/x86/x86/nexus.c projects/clang380-import/targets/pseudo/clang/Makefile.depend projects/clang380-import/targets/pseudo/userland/lib/Makefile.depend projects/clang380-import/tests/sys/Makefile projects/clang380-import/tests/sys/kqueue/read.c projects/clang380-import/tests/sys/pjdfstest/tests/Makefile projects/clang380-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang380-import/usr.bin/calendar/calendars/calendar.freebsd projects/clang380-import/usr.bin/cap_mkdb/cap_mkdb.c projects/clang380-import/usr.bin/elfcopy/Makefile.depend projects/clang380-import/usr.bin/hexdump/display.c projects/clang380-import/usr.bin/kdump/Makefile.depend projects/clang380-import/usr.bin/mail/def.h projects/clang380-import/usr.bin/makewhatis/Makefile projects/clang380-import/usr.bin/truss/amd64-linux32.c projects/clang380-import/usr.bin/truss/i386-linux.c projects/clang380-import/usr.bin/truss/setup.c projects/clang380-import/usr.bin/truss/syscall.h projects/clang380-import/usr.bin/truss/syscalls.c projects/clang380-import/usr.sbin/amd/include/Makefile projects/clang380-import/usr.sbin/cron/cron/do_command.c projects/clang380-import/usr.sbin/cron/crontab/crontab.c projects/clang380-import/usr.sbin/ctld/Makefile.depend projects/clang380-import/usr.sbin/iostat/Makefile projects/clang380-import/usr.sbin/iostat/iostat.c projects/clang380-import/usr.sbin/pciconf/Makefile projects/clang380-import/usr.sbin/pciconf/cap.c projects/clang380-import/usr.sbin/pciconf/pciconf.c projects/clang380-import/usr.sbin/rtsold/rtsold.c Directory Properties: projects/clang380-import/ (props changed) projects/clang380-import/cddl/ (props changed) projects/clang380-import/cddl/contrib/opensolaris/ (props changed) projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/clang380-import/contrib/elftoolchain/ (props changed) projects/clang380-import/include/ (props changed) projects/clang380-import/lib/libc/ (props changed) projects/clang380-import/sbin/ (props changed) projects/clang380-import/share/ (props changed) projects/clang380-import/share/man/man4/ (props changed) projects/clang380-import/sys/ (props changed) projects/clang380-import/sys/boot/ (props changed) projects/clang380-import/sys/cddl/contrib/opensolaris/ (props changed) projects/clang380-import/sys/conf/ (props changed) projects/clang380-import/sys/contrib/x86emu/ (props changed) projects/clang380-import/sys/dev/hyperv/ (props changed) projects/clang380-import/targets/ (props changed) projects/clang380-import/usr.bin/calendar/ (props changed) projects/clang380-import/usr.sbin/rtsold/ (props changed) Modified: projects/clang380-import/Makefile.inc1 ============================================================================== --- projects/clang380-import/Makefile.inc1 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/Makefile.inc1 Sun Feb 21 13:49:26 2016 (r295845) @@ -1090,7 +1090,7 @@ distrib-dirs distribution: .MAKE .PHONY .if make(distribution) ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ - METALOG=${METALOG} installconfig + METALOG=${METALOG} MK_TESTS=no installconfig .endif # Modified: projects/clang380-import/bin/dd/Makefile ============================================================================== --- projects/clang380-import/bin/dd/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/dd/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -24,7 +24,18 @@ test: ${PROG} gen LC_ALL=en_US.US-ASCII hexdump -C | \ diff -I FreeBSD - ${.CURDIR}/ref.${conv} .endfor - @rm -f gen + @${ECHO} "testing sparse file (obs zeroes)" + @./gen 189284 | ./dd ibs=16 obs=8 conv=sparse of=obs_zeroes 2> /dev/null + @hexdump -C obs_zeroes | diff -I FreeBSD - ${.CURDIR}/ref.obs_zeroes + + @${ECHO} "testing spase file (all zeroes)" + @./dd if=/dev/zero of=1M_zeroes bs=1048576 count=1 2> /dev/null + @./dd if=1M_zeroes of=1M_zeroes.1 bs=1048576 conv=sparse 2> /dev/null + @./dd if=1M_zeroes of=1M_zeroes.2 bs=1048576 2> /dev/null + @diff 1M_zeroes 1M_zeroes.1 + @diff 1M_zeroes 1M_zeroes.2 + + @rm -f gen 1M_zeroes* obs_zeroes .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: projects/clang380-import/bin/dd/dd.c ============================================================================== --- projects/clang380-import/bin/dd/dd.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/dd/dd.c Sun Feb 21 13:49:26 2016 (r295845) @@ -77,7 +77,6 @@ STAT st; /* statistics */ void (*cfunc)(void); /* conversion function */ uintmax_t cpy_cnt; /* # of blocks to copy */ static off_t pending = 0; /* pending seek if sparse */ -static off_t last_sp = 0; /* size of last added sparse block */ u_int ddflags = 0; /* conversion options */ size_t cbsz; /* conversion block size */ uintmax_t files_cnt = 1; /* # of files to copy */ @@ -409,6 +408,15 @@ dd_close(void) } if (out.dbcnt || pending) dd_out(1); + + /* + * If the file ends with a hole, ftruncate it to extend its size + * up to the end of the hole (without having to write any data). + */ + if (out.seek_offset > 0 && (out.flags & ISTRUNC)) { + if (ftruncate(out.fd, out.seek_offset) == -1) + err(1, "truncating %s", out.name); + } } void @@ -457,29 +465,27 @@ dd_out(int force) } if (sparse && !force) { pending += cnt; - last_sp = cnt; nw = cnt; } else { if (pending != 0) { - /* If forced to write, and we have no - * data left, we need to write the last - * sparse block explicitly. + /* + * Seek past hole. Note that we need to record the + * reached offset, because we might have no more data + * to write, in which case we'll need to call + * ftruncate to extend the file size. */ - if (force && cnt == 0) { - pending -= last_sp; - assert(outp == out.db); - memset(outp, 0, cnt); - } - if (lseek(out.fd, pending, SEEK_CUR) == - -1) + out.seek_offset = lseek(out.fd, pending, SEEK_CUR); + if (out.seek_offset == -1) err(2, "%s: seek error creating sparse file", out.name); - pending = last_sp = 0; + pending = 0; } - if (cnt) + if (cnt) { nw = write(out.fd, outp, cnt); - else + out.seek_offset = 0; + } else { return; + } } if (nw <= 0) { Modified: projects/clang380-import/bin/dd/dd.h ============================================================================== --- projects/clang380-import/bin/dd/dd.h Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/dd/dd.h Sun Feb 21 13:49:26 2016 (r295845) @@ -54,6 +54,7 @@ typedef struct { const char *name; /* name */ int fd; /* file descriptor */ off_t offset; /* # of blocks to skip */ + off_t seek_offset; /* offset of last seek past output hole */ } IO; typedef struct { Modified: projects/clang380-import/bin/dd/gen.c ============================================================================== --- projects/clang380-import/bin/dd/gen.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/dd/gen.c Sun Feb 21 13:49:26 2016 (r295845) @@ -5,13 +5,20 @@ */ #include <stdio.h> +#include <string.h> int -main(int argc __unused, char **argv __unused) +main(int argc, char **argv) { int i; - for (i = 0; i < 256; i++) - putchar(i); + if (argc > 1 && !strcmp(argv[1], "189284")) { + fputs("ABCDEFGH", stdout); + for (i = 0; i < 8; i++) + putchar(0); + } else { + for (i = 0; i < 256; i++) + putchar(i); + } return (0); } Copied: projects/clang380-import/bin/dd/ref.obs_zeroes (from r295844, head/bin/dd/ref.obs_zeroes) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/dd/ref.obs_zeroes Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/bin/dd/ref.obs_zeroes) @@ -0,0 +1,3 @@ +$FreeBSD$ +00000000 41 42 43 44 45 46 47 48 00 00 00 00 00 00 00 00 |ABCDEFGH........| +00000010 Modified: projects/clang380-import/bin/sh/input.c ============================================================================== --- projects/clang380-import/bin/sh/input.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/sh/input.c Sun Feb 21 13:49:26 2016 (r295845) @@ -195,8 +195,7 @@ retry: int preadbuffer(void) { - char *p, *q; - int more; + char *p, *q, *r, *end; char savec; while (parsefile->strpush) { @@ -224,34 +223,31 @@ again: } } - q = p = parsefile->buf + (parsenextc - parsefile->buf); - - /* delete nul characters */ - for (more = 1; more;) { - switch (*p) { - case '\0': - p++; /* Skip nul */ - goto check; - - case '\n': - parsenleft = q - parsenextc; - more = 0; /* Stop processing here */ - break; - - default: - break; - } - - *q++ = *p++; -check: - if (--parselleft <= 0) { - parsenleft = q - parsenextc - 1; - if (parsenleft < 0) - goto again; - *q = '\0'; - more = 0; + p = parsefile->buf + (parsenextc - parsefile->buf); + end = p + parselleft; + *end = '\0'; + q = strchrnul(p, '\n'); + if (q != end && *q == '\0') { + /* delete nul characters */ + for (r = q; q != end; q++) { + if (*q != '\0') + *r++ = *q; } + parselleft -= end - r; + if (parselleft == 0) + goto again; + end = p + parselleft; + *end = '\0'; + q = strchrnul(p, '\n'); + } + if (q == end) { + parsenleft = parselleft; + parselleft = 0; + } else /* *q == '\n' */ { + parsenleft = q - parsenextc + 1; + parselleft -= parsenleft; } + parsenleft--; savec = *q; *q = '\0'; Modified: projects/clang380-import/bin/sh/tests/Makefile ============================================================================== --- projects/clang380-import/bin/sh/tests/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/sh/tests/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -10,6 +10,4 @@ TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e -SUBDIR_PARALLEL= - .include <bsd.test.mk> Modified: projects/clang380-import/bin/sh/tests/parser/Makefile ============================================================================== --- projects/clang380-import/bin/sh/tests/parser/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/bin/sh/tests/parser/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -25,6 +25,8 @@ FILES+= alias15.0 alias15.0.stdout FILES+= and-pipe-not.0 FILES+= case1.0 FILES+= case2.0 +FILES+= comment1.0 +FILES+= comment2.42 FILES+= dollar-quote1.0 FILES+= dollar-quote2.0 FILES+= dollar-quote3.0 @@ -71,6 +73,7 @@ FILES+= line-cont10.0 FILES+= line-cont11.0 FILES+= no-space1.0 FILES+= no-space2.0 +FILES+= nul1.0 FILES+= only-redir1.0 FILES+= only-redir2.0 FILES+= only-redir3.0 Copied: projects/clang380-import/bin/sh/tests/parser/comment1.0 (from r295844, head/bin/sh/tests/parser/comment1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/sh/tests/parser/comment1.0 Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/bin/sh/tests/parser/comment1.0) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +${SH} -c '#' Copied: projects/clang380-import/bin/sh/tests/parser/comment2.42 (from r295844, head/bin/sh/tests/parser/comment2.42) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/sh/tests/parser/comment2.42 Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/bin/sh/tests/parser/comment2.42) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +${SH} -c '# +exit 42' Copied: projects/clang380-import/bin/sh/tests/parser/nul1.0 (from r295844, head/bin/sh/tests/parser/nul1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/sh/tests/parser/nul1.0 Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/bin/sh/tests/parser/nul1.0) @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Although POSIX does not specify the effect of NUL bytes in scripts, +# we ignore them. + +{ + printf 'v=%03000d\0%02000d' 7 2 + dd if=/dev/zero bs=1000 count=1 status=none + printf '1 w=%03000d%02000d1\0\n' 7 2 + printf '\0l\0v\0=\0$\0{\0#\0v\0}\n' + printf '\0l\0w\0=\0\0$\0{\0#\0w}\0\0\0\n' + printf '[ "$lv.$lw.$v" = "5001.5001.$w" ]\n' +} | ${SH} Modified: projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Feb 21 13:49:26 2016 (r295845) @@ -1713,7 +1713,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid column name " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } @@ -1750,7 +1750,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid source " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } @@ -1786,7 +1786,7 @@ zfs_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid type '%s'\n"), - value); + suboptarg); usage(B_FALSE); } } @@ -3156,7 +3156,7 @@ zfs_do_list(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid type '%s'\n"), - value); + suboptarg); usage(B_FALSE); } } Modified: projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sun Feb 21 13:49:26 2016 (r295845) @@ -5431,7 +5431,7 @@ zpool_do_get(int argc, char **argv) default: (void) fprintf(stderr, gettext("invalid column name " - "'%s'\n"), value); + "'%s'\n"), suboptarg); usage(B_FALSE); } } Modified: projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile ============================================================================== --- projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/cddl/usr.sbin/dtrace/tests/common/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -86,6 +86,4 @@ TESTS_SUBDIRS+= aggs \ .PATH: ${.CURDIR:H:H:H:H:H}/tests KYUAFILE= YES -SUBDIR_PARALLEL= - .include <bsd.test.mk> Modified: projects/clang380-import/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/clang380-import/contrib/elftoolchain/elfcopy/main.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/contrib/elftoolchain/elfcopy/main.c Sun Feb 21 13:49:26 2016 (r295845) @@ -641,6 +641,18 @@ create_file(struct elfcopy *ecp, const c * ELF object before processing. */ if (ecp->itf != ETF_ELF) { + /* + * If the output object is not an ELF file, choose an arbitrary + * ELF format for the intermediate file. srec, ihex and binary + * formats are independent of class, endianness and machine + * type so these choices do not affect the output. + */ + if (ecp->otf != ETF_ELF) { + if (ecp->oec == ELFCLASSNONE) + ecp->oec = ELFCLASS64; + if (ecp->oed == ELFDATANONE) + ecp->oed = ELFDATA2LSB; + } create_tempfile(&elftemp, &efd); if ((ecp->eout = elf_begin(efd, ELF_C_WRITE, NULL)) == NULL) errx(EXIT_FAILURE, "elf_begin() failed: %s", Modified: projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms ============================================================================== --- projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/gnu/usr.bin/rcs/doc/rcs.ms Sun Feb 21 13:49:26 2016 (r295845) @@ -16,7 +16,7 @@ .R .. .de Id -.ND \\$4 +.ND 1 June 1995 .. .Id $FreeBSD$ .RP Modified: projects/clang380-import/include/signal.h ============================================================================== --- projects/clang380-import/include/signal.h Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/include/signal.h Sun Feb 21 13:49:26 2016 (r295845) @@ -36,8 +36,10 @@ #include <sys/cdefs.h> #include <sys/_types.h> #include <sys/signal.h> +#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE #include <machine/ucontext.h> #include <sys/_ucontext.h> +#endif #if __BSD_VISIBLE /* Copied: projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend (from r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmdebuginfodwarf/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmdebuginfodwarf/Makefile.depend) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend (from r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmdebuginfopdb/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmdebuginfopdb/Makefile.depend) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend (from r295844, head/lib/clang/libllvmlibdriver/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmlibdriver/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmlibdriver/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +LibDriver.o: Options.inc.h +LibDriver.po: Options.inc.h +.endif Copied: projects/clang380-import/lib/clang/libllvmlto/Makefile.depend (from r295844, head/lib/clang/libllvmlto/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmlto/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmlto/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +LTOCodeGenerator.o: Intrinsics.inc.h +LTOCodeGenerator.po: Intrinsics.inc.h +.endif Copied: projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend (from r295844, head/lib/clang/libllvmmirparser/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmmirparser/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmmirparser/Makefile.depend) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend (from r295844, head/lib/clang/libllvmorcjit/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmorcjit/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmorcjit/Makefile.depend) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend (from r295844, head/lib/clang/libllvmpasses/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/clang/libllvmpasses/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/clang/libllvmpasses/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/libc++ \ + lib/msun \ + usr.bin/clang/tblgen.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +PassBuilder.o: Intrinsics.inc.h +PassBuilder.po: Intrinsics.inc.h +.endif Modified: projects/clang380-import/lib/libc/gen/directory.3 ============================================================================== --- projects/clang380-import/lib/libc/gen/directory.3 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/gen/directory.3 Sun Feb 21 13:49:26 2016 (r295845) @@ -28,7 +28,7 @@ .\" @(#)directory.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd May 6, 2015 +.Dd February 19, 2016 .Dt DIRECTORY 3 .Os .Sh NAME @@ -46,7 +46,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In dirent.h .Ft DIR * .Fn opendir "const char *filename" Modified: projects/clang380-import/lib/libc/stdio/fgetln.3 ============================================================================== --- projects/clang380-import/lib/libc/stdio/fgetln.3 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/stdio/fgetln.3 Sun Feb 21 13:49:26 2016 (r295845) @@ -28,7 +28,7 @@ .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd April 19, 1994 +.Dd February 15, 2016 .Dt FGETLN 3 .Os .Sh NAME @@ -97,6 +97,9 @@ These changes are lost as soon as the po The argument .Fa stream is not a stream open for reading. +.It Bq Er ENOMEM +The internal line buffer could not be expanded due to lack of available memory, +or because it would need to expand beyond INT_MAX in size. .El .Pp The Modified: projects/clang380-import/lib/libc/stdio/fgetln.c ============================================================================== --- projects/clang380-import/lib/libc/stdio/fgetln.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/stdio/fgetln.c Sun Feb 21 13:49:26 2016 (r295845) @@ -37,6 +37,8 @@ static char sccsid[] = "@(#)fgetln.c 8.2 __FBSDID("$FreeBSD$"); #include "namespace.h" +#include <errno.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -61,6 +63,10 @@ __slbexpand(FILE *fp, size_t newsize) #endif if (fp->_lb._size >= newsize) return (0); + if (newsize > INT_MAX) { + errno = ENOMEM; + return (-1); + } if ((p = realloc(fp->_lb._base, newsize)) == NULL) return (-1); fp->_lb._base = p; @@ -152,13 +158,14 @@ fgetln(FILE *fp, size_t *lenp) } *lenp = len; #ifdef notdef - fp->_lb._base[len] = 0; + fp->_lb._base[len] = '\0'; #endif FUNLOCKFILE(fp); return ((char *)fp->_lb._base); error: *lenp = 0; /* ??? */ + fp->_flags |= __SERR; FUNLOCKFILE(fp); return (NULL); /* ??? */ } Modified: projects/clang380-import/lib/libc/stdio/fputs.c ============================================================================== --- projects/clang380-import/lib/libc/stdio/fputs.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/stdio/fputs.c Sun Feb 21 13:49:26 2016 (r295845) @@ -37,6 +37,7 @@ static char sccsid[] = "@(#)fputs.c 8.1 __FBSDID("$FreeBSD$"); #include "namespace.h" +#include <limits.h> #include <stdio.h> #include <string.h> #include "un-namespace.h" @@ -62,5 +63,7 @@ fputs(const char * __restrict s, FILE * ORIENT(fp, -1); retval = __sfvwrite(fp, &uio); FUNLOCKFILE(fp); + if (retval == 0) + return (iov.iov_len > INT_MAX ? INT_MAX : iov.iov_len); return (retval); } Modified: projects/clang380-import/lib/libc/sys/lseek.2 ============================================================================== --- projects/clang380-import/lib/libc/sys/lseek.2 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/sys/lseek.2 Sun Feb 21 13:49:26 2016 (r295845) @@ -28,7 +28,7 @@ .\" @(#)lseek.2 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd May 26, 2012 +.Dd February 18, 2016 .Dt LSEEK 2 .Os .Sh NAME @@ -131,8 +131,14 @@ Applications can use .Dv SEEK_HOLE to optimise their behavior for ranges of zeros, but must not depend on it to find all such ranges in a file. +Each file is presented as having a zero-size virtual hole at the very +end of the file. The existence of a hole at the end of every data region allows for easy -programming and implies that a virtual hole exists at the end of the file. +programming and also provides compatibility to the original implementation +in Solaris. +It also causes the current file size (i.e., end-of-file offset) to be returned +to indicate that there are no more holes past the supplied +.Fa offset . Applications should use .Fn fpathconf _PC_MIN_HOLE_SIZE or @@ -176,9 +182,11 @@ be negative for a non-character special For .Dv SEEK_DATA , there are no more data regions past the supplied offset. -For -.Dv SEEK_HOLE , -there are no more holes past the supplied offset. +Due to existence of the hole at the end of the file, for +.Dv SEEK_HOLE +this error is only returned when the +.Fa offset +already points to the end-of-file position. .It Bq Er EOVERFLOW The resulting file offset would be a value which cannot be represented correctly in an object of type Modified: projects/clang380-import/lib/libc/tests/Makefile ============================================================================== --- projects/clang380-import/lib/libc/tests/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/tests/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -22,6 +22,8 @@ TESTS_SUBDIRS+= termios TESTS_SUBDIRS+= tls TESTS_SUBDIRS+= ttyio +SUBDIR_DEPEND_tls= tls_dso + .if ${MK_LOCALES} != "no" TESTS_SUBDIRS+= locale .endif Modified: projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile ============================================================================== --- projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/tests/gen/posix_spawn/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -20,7 +20,7 @@ CLEANFILES+= h_nonexec .include "../../Makefile.netbsd-tests" h_zero: - dd if=/dev/zero of=h_zero bs=1k count=2 + dd if=/dev/zero of=h_zero bs=1k count=2 status=none chmod a+x h_zero CLEANFILES+= h_zero Modified: projects/clang380-import/lib/libc/tests/sys/Makefile ============================================================================== --- projects/clang380-import/lib/libc/tests/sys/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libc/tests/sys/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -78,6 +78,6 @@ truncate_test_FILESGRP= wheel CLEANFILES= truncate_test.root_owned truncate_test.root_owned: - dd if=/dev/null bs=1 count=1 of=${.TARGET} + dd if=/dev/null bs=1 count=1 of=${.TARGET} status=none .include <bsd.test.mk> Modified: projects/clang380-import/lib/libkvm/kvm_arm.c ============================================================================== --- projects/clang380-import/lib/libkvm/kvm_arm.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libkvm/kvm_arm.c Sun Feb 21 13:49:26 2016 (r295845) @@ -183,7 +183,7 @@ _arm_initvtop(kvm_t *kd) #define l1pte_section_p(pde) (((pde) & ARM_L1_TYPE_MASK) == ARM_L1_TYPE_S) #define l1pte_valid(pde) ((pde) != 0) #define l2pte_valid(pte) ((pte) != 0) -#define l2pte_index(v) (((v) & ARM_L2_ADDR_BITS) >> ARM_L2_S_SHIFT) +#define l2pte_index(v) (((v) & ARM_L1_S_OFFSET) >> ARM_L2_S_SHIFT) static int Modified: projects/clang380-import/lib/libkvm/kvm_arm.h ============================================================================== --- projects/clang380-import/lib/libkvm/kvm_arm.h Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/lib/libkvm/kvm_arm.h Sun Feb 21 13:49:26 2016 (r295845) @@ -29,10 +29,6 @@ #ifndef __KVM_ARM_H__ #define __KVM_ARM_H__ -#ifdef __arm__ -#include <machine/pte.h> -#endif - typedef uint32_t arm_physaddr_t; typedef uint32_t arm_pd_entry_t; typedef uint32_t arm_pt_entry_t; @@ -72,11 +68,15 @@ typedef uint32_t arm_pt_entry_t; #define ARM_L2_TYPE_T 0x03 /* Tiny Page - 1k - not used */ #define ARM_L2_TYPE_MASK 0x03 -#define ARM_L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */ - #ifdef __arm__ #include <machine/acle-compat.h> +#if __ARM_ARCH >= 6 +#include <machine/pte-v6.h> +#else +#include <machine/pte-v4.h> +#endif + _Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch"); _Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch"); _Static_assert(PAGE_MASK == ARM_PAGE_MASK, "PAGE_MASK mismatch"); @@ -106,7 +106,6 @@ _Static_assert(L2_TYPE_S == ARM_L2_TYPE_ _Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch"); #endif _Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch"); -_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch"); #endif int _arm_native(kvm_t *); Copied: projects/clang380-import/lib/libpe/Makefile.depend (from r295844, head/lib/libpe/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/lib/libpe/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845, copy of r295844, head/lib/libpe/Makefile.depend) @@ -0,0 +1,13 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: projects/clang380-import/libexec/Makefile ============================================================================== --- projects/clang380-import/libexec/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/libexec/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -10,6 +10,7 @@ SUBDIR= ${_atf} \ ${_dma} \ getty \ ${_mail.local} \ + ${_makewhatis.local} \ ${_mknetid} \ ${_pppoed} \ revnetgroup \ @@ -88,6 +89,10 @@ _mail.local= mail.local _smrsh= smrsh .endif +.if ${MK_MAN_UTILS} != "no" +_makewhatis.local= makewhatis.local +.endif + .if ${MK_TALK} != "no" SUBDIR+= talkd .endif Modified: projects/clang380-import/libexec/rtld-elf/tests/Makefile ============================================================================== --- projects/clang380-import/libexec/rtld-elf/tests/Makefile Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/libexec/rtld-elf/tests/Makefile Sun Feb 21 13:49:26 2016 (r295845) @@ -4,6 +4,7 @@ SUBDIR+= libpythagoras target +SUBDIR_DEPEND_target= libpythagoras ATF_TESTS_C= ld_library_pathfds .include <bsd.test.mk> Modified: projects/clang380-import/sbin/ifconfig/ifclone.c ============================================================================== --- projects/clang380-import/sbin/ifconfig/ifclone.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/sbin/ifconfig/ifclone.c Sun Feb 21 13:49:26 2016 (r295845) @@ -144,11 +144,12 @@ ifclonecreate(int s, void *arg) } /* - * If we get a different name back than we put in, print it. + * If we get a different name back than we put in, update record and + * indicate it should be printed later. */ if (strncmp(name, ifr.ifr_name, sizeof(name)) != 0) { strlcpy(name, ifr.ifr_name, sizeof(name)); - printf("%s\n", name); + printifname = 1; } } Modified: projects/clang380-import/sbin/ifconfig/ifconfig.c ============================================================================== --- projects/clang380-import/sbin/ifconfig/ifconfig.c Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/sbin/ifconfig/ifconfig.c Sun Feb 21 13:49:26 2016 (r295845) @@ -93,6 +93,7 @@ int clearaddr; int newaddr = 1; int verbose; int noload; +int printifname = 0; int supmedia = 0; int printkeys = 0; /* Print keying material for interfaces. */ @@ -108,6 +109,8 @@ static struct afswtch *af_getbyname(cons static struct afswtch *af_getbyfamily(int af); static void af_other_status(int); +void printifnamemaybe(void); + static struct option *opts = NULL; struct ifa_order_elt { @@ -297,6 +300,12 @@ sortifaddrs(struct ifaddrs *list, return (result); } +void printifnamemaybe() +{ + if (printifname) + printf("%s\n", name); +} + int main(int argc, char *argv[]) { @@ -314,6 +323,12 @@ main(int argc, char *argv[]) size_t iflen; all = downonly = uponly = namesonly = noload = verbose = 0; + + /* + * Ensure we print interface name when expected to, + * even if we terminate early due to error. + */ + atexit(printifnamemaybe); /* Parse leading line options */ strlcpy(options, "adklmnuv", sizeof(options)); @@ -1011,6 +1026,8 @@ setifname(const char *val, int dummy __u const struct afswtch *afp) { char *newname; + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); newname = strdup(val); if (newname == NULL) @@ -1020,6 +1037,7 @@ setifname(const char *val, int dummy __u free(newname); err(1, "ioctl SIOCSIFNAME (set name)"); } + printifname = 1; strlcpy(name, newname, sizeof(name)); free(newname); } @@ -1031,6 +1049,8 @@ setifdescr(const char *val, int dummy __ { char *newdescr; + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + ifr.ifr_buffer.length = strlen(val) + 1; if (ifr.ifr_buffer.length == 1) { ifr.ifr_buffer.buffer = newdescr = NULL; Modified: projects/clang380-import/sbin/ifconfig/ifconfig.h ============================================================================== --- projects/clang380-import/sbin/ifconfig/ifconfig.h Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/sbin/ifconfig/ifconfig.h Sun Feb 21 13:49:26 2016 (r295845) @@ -133,6 +133,7 @@ extern int supmedia; extern int printkeys; extern int newaddr; extern int verbose; +extern int printifname; void setifcap(const char *, int value, int s, const struct afswtch *); Modified: projects/clang380-import/sbin/kldstat/Makefile.depend ============================================================================== --- projects/clang380-import/sbin/kldstat/Makefile.depend Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/sbin/kldstat/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845) @@ -8,6 +8,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libutil \ .include <dirdeps.mk> Modified: projects/clang380-import/secure/lib/libssh/Makefile.depend ============================================================================== --- projects/clang380-import/secure/lib/libssh/Makefile.depend Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/secure/lib/libssh/Makefile.depend Sun Feb 21 13:49:26 2016 (r295845) @@ -6,6 +6,7 @@ DIRDEPS = \ gnu/lib/libgcc \ include \ include/arpa \ + include/gssapi \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ Modified: projects/clang380-import/share/man/man4/geom_uncompress.4 ============================================================================== --- projects/clang380-import/share/man/man4/geom_uncompress.4 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/share/man/man4/geom_uncompress.4 Sun Feb 21 13:49:26 2016 (r295845) @@ -1,3 +1,4 @@ +.\" Copyright (c) 2006, Ceri Davies <ceri@FreeBSD.org> .\" Copyright (c) 2014, Luiz Otavio O Souza <loos@FreeBSD.org> .\" All rights reserved. .\" @@ -100,8 +101,18 @@ Consumers: The .Nm driver was written by -.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org -and -.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org . +.An Max Khon Aq Mt fjoe@FreeBSD.org +as +.Xr geom_uzip 4 . +.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org +copied it over as +.Nm +and added LZMA functionality . This manual page was written by -.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org . +.An Ceri Davies Aq Mt ceri@FreeBSD.org +for the +.Xr geom_uzip 4 , +and modified by +.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org +to match +.Nm . Modified: projects/clang380-import/share/man/man5/mailer.conf.5 ============================================================================== --- projects/clang380-import/share/man/man5/mailer.conf.5 Sun Feb 21 13:03:58 2016 (r295844) +++ projects/clang380-import/share/man/man5/mailer.conf.5 Sun Feb 21 13:49:26 2016 (r295845) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 8, 2010 +.Dd February 18, 2016 .Dt MAILER.CONF 5 .Os .Sh NAME @@ -101,9 +101,10 @@ mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail .Ed .Pp -This example shows how to invoke a sendmail-workalike like +Using .Nm Postfix -in place of +(from ports) +to replace .Xr sendmail 8 : .Bd -literal -offset indent # Emulate sendmail using postfix @@ -113,12 +114,10 @@ mailq /usr/local/sbin/sendmail newaliases /usr/local/sbin/sendmail .Ed .Pp -This example shows -how to invoke -a sendmail-workalike with +Using .Nm Exim (from ports) -in place of +to replace .Xr sendmail 8 : .Bd -literal -offset indent # Emulate sendmail using exim @@ -129,24 +128,40 @@ newaliases /usr/bin/true rmail /usr/local/sbin/exim -i -oee .Ed .Pp -This example shows the use of the +Using .Nm mini_sendmail -package from ports in place of -.Xr sendmail 8 . -Note the use of additional arguments. +(from ports) +to replace +.Xr sendmail 8 : .Bd -literal -offset indent # Send outgoing mail to a smart relay using mini_sendmail sendmail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost .Ed +.Pp +Using +.Xr dma 8 +to replace +.Xr sendmail 8 : +.Bd -literal -offset indent +# Execute dma instead of sendmail +sendmail /usr/libexec/dma +send-mail /usr/libexec/dma +mailq /usr/libexec/dma +newaliases /usr/libexec/dma +rmail /usr/libexec/dma +.Ed .Sh SEE ALSO .Xr mail 1 , .Xr mailq 1 , .Xr newaliases 1 , +.Xr dma 8 , .Xr mailwrapper 8 , .Xr sendmail 8 .Pp *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602211349.u1LDnQlI048467>