Date: Thu, 20 Jun 2019 15:56:09 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r349236 - in projects/fuse2: . bin/csh bin/sh bin/stty cddl/usr.sbin/dtrace/tests/amd64 contrib/compiler-rt/lib/sanitizer_common contrib/elftoolchain/elfdump contrib/elftoolchain/readel... Message-ID: <201906201556.x5KFu9Fm063704@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Thu Jun 20 15:56:08 2019 New Revision: 349236 URL: https://svnweb.freebsd.org/changeset/base/349236 Log: MFHead @349234 Sponsored by: The FreeBSD Foundation Added: projects/fuse2/.clang-format - copied unchanged from r349234, head/.clang-format projects/fuse2/cddl/usr.sbin/dtrace/tests/amd64/Makefile - copied unchanged from r349234, head/cddl/usr.sbin/dtrace/tests/amd64/Makefile projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5_different_window_size.rar.uu - copied unchanged from r349234, head/contrib/libarchive/libarchive/test/test_read_format_rar5_different_window_size.rar.uu projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar_ppmd_use_after_free2.rar.uu - copied unchanged from r349234, head/contrib/libarchive/libarchive/test/test_read_format_rar_ppmd_use_after_free2.rar.uu projects/fuse2/share/man/man4/pwmc.4 - copied unchanged from r349234, head/share/man/man4/pwmc.4 projects/fuse2/share/man/man9/VOP_BMAP.9 - copied unchanged from r349234, head/share/man/man9/VOP_BMAP.9 projects/fuse2/share/timedef/zh_TW.Big5.src - copied unchanged from r349234, head/share/timedef/zh_TW.Big5.src projects/fuse2/stand/efi/boot1/proto.c - copied unchanged from r349234, head/stand/efi/boot1/proto.c projects/fuse2/stand/efi/boot1/proto.h - copied unchanged from r349234, head/stand/efi/boot1/proto.h projects/fuse2/stand/efi/gptboot/ - copied from r349234, head/stand/efi/gptboot/ projects/fuse2/sys/arm/mv/a37x0_gpio.c - copied unchanged from r349234, head/sys/arm/mv/a37x0_gpio.c projects/fuse2/sys/conf/ldscript.set_padding - copied unchanged from r349234, head/sys/conf/ldscript.set_padding projects/fuse2/sys/dev/pwm/ofw_pwm.h - copied unchanged from r349234, head/sys/dev/pwm/ofw_pwm.h projects/fuse2/sys/dev/pwm/ofw_pwmbus.c - copied unchanged from r349234, head/sys/dev/pwm/ofw_pwmbus.c projects/fuse2/sys/dev/pwm/pwmc.h - copied unchanged from r349234, head/sys/dev/pwm/pwmc.h projects/fuse2/sys/dev/sdio/ - copied from r349234, head/sys/dev/sdio/ projects/fuse2/sys/dev/usb/usb_hub_acpi.c - copied unchanged from r349234, head/sys/dev/usb/usb_hub_acpi.c projects/fuse2/sys/dev/usb/usb_hub_private.h - copied unchanged from r349234, head/sys/dev/usb/usb_hub_private.h projects/fuse2/sys/libkern/gsb_crc32.c - copied unchanged from r349234, head/sys/libkern/gsb_crc32.c projects/fuse2/sys/modules/arm_ti/ - copied from r349234, head/sys/modules/arm_ti/ projects/fuse2/sys/modules/pwm/ - copied from r349234, head/sys/modules/pwm/ projects/fuse2/sys/modules/sdio/ - copied from r349234, head/sys/modules/sdio/ projects/fuse2/sys/sys/gsb_crc32.h - copied unchanged from r349234, head/sys/sys/gsb_crc32.h projects/fuse2/sys/tools/sdiodevs2h.awk - copied unchanged from r349234, head/sys/tools/sdiodevs2h.awk projects/fuse2/tests/sys/devrandom/ - copied from r349234, head/tests/sys/devrandom/ projects/fuse2/usr.sbin/bhyve/net_utils.c - copied unchanged from r349234, head/usr.sbin/bhyve/net_utils.c projects/fuse2/usr.sbin/bhyve/net_utils.h - copied unchanged from r349234, head/usr.sbin/bhyve/net_utils.h Replaced: projects/fuse2/sys/dev/pwm/pwmbus.h - copied unchanged from r349234, head/sys/dev/pwm/pwmbus.h Deleted: projects/fuse2/sys/dev/pwm/pwm_if.m projects/fuse2/sys/libkern/crc32.c projects/fuse2/sys/sys/capability.h projects/fuse2/sys/sys/pwm.h Modified: projects/fuse2/.gitattributes projects/fuse2/Makefile.inc1 projects/fuse2/ObsoleteFiles.inc projects/fuse2/UPDATING projects/fuse2/bin/csh/Makefile projects/fuse2/bin/sh/Makefile projects/fuse2/bin/stty/modes.c projects/fuse2/bin/stty/print.c projects/fuse2/bin/stty/stty.1 projects/fuse2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc projects/fuse2/contrib/elftoolchain/elfdump/elfdump.c projects/fuse2/contrib/elftoolchain/readelf/readelf.c projects/fuse2/contrib/libarchive/NEWS projects/fuse2/contrib/libarchive/README.md projects/fuse2/contrib/libarchive/libarchive/archive.h projects/fuse2/contrib/libarchive/libarchive/archive_entry.h projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar.c projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c projects/fuse2/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c projects/fuse2/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar.c projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c projects/fuse2/contrib/libarchive/libarchive_fe/line_reader.c projects/fuse2/contrib/libarchive/libarchive_fe/passphrase.c projects/fuse2/contrib/libarchive/tar/bsdtar.1 projects/fuse2/contrib/libunwind/src/UnwindRegistersRestore.S projects/fuse2/contrib/libunwind/src/UnwindRegistersSave.S projects/fuse2/contrib/libunwind/src/assembly.h projects/fuse2/contrib/llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp projects/fuse2/contrib/llvm/lib/MC/ELFObjectWriter.cpp projects/fuse2/contrib/llvm/lib/MC/MCWin64EH.cpp projects/fuse2/contrib/llvm/lib/MC/WasmObjectWriter.cpp projects/fuse2/contrib/llvm/lib/Object/COFFImportFile.cpp projects/fuse2/contrib/llvm/lib/Target/AArch64/AArch64SchedExynosM4.td projects/fuse2/contrib/llvm/lib/Target/AArch64/AArch64SchedPredExynos.td projects/fuse2/contrib/llvm/lib/Target/AArch64/AArch64SchedPredicates.td projects/fuse2/contrib/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp projects/fuse2/contrib/llvm/lib/Target/AMDGPU/VOP2Instructions.td projects/fuse2/contrib/llvm/lib/Target/AVR/AVRISelLowering.cpp projects/fuse2/contrib/llvm/lib/Target/AVR/AVRISelLowering.h projects/fuse2/contrib/llvm/lib/Target/AVR/AVRSubtarget.cpp projects/fuse2/contrib/llvm/lib/Target/AVR/AVRSubtarget.h projects/fuse2/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp projects/fuse2/contrib/llvm/lib/Target/Mips/MicroMips32r6InstrInfo.td projects/fuse2/contrib/llvm/lib/Target/Mips/MicroMipsInstrFPU.td projects/fuse2/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp projects/fuse2/contrib/llvm/lib/Target/Mips/MipsDSPInstrInfo.td projects/fuse2/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp projects/fuse2/contrib/llvm/lib/Target/Mips/MipsFastISel.cpp projects/fuse2/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp projects/fuse2/contrib/llvm/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp projects/fuse2/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp projects/fuse2/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp projects/fuse2/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/fuse2/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td projects/fuse2/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp projects/fuse2/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp projects/fuse2/contrib/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp projects/fuse2/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/fuse2/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/fuse2/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Driver/ToolChains/Linux.cpp projects/fuse2/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp projects/fuse2/contrib/llvm/tools/lld/COFF/Writer.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/Arch/PPC64.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/InputSection.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp projects/fuse2/contrib/llvm/tools/lld/ELF/Writer.cpp projects/fuse2/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp projects/fuse2/contrib/traceroute/traceroute.8 projects/fuse2/etc/Makefile projects/fuse2/etc/mtree/BSD.debug.dist projects/fuse2/etc/mtree/BSD.include.dist projects/fuse2/etc/mtree/BSD.tests.dist projects/fuse2/etc/mtree/BSD.usr.dist projects/fuse2/etc/mtree/BSD.var.dist projects/fuse2/etc/sendmail/Makefile projects/fuse2/gnu/lib/csu/Makefile projects/fuse2/gnu/lib/libgcc/Makefile projects/fuse2/gnu/lib/libgcov/Makefile projects/fuse2/include/Makefile projects/fuse2/lib/clang/freebsd_cc_version.h projects/fuse2/lib/clang/headers/Makefile projects/fuse2/lib/clang/include/clang/Basic/Version.inc projects/fuse2/lib/clang/include/clang/Config/config.h projects/fuse2/lib/clang/include/lld/Common/Version.inc projects/fuse2/lib/clang/include/llvm/Config/config.h projects/fuse2/lib/clang/include/llvm/Config/llvm-config.h projects/fuse2/lib/clang/include/llvm/Support/VCSRevision.h projects/fuse2/lib/csu/Makefile.inc projects/fuse2/lib/libarchive/config_freebsd.h projects/fuse2/lib/libarchive/tests/Makefile projects/fuse2/lib/libc/sys/open.2 projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.c projects/fuse2/lib/libcasper/services/cap_fileargs/cap_fileargs.h projects/fuse2/lib/libclang_rt/Makefile.inc projects/fuse2/lib/libmagic/Makefile projects/fuse2/lib/libufs/Makefile projects/fuse2/lib/libusb/libusb20.c projects/fuse2/lib/ncurses/ncurses/Makefile projects/fuse2/libexec/rc/rc.conf projects/fuse2/libexec/rc/rc.d/hostapd projects/fuse2/libexec/rc/rc.d/local projects/fuse2/release/release.sh projects/fuse2/release/tools/arm.subr projects/fuse2/sbin/camcontrol/camcontrol.c projects/fuse2/sbin/dump/dump.8 projects/fuse2/sbin/fsck_msdosfs/boot.c projects/fuse2/sbin/fsck_msdosfs/dir.c projects/fuse2/sbin/fsck_msdosfs/main.c projects/fuse2/share/examples/bhyve/vmrun.sh projects/fuse2/share/man/man3/Makefile projects/fuse2/share/man/man4/Makefile projects/fuse2/share/man/man4/filemon.4 projects/fuse2/share/man/man4/netmap.4 projects/fuse2/share/man/man4/pci.4 projects/fuse2/share/man/man4/termios.4 projects/fuse2/share/man/man9/Makefile projects/fuse2/share/man/man9/fail.9 projects/fuse2/share/man/man9/sleep.9 projects/fuse2/share/man/man9/sleepqueue.9 projects/fuse2/share/man/man9/sysctl.9 projects/fuse2/share/misc/bsd-family-tree projects/fuse2/share/mk/bsd.README projects/fuse2/share/mk/bsd.dep.mk projects/fuse2/share/mk/bsd.progs.mk projects/fuse2/share/mk/bsd.suffixes.mk projects/fuse2/share/mk/bsd.sys.mk projects/fuse2/share/mk/local.sys.mk projects/fuse2/share/syscons/scrnmaps/Makefile projects/fuse2/share/timedef/Makefile projects/fuse2/share/vt/fonts/Makefile projects/fuse2/stand/common/disk.c projects/fuse2/stand/efi/Makefile projects/fuse2/stand/efi/boot1/Makefile projects/fuse2/stand/efi/boot1/boot1.c projects/fuse2/stand/efi/boot1/boot_module.h projects/fuse2/stand/efi/boot1/ufs_module.c projects/fuse2/stand/efi/boot1/zfs_module.c projects/fuse2/stand/efi/libefi/efinet.c projects/fuse2/stand/libsa/crc32_libkern.c projects/fuse2/stand/libsa/zfs/zfsimpl.c projects/fuse2/stand/ofw/libofw/ofw_console.c projects/fuse2/sys/amd64/amd64/fpu.c projects/fuse2/sys/amd64/amd64/pmap.c projects/fuse2/sys/amd64/amd64/trap.c projects/fuse2/sys/amd64/include/pmap.h projects/fuse2/sys/amd64/vmm/intel/vtd.c projects/fuse2/sys/arm/allwinner/a10_timer.c projects/fuse2/sys/arm/allwinner/aw_mmc.c projects/fuse2/sys/arm/allwinner/aw_pwm.c projects/fuse2/sys/arm/arm/pmap-v6.c projects/fuse2/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/fuse2/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c projects/fuse2/sys/arm/conf/GENERIC projects/fuse2/sys/arm/nvidia/drm2/tegra_bo.c projects/fuse2/sys/arm/ti/am335x/am335x_dmtpps.c projects/fuse2/sys/arm/ti/ti_i2c.c projects/fuse2/sys/arm64/arm64/pmap.c projects/fuse2/sys/arm64/conf/GENERIC projects/fuse2/sys/arm64/include/armreg.h projects/fuse2/sys/arm64/rockchip/if_dwc_rk.c projects/fuse2/sys/cam/cam_sim.c projects/fuse2/sys/cam/cam_sim.h projects/fuse2/sys/cam/nvme/nvme_xpt.c projects/fuse2/sys/cam/scsi/scsi_xpt.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h projects/fuse2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/fuse2/sys/compat/linuxkpi/common/include/linux/gfp.h projects/fuse2/sys/compat/linuxkpi/common/src/linux_page.c projects/fuse2/sys/conf/files projects/fuse2/sys/conf/files.arm64 projects/fuse2/sys/conf/kmod.mk projects/fuse2/sys/conf/ldscript.riscv projects/fuse2/sys/contrib/ipfilter/netinet/fil.c projects/fuse2/sys/contrib/ipfilter/netinet/ip_fil.h projects/fuse2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/fuse2/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/fuse2/sys/dev/atkbdc/psm.c projects/fuse2/sys/dev/ciss/ciss.c projects/fuse2/sys/dev/cxgbe/t4_main.c projects/fuse2/sys/dev/cxgbe/tom/t4_tls.c projects/fuse2/sys/dev/drm2/ttm/ttm_page_alloc.c projects/fuse2/sys/dev/etherswitch/e6000sw/e6000sw.c projects/fuse2/sys/dev/etherswitch/e6000sw/e6000swreg.h projects/fuse2/sys/dev/gpio/gpioregulator.c projects/fuse2/sys/dev/ipmi/ipmi_kcs.c projects/fuse2/sys/dev/iscsi/icl_soft.c projects/fuse2/sys/dev/iscsi_initiator/isc_subr.c projects/fuse2/sys/dev/liquidio/lio_bsd.h projects/fuse2/sys/dev/nvdimm/nvdimm.c projects/fuse2/sys/dev/nvme/nvme_sim.c projects/fuse2/sys/dev/pwm/ofw_pwm.c projects/fuse2/sys/dev/pwm/pwmbus.c projects/fuse2/sys/dev/pwm/pwmbus_if.m projects/fuse2/sys/dev/pwm/pwmc.c projects/fuse2/sys/dev/random/fortuna.c projects/fuse2/sys/dev/random/fortuna.h projects/fuse2/sys/dev/random/hash.c projects/fuse2/sys/dev/random/hash.h projects/fuse2/sys/dev/random/other_algorithm.c projects/fuse2/sys/dev/random/randomdev.c projects/fuse2/sys/dev/random/randomdev.h projects/fuse2/sys/dev/random/uint128.h projects/fuse2/sys/dev/sdhci/sdhci.c projects/fuse2/sys/dev/sdhci/sdhci_xenon.c projects/fuse2/sys/dev/ti/if_ti.c projects/fuse2/sys/dev/uart/uart_tty.c projects/fuse2/sys/dev/usb/net/if_cdce.c projects/fuse2/sys/dev/usb/serial/umcs.c projects/fuse2/sys/dev/usb/serial/usb_serial.c projects/fuse2/sys/dev/usb/usb_hub.c projects/fuse2/sys/dev/xen/gntdev/gntdev.c projects/fuse2/sys/fs/ext2fs/ext2_csum.c projects/fuse2/sys/fs/nandfs/nandfs_segment.c projects/fuse2/sys/fs/nandfs/nandfs_subr.c projects/fuse2/sys/fs/nandfs/nandfs_vfsops.c projects/fuse2/sys/geom/concat/g_concat.c projects/fuse2/sys/geom/eli/g_eli.c projects/fuse2/sys/geom/eli/g_eli.h projects/fuse2/sys/geom/eli/g_eli_hmac.c projects/fuse2/sys/geom/eli/pkcs5v2.c projects/fuse2/sys/geom/eli/pkcs5v2.h projects/fuse2/sys/geom/geom_disk.c projects/fuse2/sys/geom/geom_dump.c projects/fuse2/sys/geom/geom_int.h projects/fuse2/sys/geom/geom_kern.c projects/fuse2/sys/geom/journal/g_journal.c projects/fuse2/sys/geom/mirror/g_mirror.c projects/fuse2/sys/geom/multipath/g_multipath.c projects/fuse2/sys/geom/part/g_part_apm.c projects/fuse2/sys/geom/part/g_part_bsd64.c projects/fuse2/sys/geom/part/g_part_gpt.c projects/fuse2/sys/geom/part/g_part_mbr.c projects/fuse2/sys/geom/raid/g_raid.c projects/fuse2/sys/geom/raid/md_ddf.c projects/fuse2/sys/geom/raid3/g_raid3.c projects/fuse2/sys/geom/stripe/g_stripe.c projects/fuse2/sys/i386/i386/pmap.c projects/fuse2/sys/i386/i386/trap.c projects/fuse2/sys/kern/imgact_elf.c projects/fuse2/sys/kern/kern_clock.c projects/fuse2/sys/kern/kern_sendfile.c projects/fuse2/sys/kern/kern_synch.c projects/fuse2/sys/kern/kern_sysctl.c projects/fuse2/sys/kern/kern_uuid.c projects/fuse2/sys/kern/link_elf.c projects/fuse2/sys/kern/subr_compressor.c projects/fuse2/sys/kern/subr_sbuf.c projects/fuse2/sys/kern/subr_sleepqueue.c projects/fuse2/sys/kern/subr_taskqueue.c projects/fuse2/sys/kern/tty.c projects/fuse2/sys/kern/vfs_default.c projects/fuse2/sys/kern/vfs_vnops.c projects/fuse2/sys/kgssapi/krb5/kcrypto.c projects/fuse2/sys/kgssapi/krb5/kcrypto.h projects/fuse2/sys/kgssapi/krb5/kcrypto_arcfour.c projects/fuse2/sys/kgssapi/krb5/kcrypto_des.c projects/fuse2/sys/kgssapi/krb5/kcrypto_des3.c projects/fuse2/sys/libkern/x86/crc32_sse42.c projects/fuse2/sys/mips/mips/pmap.c projects/fuse2/sys/modules/Makefile projects/fuse2/sys/modules/allwinner/aw_pwm/Makefile projects/fuse2/sys/modules/efirt/Makefile projects/fuse2/sys/modules/hwpmc/Makefile projects/fuse2/sys/modules/iwmfw/Makefile.inc projects/fuse2/sys/modules/iwnfw/Makefile.inc projects/fuse2/sys/modules/mwlfw/Makefile projects/fuse2/sys/modules/ocs_fc/Makefile projects/fuse2/sys/modules/ralfw/Makefile.inc projects/fuse2/sys/modules/rtwnfw/Makefile.inc projects/fuse2/sys/modules/ti/Makefile projects/fuse2/sys/modules/usb/rsufw/Makefile.inc projects/fuse2/sys/modules/usb/runfw/Makefile projects/fuse2/sys/modules/usb/usb/Makefile projects/fuse2/sys/net/if_lagg.c projects/fuse2/sys/net/iflib.c projects/fuse2/sys/net/iflib.h projects/fuse2/sys/net/iflib_private.h projects/fuse2/sys/net80211/ieee80211.c projects/fuse2/sys/netinet/ip_carp.c projects/fuse2/sys/netinet/ip_output.c projects/fuse2/sys/netinet/libalias/alias_sctp.c projects/fuse2/sys/netinet/sctp_crc32.c projects/fuse2/sys/netinet/tcp_stacks/rack.c projects/fuse2/sys/netinet/tcp_stacks/tcp_rack.h projects/fuse2/sys/netinet6/ip6_output.c projects/fuse2/sys/netipsec/ipsec.c projects/fuse2/sys/netipsec/ipsec.h projects/fuse2/sys/netipsec/xform_ah.c projects/fuse2/sys/netipsec/xform_esp.c projects/fuse2/sys/netpfil/pf/pf.c projects/fuse2/sys/opencrypto/cryptodev.c projects/fuse2/sys/powerpc/aim/mmu_oea.c projects/fuse2/sys/powerpc/aim/mmu_oea64.c projects/fuse2/sys/powerpc/aim/mmu_oea64.h projects/fuse2/sys/powerpc/aim/slb.c projects/fuse2/sys/powerpc/include/slb.h projects/fuse2/sys/powerpc/ofw/ofw_initrd.c projects/fuse2/sys/powerpc/ofw/ofw_pcibus.c projects/fuse2/sys/powerpc/powernv/opal_hmi.c projects/fuse2/sys/powerpc/powernv/opal_sensor.c projects/fuse2/sys/powerpc/powerpc/trap.c projects/fuse2/sys/powerpc/pseries/mmu_phyp.c projects/fuse2/sys/powerpc/pseries/xics.c projects/fuse2/sys/riscv/conf/GENERIC projects/fuse2/sys/riscv/include/asm.h projects/fuse2/sys/riscv/include/elf.h projects/fuse2/sys/riscv/include/md_var.h projects/fuse2/sys/riscv/include/pcpu.h projects/fuse2/sys/riscv/riscv/elf_machdep.c projects/fuse2/sys/riscv/riscv/exception.S projects/fuse2/sys/riscv/riscv/identcpu.c projects/fuse2/sys/riscv/riscv/locore.S projects/fuse2/sys/riscv/riscv/machdep.c projects/fuse2/sys/riscv/riscv/mp_machdep.c projects/fuse2/sys/riscv/riscv/pmap.c projects/fuse2/sys/riscv/riscv/swtch.S projects/fuse2/sys/riscv/riscv/vm_machdep.c projects/fuse2/sys/sys/_termios.h projects/fuse2/sys/sys/counter.h projects/fuse2/sys/sys/elf_common.h projects/fuse2/sys/sys/fail.h projects/fuse2/sys/sys/filio.h projects/fuse2/sys/sys/libkern.h projects/fuse2/sys/sys/mbuf.h projects/fuse2/sys/sys/param.h projects/fuse2/sys/sys/queue.h projects/fuse2/sys/sys/sbuf.h projects/fuse2/sys/sys/sleepqueue.h projects/fuse2/sys/sys/syscallsubr.h projects/fuse2/sys/sys/sysctl.h projects/fuse2/sys/sys/systm.h projects/fuse2/sys/sys/ucred.h projects/fuse2/sys/ufs/ffs/ffs_alloc.c projects/fuse2/sys/ufs/ffs/ffs_snapshot.c projects/fuse2/sys/ufs/ffs/ffs_subr.c projects/fuse2/sys/ufs/ffs/ffs_vfsops.c projects/fuse2/sys/ufs/ufs/ufs_bmap.c projects/fuse2/sys/vm/swap_pager.c projects/fuse2/sys/vm/uma_core.c projects/fuse2/sys/vm/vm_glue.c projects/fuse2/sys/vm/vm_kern.c projects/fuse2/sys/vm/vm_map.c projects/fuse2/sys/vm/vm_map.h projects/fuse2/sys/vm/vm_mmap.c projects/fuse2/sys/vm/vm_page.c projects/fuse2/sys/vm/vm_reserv.c projects/fuse2/sys/x86/x86/mca.c projects/fuse2/tests/sys/Makefile projects/fuse2/tests/sys/kern/Makefile projects/fuse2/tests/sys/kern/libkern_crc32.c projects/fuse2/tests/sys/net/if_clone_test.sh projects/fuse2/tools/build/Makefile projects/fuse2/tools/build/mk/OptionalObsoleteFiles.inc projects/fuse2/usr.bin/awk/Makefile projects/fuse2/usr.bin/bsdcat/Makefile projects/fuse2/usr.bin/calendar/calendars/calendar.birthday projects/fuse2/usr.bin/cpio/Makefile projects/fuse2/usr.bin/procstat/procstat_auxv.c projects/fuse2/usr.bin/tail/extern.h projects/fuse2/usr.bin/tail/forward.c projects/fuse2/usr.bin/tail/misc.c projects/fuse2/usr.bin/tail/read.c projects/fuse2/usr.bin/tail/reverse.c projects/fuse2/usr.bin/tail/tail.c projects/fuse2/usr.bin/tar/Makefile projects/fuse2/usr.bin/vi/catalog/Makefile projects/fuse2/usr.bin/vtfontcvt/vtfontcvt.c projects/fuse2/usr.sbin/bhyve/Makefile projects/fuse2/usr.sbin/bhyve/pci_e82545.c projects/fuse2/usr.sbin/bhyve/pci_emul.c projects/fuse2/usr.sbin/bhyve/pci_emul.h projects/fuse2/usr.sbin/bhyve/pci_nvme.c projects/fuse2/usr.sbin/bhyve/pci_passthru.c projects/fuse2/usr.sbin/bhyve/pci_virtio_console.c projects/fuse2/usr.sbin/bhyve/pci_virtio_net.c projects/fuse2/usr.sbin/bhyve/pci_virtio_scsi.c projects/fuse2/usr.sbin/bhyve/rfb.c (contents, props changed) projects/fuse2/usr.sbin/bhyve/virtio.c projects/fuse2/usr.sbin/bhyve/virtio.h projects/fuse2/usr.sbin/camdd/camdd.c projects/fuse2/usr.sbin/iostat/iostat.c projects/fuse2/usr.sbin/pwm/pwm.8 projects/fuse2/usr.sbin/pwm/pwm.c Directory Properties: projects/fuse2/ (props changed) projects/fuse2/cddl/ (props changed) projects/fuse2/contrib/compiler-rt/ (props changed) projects/fuse2/contrib/elftoolchain/ (props changed) projects/fuse2/contrib/elftoolchain/elfdump/ (props changed) projects/fuse2/contrib/libarchive/ (props changed) projects/fuse2/contrib/libc++/ (props changed) projects/fuse2/contrib/libunwind/ (props changed) projects/fuse2/contrib/llvm/ (props changed) projects/fuse2/contrib/llvm/tools/clang/ (props changed) projects/fuse2/contrib/llvm/tools/lld/ (props changed) projects/fuse2/contrib/llvm/tools/lldb/ (props changed) projects/fuse2/contrib/openmp/ (props changed) projects/fuse2/gnu/lib/ (props changed) projects/fuse2/sys/cddl/contrib/opensolaris/ (props changed) projects/fuse2/sys/contrib/ipfilter/ (props changed) Copied: projects/fuse2/.clang-format (from r349234, head/.clang-format) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/.clang-format Thu Jun 20 15:56:08 2019 (r349236, copy of r349234, head/.clang-format) @@ -0,0 +1,77 @@ +# $FreeBSD$ +# Basic .clang-format +--- +BasedOnStyle: WebKit +AlignAfterOpenBracket: DontAlign +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Left +AlignOperands: false +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: InlineOnly +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterReturnType: TopLevelDefinitions +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: MultiLine +BinPackArguments: true +BinPackParameters: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: WebKit +BreakBeforeTernaryOperators: false +# TODO: BreakStringLiterals can cause very strange formatting so turn it off? +BreakStringLiterals: false +PenaltyBreakBeforeFirstCallParameter: 1000 +CompactNamespaces: true +DerivePointerAlignment: false +DisableFormat: false +ForEachMacros: + - SLIST_FOREACH + - SLIST_FOREACH_SAFE + - LIST_FOREACH + - LIST_FOREACH_SAFE + - STAILQ_FOREACH + - STAILQ_FOREACH_SAFE + - TAILQ_FOREACH + - TAILQ_FOREACH_SAFE + - TAILQ_FOREACH_REVERSE + - TAILQ_FOREACH_REVERSE_SAFE + - RB_FOREACH + - RB_FOREACH_SAFE + - RB_FOREACH_FROM + - RB_FOREACH_REVERSE + - RB_FOREACH_REVERSE_FROM + - RB_FOREACH_REVERSE_SAFE + - FOREACH_THREAD_IN_PROC + - FOREACH_PROC_IN_SYSTEM + - FOREACH_PRISON_CHILD + - FOREACH_PRISON_DESCENDANT + - FOREACH_PRISON_DESCENDANT_LOCKED + - FOREACH_PRISON_DESCENDANT_LOCKED_LEVEL + - MNT_VNODE_FOREACH_ALL + - MNT_VNODE_FOREACH_ACTIVE +IndentCaseLabels: false +IndentPPDirectives: None +Language: Cpp +NamespaceIndentation: None +PointerAlignment: Right +ContinuationIndentWidth: 4 +IndentWidth: 8 +TabWidth: 8 +ColumnLimit: 80 +UseTab: Always +SpaceAfterCStyleCast: false +SortIncludes: false +KeepEmptyLinesAtTheStartOfBlocks: true +# The options below will only be supported starting with clang 9.0: +# TODO-CLANG-9: TypenameMacros: +# TODO-CLANG-9: - SLIST_HEAD +# TODO-CLANG-9: - SLIST_ENTRY +# TODO-CLANG-9: - TAILQ_ENTRY +# TODO-CLANG-9: - TAILQ_HEAD +# TODO-CLANG-9: - STAILQ_ENTRY +# TODO-CLANG-9: - STAILQ_HEAD +... Modified: projects/fuse2/.gitattributes ============================================================================== --- projects/fuse2/.gitattributes Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/.gitattributes Thu Jun 20 15:56:08 2019 (r349236) @@ -4,3 +4,4 @@ *.hpp diff=cpp *.py diff=python . svn-properties=svn:keywords=tools/build/options/WITHOUT_LOADER_ZFS +.clang-format svn-properties=svn:keywords=FreeBSD=%H Modified: projects/fuse2/Makefile.inc1 ============================================================================== --- projects/fuse2/Makefile.inc1 Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/Makefile.inc1 Thu Jun 20 15:56:08 2019 (r349236) @@ -553,16 +553,23 @@ VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} .endif .if !defined(PKG_VERSION) -.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} || ${_BRANCH:MALPHA*} +.if ${_BRANCH:MSTABLE*} || ${_BRANCH:MCURRENT*} TIMENOW= %Y%m%d%H%M%S EXTRA_REVISION= .s${TIMENOW:gmtime} -.endif -.if ${_BRANCH:M*-p*} +.elif ${_BRANCH:MALPHA*} +EXTRA_REVISION= _${_BRANCH:C/-ALPHA/.a/} +.elif ${_BRANCH:MBETA*} +EXTRA_REVISION= _${_BRANCH:C/-BETA/.b/} +.elif ${_BRANCH:MRC*} +EXTRA_REVISION= _${_BRANCH:C/-RC/.r/} +.elif ${_BRANCH:MPRERELEASE*} +EXTRA_REVISION= _${_BRANCH:C/-PRERELEASE/.p/} +.elif ${_BRANCH:M*-p*} EXTRA_REVISION= _${_BRANCH:C/.*-p([0-9]+$)/\1/} .endif PKG_VERSION= ${_REVISION}${EXTRA_REVISION} .endif -.endif # !defined(_MKSHOWCONFIG) +.endif # !defined(PKG_VERSION) .if !defined(_MKSHOWCONFIG) _CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \ @@ -2546,6 +2553,7 @@ NXBDIRS+= \ usr.bin/find \ usr.bin/grep \ usr.bin/gzip \ + usr.bin/head \ usr.bin/id \ usr.bin/lex \ usr.bin/limits \ Modified: projects/fuse2/ObsoleteFiles.inc ============================================================================== --- projects/fuse2/ObsoleteFiles.inc Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/ObsoleteFiles.inc Thu Jun 20 15:56:08 2019 (r349236) @@ -38,6 +38,161 @@ # xargs -n1 | sort | uniq -d; # done +# 20190618: sys/capability.h removed (sys/capsicum.h is the one to use) +OLD_FILES+=usr/include/sys/capability.h +# 20190615: sys/pwm.h renamed to dev/pwmc.h +OLD_FILES+=usr/include/sys/pwm.h +# 20190612: new clang import which bumps version from 8.0.0 to 8.0.1. +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/esan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/hwasan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/netbsd_syscall_hooks.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/scudo_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/8.0.0/include/sanitizer +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_complex_builtins.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_device_functions.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_libdevice_declares.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/8.0.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/altivec.h +OLD_FILES+=usr/lib/clang/8.0.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/arm64intr.h +OLD_FILES+=usr/lib/clang/8.0.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/8.0.0/include/arm_fp16.h +OLD_FILES+=usr/lib/clang/8.0.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/8.0.0/include/armintr.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bitalgintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmi2intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbitalgintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvbmi2intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvnniintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vnniintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqvlintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/cetintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/cldemoteintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/clwbintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/clzerointrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/8.0.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/gfniintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/immintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/invpcidintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/lwpintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/8.0.0/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/8.0.0/include/mmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/module.modulemap +OLD_FILES+=usr/lib/clang/8.0.0/include/movdirintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/msa.h +OLD_FILES+=usr/lib/clang/8.0.0/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/opencl-c.h +OLD_FILES+=usr/lib/clang/8.0.0/include/pconfigintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/ptwriteintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/s390intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/sgxintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/shaintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/smmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/vadefs.h +OLD_FILES+=usr/lib/clang/8.0.0/include/vaesintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/vecintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/vpclmulqdqintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/waitpkgintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/wbnoinvdintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/x86intrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xopintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/8.0.0/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/8.0.0/include +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.so +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-armhf.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/8.0.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/8.0.0/lib +OLD_DIRS+=usr/lib/clang/8.0.0 + # 20190523: Remove obsolete kgzip and support files OLD_FILES+=usr/sbin/kgzip OLD_FILES+=usr/lib/kgzldr.o @@ -1409,6 +1564,8 @@ OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3 # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h +# 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc +OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0. OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h Modified: projects/fuse2/UPDATING ============================================================================== --- projects/fuse2/UPDATING Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/UPDATING Thu Jun 20 15:56:08 2019 (r349236) @@ -31,7 +31,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20190606: +20190620: The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls and the "-o sync_unmount" and "-o init_backgrounded" mount options have been removed from mount_fusefs(8). You can safely remove them from @@ -42,6 +42,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: vfs.fusefs.data_cache_invalidate sysctls have been removed. If you felt the need to set any of them to a non-default value, please tell asomers@FreeBSD.org why. + +20190612: + Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have + been upgraded to 8.0.1. Please see the 20141231 entry below for + information about prerequisites and upgrading, if you are not already + using clang 3.5.0 or higher. + +20190608: + A fix was applied to i386 kernel modules to avoid panics with + dpcpu or vnet. Users need to recompile i386 kernel modules + having pcpu or vnet sections or they will refuse to load. 20190513: User-wired pages now have their own counter, Modified: projects/fuse2/bin/csh/Makefile ============================================================================== --- projects/fuse2/bin/csh/Makefile Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/bin/csh/Makefile Thu Jun 20 15:56:08 2019 (r349236) @@ -117,6 +117,7 @@ csh.1: tcsh.man build-tools: gethost +DEPENDOBJS+= gethost gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META} @rm -f ${.TARGET} ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ Modified: projects/fuse2/bin/sh/Makefile ============================================================================== --- projects/fuse2/bin/sh/Makefile Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/bin/sh/Makefile Thu Jun 20 15:56:08 2019 (r349236) @@ -48,6 +48,7 @@ builtins.h: .NOMETA builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} +DEPENDOBJS+= mknodes mksyntax mknodes mksyntax: ${BUILD_TOOLS_META} .ORDER: nodes.c nodes.h Modified: projects/fuse2/bin/stty/modes.c ============================================================================== --- projects/fuse2/bin/stty/modes.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/bin/stty/modes.c Thu Jun 20 15:56:08 2019 (r349236) @@ -91,6 +91,8 @@ static const struct modes cmodes[] = { { "-rtsflow", 0, CRTS_IFLOW }, { "mdmbuf", MDMBUF, 0 }, { "-mdmbuf", 0, MDMBUF }, + { "rtsdtr", 0, CNO_RTSDTR }, + { "-rtsdtr", CNO_RTSDTR, 0 }, { NULL, 0, 0 }, }; Modified: projects/fuse2/bin/stty/print.c ============================================================================== --- projects/fuse2/bin/stty/print.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/bin/stty/print.c Thu Jun 20 15:56:08 2019 (r349236) @@ -184,6 +184,12 @@ print(struct termios *tp, struct winsize *wp, int ldis put("-dsrflow", CDSR_OFLOW, 0); put("-dtrflow", CDTR_IFLOW, 0); put("-mdmbuf", MDMBUF, 0); /* XXX mdmbuf == dtrflow */ + if (on(CNO_RTSDTR)) + bput("-rtsdtr"); + else { + if (fmt >= BSD) + bput("rtsdtr"); + } /* special control characters */ cc = tp->c_cc; Modified: projects/fuse2/bin/stty/stty.1 ============================================================================== --- projects/fuse2/bin/stty/stty.1 Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/bin/stty/stty.1 Thu Jun 20 15:56:08 2019 (r349236) @@ -145,6 +145,8 @@ Assume a line without (with) modem control. .It Cm crtscts Pq Fl crtscts Enable (disable) RTS/CTS flow control. +.It Cm rtsdtr Pq Fl -rtsdtr +Enable (disable) asserting RTS/DTR on open. .El .Ss Input Modes: This corresponds to the c_iflag in the termios structure. Copied: projects/fuse2/cddl/usr.sbin/dtrace/tests/amd64/Makefile (from r349234, head/cddl/usr.sbin/dtrace/tests/amd64/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/fuse2/cddl/usr.sbin/dtrace/tests/amd64/Makefile Thu Jun 20 15:56:08 2019 (r349236, copy of r349234, head/cddl/usr.sbin/dtrace/tests/amd64/Makefile) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/amd64 +TESTS_SUBDIRS+= arrays + +.PATH: ${.CURDIR:H:H:H:H:H}/tests +KYUAFILE= YES + +.include <bsd.test.mk> Modified: projects/fuse2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc ============================================================================== --- projects/fuse2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc Thu Jun 20 15:56:08 2019 (r349236) @@ -124,7 +124,9 @@ #include <dev/isa/isvio.h> #include <dev/isa/wtreg.h> #include <dev/iscsi/iscsi_ioctl.h> +#if 0 #include <dev/nvmm/nvmm_ioctl.h> +#endif #include <dev/ofw/openfirmio.h> #include <dev/pci/amrio.h> #include <dev/pci/mlyreg.h> Modified: projects/fuse2/contrib/elftoolchain/elfdump/elfdump.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/elfdump/elfdump.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/elftoolchain/elfdump/elfdump.c Thu Jun 20 15:56:08 2019 (r349236) @@ -343,17 +343,20 @@ elf_phdr_type_str(unsigned int type) static char s_type[32]; switch (type) { - case PT_NULL: return "PT_NULL"; - case PT_LOAD: return "PT_LOAD"; - case PT_DYNAMIC: return "PT_DYNAMIC"; - case PT_INTERP: return "PT_INTERP"; - case PT_NOTE: return "PT_NOTE"; - case PT_SHLIB: return "PT_SHLIB"; - case PT_PHDR: return "PT_PHDR"; - case PT_TLS: return "PT_TLS"; - case PT_GNU_EH_FRAME: return "PT_GNU_EH_FRAME"; - case PT_GNU_STACK: return "PT_GNU_STACK"; - case PT_GNU_RELRO: return "PT_GNU_RELRO"; + case PT_NULL: return "PT_NULL"; + case PT_LOAD: return "PT_LOAD"; + case PT_DYNAMIC: return "PT_DYNAMIC"; + case PT_INTERP: return "PT_INTERP"; + case PT_NOTE: return "PT_NOTE"; + case PT_SHLIB: return "PT_SHLIB"; + case PT_PHDR: return "PT_PHDR"; + case PT_TLS: return "PT_TLS"; + case PT_GNU_EH_FRAME: return "PT_GNU_EH_FRAME"; + case PT_GNU_STACK: return "PT_GNU_STACK"; + case PT_GNU_RELRO: return "PT_GNU_RELRO"; + case PT_OPENBSD_RANDOMIZE: return "PT_OPENBSD_RANDOMIZE"; + case PT_OPENBSD_WXNEEDED: return "PT_OPENBSD_WXNEEDED"; + case PT_OPENBSD_BOOTDATA: return "PT_OPENBSD_BOOTDATA"; } snprintf(s_type, sizeof(s_type), "<unknown: %#x>", type); return (s_type); Modified: projects/fuse2/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/fuse2/contrib/elftoolchain/readelf/readelf.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/elftoolchain/readelf/readelf.c Thu Jun 20 15:56:08 2019 (r349236) @@ -674,6 +674,9 @@ phdr_type(unsigned int mach, unsigned int ptype) case PT_GNU_EH_FRAME: return "GNU_EH_FRAME"; case PT_GNU_STACK: return "GNU_STACK"; case PT_GNU_RELRO: return "GNU_RELRO"; + case PT_OPENBSD_RANDOMIZE: return "OPENBSD_RANDOMIZE"; + case PT_OPENBSD_WXNEEDED: return "OPENBSD_WXNEEDED"; + case PT_OPENBSD_BOOTDATA: return "OPENBSD_BOOTDATA"; default: if (ptype >= PT_LOOS && ptype <= PT_HIOS) snprintf(s_ptype, sizeof(s_ptype), "LOOS+%#x", Modified: projects/fuse2/contrib/libarchive/NEWS ============================================================================== --- projects/fuse2/contrib/libarchive/NEWS Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/NEWS Thu Jun 20 15:56:08 2019 (r349236) @@ -1,3 +1,7 @@ +Jun 11, 2019: libarchive 3.4.0 released + +May 18, 2019: Fixes for reading Android APK and JAR archives + Apr 16, 2019: Support for non-recursive list and extract Apr 14, 2019: New tar option: --exclude-vcs @@ -6,7 +10,7 @@ Mar 27, 2019: Support for file and directory symlinks Mar 12, 2019: Important fixes for storing file attributes and flags -Jan 20, 2019: Support for xz, lzma, ppmd8 and bzip2 compression in zip archives +Jan 20, 2019: Support for xz, lzma, ppmd8 and bzip2 decompression in ZIP files Oct 06, 2018: RAR 5.0 reader Modified: projects/fuse2/contrib/libarchive/README.md ============================================================================== --- projects/fuse2/contrib/libarchive/README.md Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/README.md Thu Jun 20 15:56:08 2019 (r349236) @@ -81,6 +81,7 @@ Currently, the library automatically detects and reads * Binary cpio (big-endian or little-endian) * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions) * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives) + * ZIPX archives (with support for bzip2, ppmd8, lzma and xz compressed entries) * GNU and BSD 'ar' archives * 'mtree' format * 7-Zip archives Modified: projects/fuse2/contrib/libarchive/libarchive/archive.h ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive.h Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive.h Thu Jun 20 15:56:08 2019 (r349236) @@ -36,7 +36,7 @@ * assert that ARCHIVE_VERSION_NUMBER >= 2012108. */ /* Note: Compiler will complain if this does not match archive_entry.h! */ -#define ARCHIVE_VERSION_NUMBER 3003003 +#define ARCHIVE_VERSION_NUMBER 3004000 #include <sys/stat.h> #include <stddef.h> /* for wchar_t */ @@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_ONLY_STRING "3.3.3" +#define ARCHIVE_VERSION_ONLY_STRING "3.4.0" #define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char * archive_version_string(void); Modified: projects/fuse2/contrib/libarchive/libarchive/archive_entry.h ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_entry.h Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive_entry.h Thu Jun 20 15:56:08 2019 (r349236) @@ -30,7 +30,7 @@ #define ARCHIVE_ENTRY_H_INCLUDED /* Note: Compiler will complain if this does not match archive.h! */ -#define ARCHIVE_VERSION_NUMBER 3003003 +#define ARCHIVE_VERSION_NUMBER 3004000 /* * Note: archive_entry.h is for use outside of libarchive; the Modified: projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar.c Thu Jun 20 15:56:08 2019 (r349236) @@ -1027,6 +1027,7 @@ archive_read_format_rar_read_data(struct archive_read if (ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { __archive_ppmd7_functions.Ppmd7_Free(&rar->ppmd7_context); rar->start_new_table = 1; + rar->ppmd_valid = 0; } break; Modified: projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive_read_support_format_rar5.c Thu Jun 20 15:56:08 2019 (r349236) @@ -1125,6 +1125,13 @@ static void init_header(struct archive_read* a) { a->archive.archive_format_name = "RAR5"; } +static void init_window_mask(struct rar5* rar) { + if (rar->cstate.window_size) + rar->cstate.window_mask = rar->cstate.window_size - 1; + else + rar->cstate.window_mask = 0; +} + enum HEADER_FLAGS { HFL_EXTRA_DATA = 0x0001, HFL_DATA = 0x0002, @@ -1672,6 +1679,7 @@ static int process_head_file(struct archive_read* a, s /* Values up to 64M should fit into ssize_t on every * architecture. */ rar->cstate.window_size = (ssize_t) window_size; + init_window_mask(rar); rar->file.solid = (compression_info & SOLID) > 0; rar->file.service = 0; @@ -2235,10 +2243,7 @@ static int rar5_read_header(struct archive_read *a, static void init_unpack(struct rar5* rar) { rar->file.calculated_crc32 = 0; - if (rar->cstate.window_size) - rar->cstate.window_mask = rar->cstate.window_size - 1; - else - rar->cstate.window_mask = 0; + init_window_mask(rar); free(rar->cstate.window_buf); free(rar->cstate.filtered_buf); @@ -2851,7 +2856,7 @@ static int do_uncompress_block(struct archive_read* a, * - Values lower than 256 are just bytes. Those codes * can be stored in the output buffer directly. * - * - Code 256 defines a new filter, which is later used to + * - Code 256 defines a new filter, which is later used to * ransform the data block accordingly to the filter type. * The data block needs to be fully uncompressed first. * @@ -3906,7 +3911,7 @@ static int rar5_read_data_skip(struct archive_read *a) /* Turn off "skip mode". */ rar->skip_mode--; - if(ret < 0) { + if(ret < 0 || ret == ARCHIVE_EOF) { /* Propagate any potential error conditions * to the caller. */ return ret; Modified: projects/fuse2/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c Thu Jun 20 15:56:08 2019 (r349236) @@ -60,7 +60,7 @@ static int archive_filter_b64encode_write(struct archi const void *, size_t); static int archive_filter_b64encode_close(struct archive_write_filter *); static int archive_filter_b64encode_free(struct archive_write_filter *); -static void b64_encode(struct archive_string *, const unsigned char *, size_t); +static void la_b64_encode(struct archive_string *, const unsigned char *, size_t); static int64_t atol8(const char *, size_t); static const char base64[] = { @@ -180,7 +180,7 @@ archive_filter_b64encode_open(struct archive_write_fil } static void -b64_encode(struct archive_string *as, const unsigned char *p, size_t len) +la_b64_encode(struct archive_string *as, const unsigned char *p, size_t len) { int c; @@ -234,12 +234,12 @@ archive_filter_b64encode_write(struct archive_write_fi } if (state->hold_len < LBYTES) return (ret); - b64_encode(&state->encoded_buff, state->hold, LBYTES); + la_b64_encode(&state->encoded_buff, state->hold, LBYTES); state->hold_len = 0; } for (; length >= LBYTES; length -= LBYTES, p += LBYTES) - b64_encode(&state->encoded_buff, p, LBYTES); + la_b64_encode(&state->encoded_buff, p, LBYTES); /* Save remaining bytes. */ if (length > 0) { @@ -270,7 +270,7 @@ archive_filter_b64encode_close(struct archive_write_fi /* Flush remaining bytes. */ if (state->hold_len != 0) - b64_encode(&state->encoded_buff, state->hold, state->hold_len); + la_b64_encode(&state->encoded_buff, state->hold, state->hold_len); archive_string_sprintf(&state->encoded_buff, "====\n"); /* Write the last block */ archive_write_set_bytes_in_last_block(f->archive, 1); Modified: projects/fuse2/contrib/libarchive/libarchive/archive_write_disk_posix.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/archive_write_disk_posix.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/archive_write_disk_posix.c Thu Jun 20 15:56:08 2019 (r349236) @@ -165,6 +165,10 @@ __FBSDID("$FreeBSD$"); #define O_NOFOLLOW 0 #endif +#ifndef AT_FDCWD +#define AT_FDCWD -100 +#endif + struct fixup_entry { struct fixup_entry *next; struct archive_acl acl; @@ -348,6 +352,8 @@ struct archive_write_disk { #define HFS_BLOCKS(s) ((s) >> 12) + +static int la_opendirat(int, const char *); static void fsobj_error(int *, struct archive_string *, int, const char *, const char *); static int check_symlinks_fsobj(char *, int *, struct archive_string *, @@ -401,6 +407,37 @@ static ssize_t _archive_write_disk_data_block(struct a size_t, int64_t); static int +la_opendirat(int fd, const char *path) { + const int flags = O_CLOEXEC +#if defined(O_BINARY) + | O_BINARY +#endif +#if defined(O_DIRECTORY) + | O_DIRECTORY +#endif +#if defined(O_PATH) + | O_PATH +#elif defined(O_SEARCH) + | O_SEARCH +#elif defined(O_EXEC) + | O_EXEC +#else + | O_RDONLY +#endif + ; + +#if !defined(HAVE_OPENAT) + if (fd != AT_FDCWD) { + errno = ENOTSUP; + return (-1); + } else + return (open(fd, path, flags)); +#else + return (openat(fd, path, flags)); +#endif +} + +static int lazy_stat(struct archive_write_disk *a) { if (a->pst != NULL) { @@ -1909,7 +1946,7 @@ edit_deep_directories(struct archive_write_disk *a) return; /* Try to record our starting dir. */ - a->restore_pwd = open(".", O_RDONLY | O_BINARY | O_CLOEXEC); + a->restore_pwd = la_opendirat(AT_FDCWD, "."); __archive_ensure_cloexec_flag(a->restore_pwd); if (a->restore_pwd < 0) return; @@ -2342,7 +2379,7 @@ _archive_write_disk_close(struct archive *_a) { struct archive_write_disk *a = (struct archive_write_disk *)_a; struct fixup_entry *next, *p; - int ret; + int fd, ret; archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC, ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA, @@ -2353,21 +2390,33 @@ _archive_write_disk_close(struct archive *_a) p = sort_dir_list(a->fixup_list); while (p != NULL) { + fd = -1; a->pst = NULL; /* Mark stat cache as out-of-date. */ + if (p->fixup & + (TODO_TIMES | TODO_MODE_BASE | TODO_ACLS | TODO_FFLAGS)) { + fd = open(p->name, + O_WRONLY | O_BINARY | O_NOFOLLOW | O_CLOEXEC); + } if (p->fixup & TODO_TIMES) { - set_times(a, -1, p->mode, p->name, + set_times(a, fd, p->mode, p->name, p->atime, p->atime_nanos, p->birthtime, p->birthtime_nanos, p->mtime, p->mtime_nanos, p->ctime, p->ctime_nanos); } - if (p->fixup & TODO_MODE_BASE) + if (p->fixup & TODO_MODE_BASE) { +#ifdef HAVE_FCHMOD + if (fd >= 0) + fchmod(fd, p->mode); + else +#endif chmod(p->name, p->mode); + } if (p->fixup & TODO_ACLS) - archive_write_disk_set_acls(&a->archive, -1, p->name, - &p->acl, p->mode); + archive_write_disk_set_acls(&a->archive, fd, + p->name, &p->acl, p->mode); if (p->fixup & TODO_FFLAGS) - set_fflags_platform(a, -1, p->name, + set_fflags_platform(a, fd, p->name, p->mode, p->fflags_set, 0); if (p->fixup & TODO_MAC_METADATA) set_mac_metadata(a, p->name, p->mac_metadata, @@ -2376,6 +2425,8 @@ _archive_write_disk_close(struct archive *_a) archive_acl_clear(&p->acl); free(p->mac_metadata); free(p->name); + if (fd >= 0) + close(fd); free(p); p = next; } @@ -2540,8 +2591,6 @@ fsobj_error(int *a_eno, struct archive_string *a_estr, * scan the path and both can be optimized by comparing against other * recent paths. */ -/* TODO: Extend this to support symlinks on Windows Vista and later. */ - /* * Checks the given path to see if any elements along it are symlinks. Returns * ARCHIVE_OK if there are none, otherwise puts an error in errmsg. @@ -2550,7 +2599,8 @@ static int check_symlinks_fsobj(char *path, int *a_eno, struct archive_string *a_estr, int flags) { -#if !defined(HAVE_LSTAT) +#if !defined(HAVE_LSTAT) && \ + !(defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT)) /* Platform doesn't have lstat, so we can't look for symlinks. */ (void)path; /* UNUSED */ (void)error_number; /* UNUSED */ @@ -2565,7 +2615,10 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar char c; int r; struct stat st; - int restore_pwd; + int chdir_fd; +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + int fd; +#endif /* Nothing to do here if name is empty */ if(path[0] == '\0') @@ -2586,9 +2639,9 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar * c holds what used to be in *tail * last is 1 if this is the last tail */ - restore_pwd = open(".", O_RDONLY | O_BINARY | O_CLOEXEC); - __archive_ensure_cloexec_flag(restore_pwd); - if (restore_pwd < 0) { + chdir_fd = la_opendirat(AT_FDCWD, "."); + __archive_ensure_cloexec_flag(chdir_fd); + if (chdir_fd < 0) { fsobj_error(a_eno, a_estr, errno, "Could not open ", path); return (ARCHIVE_FATAL); @@ -2621,7 +2674,11 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar c = tail[0]; tail[0] = '\0'; /* Check that we haven't hit a symlink. */ +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + r = fstatat(chdir_fd, head, &st, AT_SYMLINK_NOFOLLOW); +#else r = lstat(head, &st); +#endif if (r != 0) { tail[0] = c; /* We've hit a dir that doesn't exist; stop now. */ @@ -2647,7 +2704,19 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar } } else if (S_ISDIR(st.st_mode)) { if (!last) { - if (chdir(head) != 0) { +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + fd = la_opendirat(chdir_fd, head); + if (fd < 0) + r = -1; + else { + r = 0; + close(chdir_fd); + chdir_fd = fd; + } +#else + r = chdir(head); +#endif + if (r != 0) { tail[0] = c; fsobj_error(a_eno, a_estr, errno, "Could not chdir ", path); @@ -2664,7 +2733,12 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar * so we can overwrite it with the * item being extracted. */ - if (unlink(head)) { +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + r = unlinkat(chdir_fd, head, 0); +#else + r = unlink(head); +#endif + if (r != 0) { tail[0] = c; fsobj_error(a_eno, a_estr, errno, "Could not remove symlink ", @@ -2694,7 +2768,12 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar break; } else if (flags & ARCHIVE_EXTRACT_UNLINK) { /* User asked us to remove problems. */ - if (unlink(head) != 0) { +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + r = unlinkat(chdir_fd, head, 0); +#else + r = unlink(head); +#endif + if (r != 0) { tail[0] = c; fsobj_error(a_eno, a_estr, 0, "Cannot remove intervening " @@ -2712,7 +2791,11 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar * This is needed to extract hardlinks over * symlinks. */ +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + r = fstatat(chdir_fd, head, &st, 0); +#else r = la_stat(head, &st); +#endif if (r != 0) { tail[0] = c; if (errno == ENOENT) { @@ -2725,7 +2808,19 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar break; } } else if (S_ISDIR(st.st_mode)) { - if (chdir(head) != 0) { +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + fd = la_opendirat(chdir_fd, head); + if (fd < 0) + r = -1; + else { + r = 0; + close(chdir_fd); + chdir_fd = fd; + } +#else + r = chdir(head); +#endif + if (r != 0) { tail[0] = c; fsobj_error(a_eno, a_estr, errno, @@ -2761,16 +2856,21 @@ check_symlinks_fsobj(char *path, int *a_eno, struct ar } /* Catches loop exits via break */ tail[0] = c; -#ifdef HAVE_FCHDIR +#if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT) + /* If we operate with openat(), fstatat() and unlinkat() there was + * no chdir(), so just close the fd */ + if (chdir_fd >= 0) + close(chdir_fd); +#elif HAVE_FCHDIR /* If we changed directory above, restore it here. */ - if (restore_pwd >= 0) { - r = fchdir(restore_pwd); + if (chdir_fd >= 0) { + r = fchdir(chdir_fd); if (r != 0) { fsobj_error(a_eno, a_estr, errno, "chdir() failure", ""); } - close(restore_pwd); - restore_pwd = -1; + close(chdir_fd); + chdir_fd = -1; if (r != 0) { res = (ARCHIVE_FATAL); } @@ -3387,6 +3487,7 @@ static int set_mode(struct archive_write_disk *a, int mode) { int r = ARCHIVE_OK; + int r2; mode &= 07777; /* Strip off file type bits. */ if (a->todo & TODO_SGID_CHECK) { @@ -3480,21 +3581,19 @@ set_mode(struct archive_write_disk *a, int mode) * post-extract fixup, which is handled elsewhere. */ #ifdef HAVE_FCHMOD - if (a->fd >= 0) { - if (fchmod(a->fd, mode) != 0) { - archive_set_error(&a->archive, errno, - "Can't set permissions to 0%o", (int)mode); - r = ARCHIVE_WARN; - } - } else + if (a->fd >= 0) + r2 = fchmod(a->fd, mode); + else #endif - /* If this platform lacks fchmod(), then - * we'll just use chmod(). */ - if (chmod(a->name, mode) != 0) { - archive_set_error(&a->archive, errno, - "Can't set permissions to 0%o", (int)mode); - r = ARCHIVE_WARN; - } + /* If this platform lacks fchmod(), then + * we'll just use chmod(). */ + r2 = chmod(a->name, mode); + + if (r2 != 0) { + archive_set_error(&a->archive, errno, + "Can't set permissions to 0%o", (int)mode); + r = ARCHIVE_WARN; + } } return (r); } Modified: projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar.c Thu Jun 20 15:56:08 2019 (r349236) @@ -3776,6 +3776,35 @@ DEFINE_TEST(test_read_format_rar_ppmd_use_after_free) assertA(ARCHIVE_OK == archive_read_next_header(a, &ae)); assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); + /* Test EOF */ + assertA(1 == archive_read_next_header(a, &ae)); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +} + +DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2) +{ + uint8_t buf[16]; + const char* reffile = "test_read_format_rar_ppmd_use_after_free2.rar"; + + struct archive_entry *ae; + struct archive *a; + + extract_reference_file(reffile); + assert((a = archive_read_new()) != NULL); + assertA(0 == archive_read_support_filter_all(a)); + assertA(0 == archive_read_support_format_all(a)); + assertA(0 == archive_read_open_filename(a, reffile, 10240)); + + assertA(ARCHIVE_OK == archive_read_next_header(a, &ae)); + assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); + assertA(ARCHIVE_OK == archive_read_next_header(a, &ae)); + assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); + + /* Test EOF */ + assertA(1 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } Modified: projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c ============================================================================== --- projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c Thu Jun 20 15:44:43 2019 (r349235) +++ projects/fuse2/contrib/libarchive/libarchive/test/test_read_format_rar5.c Thu Jun 20 15:56:08 2019 (r349236) @@ -1194,3 +1194,24 @@ DEFINE_TEST(test_read_format_rar5_fileattr) EPILOGUE(); } + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906201556.x5KFu9Fm063704>