Date: Fri, 31 Jul 2020 19:37:46 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363741 - in projects/release-git: . bin/chio bin/ps bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libzfs/common cddl/lib cddl/lib/libdtrace cddl/lib/libzpool c... Message-ID: <202007311937.06VJbk0h036252@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jul 31 19:37:45 2020 New Revision: 363741 URL: https://svnweb.freebsd.org/changeset/base/363741 Log: MFH Sponsored by: Rubicon Communications, LLC (netgate.com) Added: projects/release-git/lib/csu/common/feature_note.S - copied unchanged from r363740, head/lib/csu/common/feature_note.S projects/release-git/sbin/route/tests/ - copied from r363740, head/sbin/route/tests/ projects/release-git/sys/arm/ti/am335x/am3359_cppi41.c - copied unchanged from r363740, head/sys/arm/ti/am335x/am3359_cppi41.c projects/release-git/sys/arm/ti/am335x/am335x_usb_phy.c - copied unchanged from r363740, head/sys/arm/ti/am335x/am335x_usb_phy.c projects/release-git/sys/arm/ti/clk/ - copied from r363740, head/sys/arm/ti/clk/ projects/release-git/sys/arm/ti/ti_omap4_cm.c - copied unchanged from r363740, head/sys/arm/ti/ti_omap4_cm.c projects/release-git/sys/arm/ti/ti_omap4_cm.h - copied unchanged from r363740, head/sys/arm/ti/ti_omap4_cm.h projects/release-git/sys/arm/ti/ti_prm.c - copied unchanged from r363740, head/sys/arm/ti/ti_prm.c projects/release-git/sys/arm/ti/ti_prm.h - copied unchanged from r363740, head/sys/arm/ti/ti_prm.h projects/release-git/sys/arm/ti/ti_scm_syscon.c - copied unchanged from r363740, head/sys/arm/ti/ti_scm_syscon.c projects/release-git/sys/arm/ti/ti_sysc.h - copied unchanged from r363740, head/sys/arm/ti/ti_sysc.h projects/release-git/sys/contrib/pcg-c/ - copied from r363740, head/sys/contrib/pcg-c/ projects/release-git/sys/dev/acpica/acpi_apei.c - copied unchanged from r363740, head/sys/dev/acpica/acpi_apei.c projects/release-git/sys/dev/extres/syscon/syscon_power.c - copied unchanged from r363740, head/sys/dev/extres/syscon/syscon_power.c projects/release-git/sys/dev/goldfish/ - copied from r363740, head/sys/dev/goldfish/ projects/release-git/sys/dev/iommu/ - copied from r363740, head/sys/dev/iommu/ projects/release-git/sys/dev/smc/if_smc_acpi.c - copied unchanged from r363740, head/sys/dev/smc/if_smc_acpi.c projects/release-git/sys/riscv/riscv/riscv_syscon.c - copied unchanged from r363740, head/sys/riscv/riscv/riscv_syscon.c projects/release-git/sys/sys/_seqc.h - copied unchanged from r363740, head/sys/sys/_seqc.h projects/release-git/tests/sys/kern/sendfile_helper.c - copied unchanged from r363740, head/tests/sys/kern/sendfile_helper.c projects/release-git/tests/sys/kern/sendfile_test.sh - copied unchanged from r363740, head/tests/sys/kern/sendfile_test.sh projects/release-git/tools/tools/man/ - copied from r363740, head/tools/tools/man/ projects/release-git/usr.bin/bmake/unit-tests/Makefile.config - copied unchanged from r363740, head/usr.bin/bmake/unit-tests/Makefile.config Deleted: projects/release-git/release/sparc64/ projects/release-git/sbin/init/ttys.sparc64 projects/release-git/share/man/man4/cy.4 projects/release-git/share/man/man4/rc.4 projects/release-git/share/man/man4/rp.4 projects/release-git/sys/arm/ti/am335x/am335x_prcm.c projects/release-git/sys/arm/ti/am335x/am335x_usbss.c projects/release-git/sys/arm/ti/ti_hwmods.c projects/release-git/sys/arm/ti/ti_hwmods.h projects/release-git/sys/dev/cy/ projects/release-git/sys/dev/rc/ projects/release-git/sys/dev/rp/ projects/release-git/sys/modules/rc/ projects/release-git/sys/modules/rp/ projects/release-git/sys/sys/iommu.h projects/release-git/sys/x86/iommu/busdma_dmar.c projects/release-git/sys/x86/iommu/busdma_dmar.h projects/release-git/sys/x86/iommu/intel_gas.c projects/release-git/usr.sbin/bsdinstall/partedit/partedit_sparc64.c projects/release-git/usr.sbin/kldxref/ef_sparc64.c Modified: projects/release-git/ObsoleteFiles.inc projects/release-git/RELNOTES projects/release-git/UPDATING projects/release-git/bin/chio/chio.c projects/release-git/bin/ps/ps.c projects/release-git/bin/sh/main.c projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/release-git/cddl/lib/Makefile projects/release-git/cddl/lib/libdtrace/Makefile projects/release-git/cddl/lib/libzpool/Makefile projects/release-git/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/release-git/contrib/ipfilter/iplang/iplang_y.y projects/release-git/contrib/ipfilter/ipsend/arp.c projects/release-git/contrib/ipfilter/ipsend/ipresend.c projects/release-git/contrib/ipfilter/ipsend/ipsend.c projects/release-git/contrib/ipfilter/ipsend/iptest.c projects/release-git/contrib/ipfilter/ipsend/iptests.c projects/release-git/contrib/ipfilter/ipsend/sock.c projects/release-git/contrib/ipfilter/man/ipf.8 projects/release-git/contrib/ipfilter/man/ipfstat.8 projects/release-git/contrib/ipfilter/tools/ipfstat.c projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/meta.in projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/subexp.in projects/release-git/contrib/netbsd-tests/usr.bin/grep/t_grep.sh (contents, props changed) projects/release-git/contrib/openbsm/CREDITS projects/release-git/contrib/openbsm/bin/auditd/auditd.c projects/release-git/contrib/openbsm/bin/auditdistd/auditdistd.c projects/release-git/contrib/openbsm/bin/auditdistd/proto_tls.c projects/release-git/contrib/openbsm/libauditd/auditd_lib.c projects/release-git/contrib/openbsm/libbsm/au_control.3 projects/release-git/contrib/openbsm/libbsm/au_domain.3 projects/release-git/contrib/openbsm/libbsm/au_errno.3 projects/release-git/contrib/openbsm/libbsm/au_socket_type.3 projects/release-git/contrib/openbsm/man/audit.log.5 projects/release-git/contrib/openbsm/man/getaudit.2 projects/release-git/contrib/openbsm/sys/bsm/audit.h projects/release-git/crypto/openssh/FREEBSD-upgrade projects/release-git/crypto/openssh/myproposal.h projects/release-git/crypto/openssh/servconf.c projects/release-git/crypto/openssh/sshd_config.5 projects/release-git/etc/mtree/BSD.tests.dist projects/release-git/etc/mtree/BSD.usr.dist projects/release-git/include/regex.h projects/release-git/lib/clang/include/VCSVersion.inc projects/release-git/lib/clang/include/llvm/Support/VCSRevision.h projects/release-git/lib/csu/Makefile.inc projects/release-git/lib/csu/common/crtbrand.S projects/release-git/lib/geom/eli/geli.8 projects/release-git/lib/libbe/be.c projects/release-git/lib/libc/regex/Symbol.map projects/release-git/lib/libc/regex/regcomp.c projects/release-git/lib/libc/sys/sigaction.2 projects/release-git/lib/libmd/Makefile projects/release-git/lib/libpmc/libpmc_pmu_util.c projects/release-git/libexec/getty/getty.8 projects/release-git/libexec/rc/rc.d/ipfilter projects/release-git/libexec/rc/rc.d/ipmon projects/release-git/libexec/rc/rc.d/ipnat projects/release-git/libexec/rc/rc.d/ippool projects/release-git/libexec/rc/rc.firewall projects/release-git/libexec/rtld-elf/Makefile projects/release-git/libexec/rtld-elf/rtld.c projects/release-git/rescue/rescue/Makefile projects/release-git/sbin/camcontrol/camcontrol.c projects/release-git/sbin/md5/md5.c projects/release-git/sbin/mount_nfs/mount_nfs.8 projects/release-git/sbin/nvmecontrol/identify.c projects/release-git/sbin/route/Makefile projects/release-git/share/man/man3/siginfo.3 projects/release-git/share/man/man3/tree.3 projects/release-git/share/man/man4/Makefile projects/release-git/share/man/man4/aesni.4 projects/release-git/share/man/man4/hifn.4 projects/release-git/share/man/man4/iwm.4 projects/release-git/share/man/man4/man4.aarch64/armv8crypto.4 projects/release-git/share/man/man4/man4.i386/glxsb.4 projects/release-git/share/man/man4/ng_iface.4 projects/release-git/share/man/man4/padlock.4 projects/release-git/share/man/man4/safe.4 projects/release-git/share/man/man4/safexcel.4 projects/release-git/share/man/man4/tcp.4 projects/release-git/share/man/man7/ports.7 projects/release-git/share/man/man8/rc.subr.8 projects/release-git/share/man/man9/Makefile projects/release-git/share/man/man9/crypto_request.9 projects/release-git/share/man/man9/devstat.9 projects/release-git/share/man/man9/mbuf.9 projects/release-git/share/man/man9/swi.9 projects/release-git/share/misc/committers-doc.dot projects/release-git/share/misc/committers-src.dot projects/release-git/stand/common/install.c projects/release-git/stand/efi/loader/arch/arm/exec.c projects/release-git/stand/efi/loader/arch/riscv/exec.c projects/release-git/stand/i386/loader/main.c projects/release-git/sys/amd64/amd64/apic_vector.S projects/release-git/sys/amd64/amd64/exception.S projects/release-git/sys/amd64/amd64/genassym.c projects/release-git/sys/amd64/amd64/machdep.c projects/release-git/sys/amd64/amd64/mp_machdep.c projects/release-git/sys/amd64/amd64/pmap.c projects/release-git/sys/amd64/amd64/trap.c projects/release-git/sys/amd64/conf/GENERIC projects/release-git/sys/amd64/include/pcpu.h projects/release-git/sys/amd64/include/pmap.h projects/release-git/sys/amd64/include/smp.h projects/release-git/sys/amd64/linux/linux_dummy.c projects/release-git/sys/amd64/linux/linux_proto.h projects/release-git/sys/amd64/linux/linux_sysent.c projects/release-git/sys/amd64/linux/linux_systrace_args.c projects/release-git/sys/amd64/linux/syscalls.master projects/release-git/sys/amd64/linux32/linux32_dummy.c projects/release-git/sys/amd64/linux32/linux32_proto.h projects/release-git/sys/amd64/linux32/linux32_sysent.c projects/release-git/sys/amd64/linux32/linux32_systrace_args.c projects/release-git/sys/amd64/linux32/syscalls.master projects/release-git/sys/arm/allwinner/aw_mmc.c projects/release-git/sys/arm/allwinner/clkng/ccu_sun8i_r.c projects/release-git/sys/arm/arm/trap-v6.c projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_firmware.c projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_firmware.h projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/release-git/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/release-git/sys/arm/ti/am335x/am335x_dmtimer.c projects/release-git/sys/arm/ti/am335x/am335x_dmtpps.c projects/release-git/sys/arm/ti/am335x/am335x_dmtreg.h projects/release-git/sys/arm/ti/am335x/am335x_gpio.c projects/release-git/sys/arm/ti/am335x/am335x_lcd.c projects/release-git/sys/arm/ti/am335x/am335x_musb.c projects/release-git/sys/arm/ti/am335x/am335x_pwmss.c projects/release-git/sys/arm/ti/am335x/am335x_rtc.c projects/release-git/sys/arm/ti/am335x/am335x_scm.c projects/release-git/sys/arm/ti/am335x/files.am335x projects/release-git/sys/arm/ti/cpsw/if_cpsw.c projects/release-git/sys/arm/ti/files.ti projects/release-git/sys/arm/ti/omap4/files.omap4 projects/release-git/sys/arm/ti/ti_adc.c projects/release-git/sys/arm/ti/ti_edma3.c projects/release-git/sys/arm/ti/ti_gpio.c projects/release-git/sys/arm/ti/ti_i2c.c projects/release-git/sys/arm/ti/ti_mbox.c projects/release-git/sys/arm/ti/ti_pinmux.c projects/release-git/sys/arm/ti/ti_prcm.c projects/release-git/sys/arm/ti/ti_prcm.h projects/release-git/sys/arm/ti/ti_pruss.c projects/release-git/sys/arm/ti/ti_scm.c projects/release-git/sys/arm/ti/ti_sdhci.c projects/release-git/sys/arm/ti/ti_sdma.c projects/release-git/sys/arm/ti/ti_spi.c projects/release-git/sys/arm/ti/ti_sysc.c projects/release-git/sys/arm/ti/ti_wdt.c projects/release-git/sys/arm/ti/usb/omap_ehci.c projects/release-git/sys/arm/ti/usb/omap_host.c projects/release-git/sys/arm/ti/usb/omap_tll.c projects/release-git/sys/arm64/acpica/acpi_iort.c projects/release-git/sys/arm64/arm64/machdep.c projects/release-git/sys/arm64/arm64/trap.c projects/release-git/sys/arm64/conf/GENERIC projects/release-git/sys/arm64/include/acpica_machdep.h projects/release-git/sys/arm64/linux/linux_dummy.c projects/release-git/sys/arm64/linux/linux_proto.h projects/release-git/sys/arm64/linux/linux_sysent.c projects/release-git/sys/arm64/linux/linux_systrace_args.c projects/release-git/sys/arm64/linux/syscalls.master projects/release-git/sys/cam/cam_ccb.h projects/release-git/sys/cam/cam_xpt.c projects/release-git/sys/cam/mmc/mmc_all.h projects/release-git/sys/cam/mmc/mmc_da.c projects/release-git/sys/cam/mmc/mmc_xpt.c projects/release-git/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/release-git/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/release-git/sys/cddl/dev/dtrace/aarch64/dtrace_subr.c projects/release-git/sys/cddl/dev/dtrace/arm/dtrace_subr.c projects/release-git/sys/cddl/dev/fbt/arm/fbt_isa.c projects/release-git/sys/compat/linprocfs/linprocfs.c projects/release-git/sys/compat/linux/linux_file.c projects/release-git/sys/compat/linux/linux_ioctl.c projects/release-git/sys/compat/linux/linux_ioctl.h projects/release-git/sys/compat/linux/linux_mib.h projects/release-git/sys/compat/linuxkpi/common/include/linux/hardirq.h projects/release-git/sys/compat/linuxkpi/common/include/linux/kernel.h projects/release-git/sys/compat/linuxkpi/common/include/linux/lockdep.h projects/release-git/sys/compat/linuxkpi/common/include/linux/preempt.h projects/release-git/sys/compat/linuxkpi/common/src/linux_usb.c projects/release-git/sys/conf/files projects/release-git/sys/conf/files.arm64 projects/release-git/sys/conf/files.riscv projects/release-git/sys/conf/files.x86 projects/release-git/sys/contrib/dev/acpica/changes.txt projects/release-git/sys/contrib/dev/acpica/compiler/aslerror.c projects/release-git/sys/contrib/dev/acpica/compiler/aslexternal.c projects/release-git/sys/contrib/dev/acpica/compiler/aslload.c projects/release-git/sys/contrib/dev/acpica/compiler/aslmethod.c projects/release-git/sys/contrib/dev/acpica/compiler/aslxref.c projects/release-git/sys/contrib/dev/acpica/components/executer/exprep.c projects/release-git/sys/contrib/dev/acpica/components/utilities/utdelete.c projects/release-git/sys/contrib/dev/acpica/components/utilities/utids.c projects/release-git/sys/contrib/dev/acpica/include/acpixf.h projects/release-git/sys/contrib/dev/acpica/include/actypes.h projects/release-git/sys/contrib/ipfilter/netinet/fil.c projects/release-git/sys/contrib/ipfilter/netinet/ip_frag.c projects/release-git/sys/crypto/via/padlock_cipher.c projects/release-git/sys/dev/acpica/acpi.c projects/release-git/sys/dev/acpica/acpivar.h projects/release-git/sys/dev/an/if_an.c projects/release-git/sys/dev/cxgbe/common/common.h projects/release-git/sys/dev/cxgbe/common/t4_hw.c projects/release-git/sys/dev/cxgbe/common/t4_hw.h projects/release-git/sys/dev/cxgbe/cudbg/cudbg_lib.c projects/release-git/sys/dev/cxgbe/t4_main.c projects/release-git/sys/dev/extres/clk/clk.c projects/release-git/sys/dev/gpio/gpioiic.c projects/release-git/sys/dev/hwpmc/hwpmc_mod.c projects/release-git/sys/dev/hyperv/vmbus/vmbus.c projects/release-git/sys/dev/iicbus/ds3231reg.h projects/release-git/sys/dev/mmc/host/dwmmc.c projects/release-git/sys/dev/mmc/host/dwmmc_var.h projects/release-git/sys/dev/mpr/mpr.c projects/release-git/sys/dev/mpr/mpr_sas.c projects/release-git/sys/dev/mpr/mpr_user.c projects/release-git/sys/dev/mps/mps.c projects/release-git/sys/dev/mps/mps_sas.c projects/release-git/sys/dev/mps/mps_user.c projects/release-git/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/release-git/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/release-git/sys/dev/ntb/test/ntb_tool.c projects/release-git/sys/dev/pci/pci.c projects/release-git/sys/dev/pci/pcivar.h projects/release-git/sys/dev/sdhci/sdhci.c projects/release-git/sys/dev/smc/if_smc.c projects/release-git/sys/dev/smc/if_smc_fdt.c projects/release-git/sys/dev/smc/if_smcvar.h projects/release-git/sys/dev/sound/usb/uaudio.c projects/release-git/sys/dev/uart/uart_dev_ti8250.c projects/release-git/sys/dev/usb/input/uhid.c projects/release-git/sys/dev/usb/input/uhid_snes.c projects/release-git/sys/dev/usb/net/if_ure.c projects/release-git/sys/dev/usb/net/if_urereg.h projects/release-git/sys/dev/usb/storage/ustorage_fs.c projects/release-git/sys/dev/usb/usb_dev.c projects/release-git/sys/dev/usb/usb_device.c projects/release-git/sys/dev/usb/usb_freebsd.h projects/release-git/sys/dev/usb/usb_freebsd_loader.h projects/release-git/sys/dev/usb/usb_generic.c projects/release-git/sys/dev/usb/usb_mbuf.c projects/release-git/sys/dev/usb/usb_transfer.c projects/release-git/sys/dev/virtio/mmio/virtio_mmio.c projects/release-git/sys/dev/virtio/pci/virtio_pci.c projects/release-git/sys/fs/cuse/cuse.c projects/release-git/sys/fs/ext2fs/ext2_acl.c projects/release-git/sys/fs/ext2fs/ext2_alloc.c projects/release-git/sys/fs/ext2fs/ext2_extents.c projects/release-git/sys/fs/ext2fs/ext2_lookup.c projects/release-git/sys/fs/ext2fs/ext2_vnops.c projects/release-git/sys/fs/nfs/nfs_commonsubs.c projects/release-git/sys/fs/nfs/nfs_var.h projects/release-git/sys/fs/nfsclient/nfs_clcomsubs.c projects/release-git/sys/fs/nfsclient/nfs_clrpcops.c projects/release-git/sys/fs/nfsclient/nfs_clvfsops.c projects/release-git/sys/fs/nfsserver/nfs_nfsdport.c projects/release-git/sys/fs/nfsserver/nfs_nfsdserv.c projects/release-git/sys/fs/nfsserver/nfs_nfsdsubs.c projects/release-git/sys/fs/tmpfs/tmpfs.h projects/release-git/sys/fs/tmpfs/tmpfs_subr.c projects/release-git/sys/fs/tmpfs/tmpfs_vfsops.c projects/release-git/sys/fs/tmpfs/tmpfs_vnops.c projects/release-git/sys/fs/tmpfs/tmpfs_vnops.h projects/release-git/sys/geom/cache/g_cache.c projects/release-git/sys/geom/concat/g_concat.c projects/release-git/sys/geom/eli/g_eli_ctl.c projects/release-git/sys/geom/eli/g_eli_integrity.c projects/release-git/sys/geom/eli/g_eli_privacy.c projects/release-git/sys/geom/geom.h projects/release-git/sys/geom/geom_ccd.c projects/release-git/sys/geom/geom_ctl.c projects/release-git/sys/geom/geom_map.c projects/release-git/sys/geom/geom_redboot.c projects/release-git/sys/geom/label/g_label.c projects/release-git/sys/geom/label/g_label.h projects/release-git/sys/geom/label/g_label_disk_ident.c projects/release-git/sys/geom/label/g_label_ext2fs.c projects/release-git/sys/geom/label/g_label_flashmap.c projects/release-git/sys/geom/label/g_label_gpt.c projects/release-git/sys/geom/label/g_label_iso9660.c projects/release-git/sys/geom/label/g_label_msdosfs.c projects/release-git/sys/geom/label/g_label_ntfs.c projects/release-git/sys/geom/label/g_label_reiserfs.c projects/release-git/sys/geom/label/g_label_ufs.c projects/release-git/sys/geom/mirror/g_mirror_ctl.c projects/release-git/sys/geom/mountver/g_mountver.c projects/release-git/sys/geom/nop/g_nop.c projects/release-git/sys/geom/part/g_part_vtoc8.c projects/release-git/sys/geom/raid3/g_raid3_ctl.c projects/release-git/sys/geom/stripe/g_stripe.c projects/release-git/sys/geom/virstor/g_virstor.c projects/release-git/sys/i386/conf/GENERIC projects/release-git/sys/i386/i386/apic_vector.s projects/release-git/sys/i386/i386/mp_machdep.c projects/release-git/sys/i386/i386/pmap.c projects/release-git/sys/i386/i386/trap.c projects/release-git/sys/i386/linux/linux_dummy.c projects/release-git/sys/i386/linux/linux_proto.h projects/release-git/sys/i386/linux/linux_sysent.c projects/release-git/sys/i386/linux/linux_systrace_args.c projects/release-git/sys/i386/linux/syscalls.master projects/release-git/sys/kern/init_main.c projects/release-git/sys/kern/kern_clock.c projects/release-git/sys/kern/kern_descrip.c projects/release-git/sys/kern/kern_dump.c projects/release-git/sys/kern/kern_intr.c projects/release-git/sys/kern/kern_jail.c projects/release-git/sys/kern/kern_kthread.c projects/release-git/sys/kern/kern_lock.c projects/release-git/sys/kern/kern_mutex.c projects/release-git/sys/kern/kern_priv.c projects/release-git/sys/kern/kern_rwlock.c projects/release-git/sys/kern/kern_sx.c projects/release-git/sys/kern/kern_thread.c projects/release-git/sys/kern/makesyscalls.sh projects/release-git/sys/kern/subr_blist.c projects/release-git/sys/kern/subr_intr.c projects/release-git/sys/kern/subr_pctrie.c projects/release-git/sys/kern/uipc_ktls.c projects/release-git/sys/kern/uipc_sockbuf.c projects/release-git/sys/kern/uipc_socket.c projects/release-git/sys/kern/uipc_usrreq.c projects/release-git/sys/kern/vfs_bio.c projects/release-git/sys/kern/vfs_cache.c projects/release-git/sys/kern/vfs_default.c projects/release-git/sys/kern/vfs_lookup.c projects/release-git/sys/kern/vfs_mount.c projects/release-git/sys/kern/vfs_subr.c projects/release-git/sys/kern/vfs_syscalls.c projects/release-git/sys/kern/vnode_if.src projects/release-git/sys/mips/conf/std.MALTA projects/release-git/sys/mips/mips/pmap.c projects/release-git/sys/mips/mips/trap.c projects/release-git/sys/modules/Makefile projects/release-git/sys/modules/crypto/Makefile projects/release-git/sys/modules/esp/Makefile projects/release-git/sys/modules/uart/Makefile projects/release-git/sys/net/if.c projects/release-git/sys/net/if_bridge.c projects/release-git/sys/net/iflib.c projects/release-git/sys/net/route.c projects/release-git/sys/net/route.h projects/release-git/sys/net80211/ieee80211_freebsd.c projects/release-git/sys/net80211/ieee80211_ioctl.c projects/release-git/sys/netgraph/bluetooth/include/ng_hci.h projects/release-git/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/release-git/sys/netgraph/ng_iface.c projects/release-git/sys/netgraph/ng_iface.h projects/release-git/sys/netinet/cc/cc_cdg.c projects/release-git/sys/netinet/cc/cc_chd.c projects/release-git/sys/netinet/cc/cc_cubic.c projects/release-git/sys/netinet/cc/cc_dctcp.c projects/release-git/sys/netinet/cc/cc_hd.c projects/release-git/sys/netinet/cc/cc_htcp.c projects/release-git/sys/netinet/cc/cc_newreno.c projects/release-git/sys/netinet/cc/cc_vegas.c projects/release-git/sys/netinet/sctp_constants.h projects/release-git/sys/netinet/sctp_indata.c projects/release-git/sys/netinet/sctp_lock_bsd.h projects/release-git/sys/netinet/sctp_os_bsd.h projects/release-git/sys/netinet/sctp_pcb.c projects/release-git/sys/netinet/sctp_usrreq.c projects/release-git/sys/netinet/sctp_var.h projects/release-git/sys/netinet/sctputil.c projects/release-git/sys/netinet/sctputil.h projects/release-git/sys/netinet/tcp_subr.c projects/release-git/sys/netinet6/in6_rmx.c projects/release-git/sys/netinet6/in6_var.h projects/release-git/sys/netinet6/ip6_output.c projects/release-git/sys/netinet6/nd6.c projects/release-git/sys/netinet6/nd6_rtr.c projects/release-git/sys/nfs/bootp_subr.c projects/release-git/sys/opencrypto/crypto.c projects/release-git/sys/opencrypto/cryptodev.c projects/release-git/sys/opencrypto/cryptodev.h projects/release-git/sys/opencrypto/ktls_ocf.c projects/release-git/sys/powerpc/aim/mmu_oea.c projects/release-git/sys/powerpc/aim/mmu_oea64.c projects/release-git/sys/powerpc/aim/mmu_radix.c projects/release-git/sys/powerpc/booke/pmap.c projects/release-git/sys/powerpc/conf/GENERIC projects/release-git/sys/powerpc/conf/GENERIC64 projects/release-git/sys/powerpc/powerpc/trap.c projects/release-git/sys/riscv/conf/GENERIC projects/release-git/sys/riscv/riscv/intr_machdep.c projects/release-git/sys/riscv/riscv/machdep.c projects/release-git/sys/riscv/riscv/plic.c projects/release-git/sys/riscv/riscv/trap.c projects/release-git/sys/security/mac/mac_framework.c projects/release-git/sys/security/mac/mac_framework.h projects/release-git/sys/sys/_eventhandler.h projects/release-git/sys/sys/ata.h projects/release-git/sys/sys/blist.h projects/release-git/sys/sys/buf.h projects/release-git/sys/sys/file.h projects/release-git/sys/sys/filedesc.h projects/release-git/sys/sys/interrupt.h projects/release-git/sys/sys/ktls.h projects/release-git/sys/sys/lock.h projects/release-git/sys/sys/lockmgr.h projects/release-git/sys/sys/mount.h projects/release-git/sys/sys/namei.h projects/release-git/sys/sys/param.h projects/release-git/sys/sys/pctrie.h projects/release-git/sys/sys/priv.h projects/release-git/sys/sys/resourcevar.h projects/release-git/sys/sys/seqc.h projects/release-git/sys/sys/sockbuf.h projects/release-git/sys/sys/socketvar.h projects/release-git/sys/sys/sysctl.h projects/release-git/sys/sys/tree.h projects/release-git/sys/sys/vnode.h projects/release-git/sys/tools/vnode_if.awk projects/release-git/sys/ufs/ffs/ffs_vfsops.c projects/release-git/sys/ufs/ffs/ffs_vnops.c projects/release-git/sys/ufs/ufs/inode.h projects/release-git/sys/ufs/ufs/ufs_acl.c projects/release-git/sys/ufs/ufs/ufs_vnops.c projects/release-git/sys/vm/swap_pager.c projects/release-git/sys/vm/vm.h projects/release-git/sys/vm/vm_page.c projects/release-git/sys/vm/vm_page.h projects/release-git/sys/vm/vnode_pager.c projects/release-git/sys/x86/include/acpica_machdep.h projects/release-git/sys/x86/include/apicvar.h projects/release-git/sys/x86/include/bus_dma.h projects/release-git/sys/x86/include/x86_smp.h projects/release-git/sys/x86/iommu/intel_ctx.c projects/release-git/sys/x86/iommu/intel_dmar.h projects/release-git/sys/x86/iommu/intel_drv.c projects/release-git/sys/x86/iommu/intel_fault.c projects/release-git/sys/x86/iommu/intel_idpgtbl.c projects/release-git/sys/x86/iommu/intel_intrmap.c projects/release-git/sys/x86/iommu/intel_qi.c projects/release-git/sys/x86/iommu/intel_quirks.c projects/release-git/sys/x86/iommu/intel_reg.h projects/release-git/sys/x86/iommu/intel_utils.c projects/release-git/sys/x86/x86/busdma_machdep.c projects/release-git/sys/x86/x86/cpu_machdep.c projects/release-git/sys/x86/x86/local_apic.c projects/release-git/sys/x86/x86/mp_x86.c projects/release-git/sys/x86/xen/xen_apic.c projects/release-git/tests/sys/geom/class/eli/onetime_test.sh projects/release-git/tests/sys/geom/class/mirror/10_test.sh projects/release-git/tests/sys/geom/class/mirror/11_test.sh projects/release-git/tests/sys/geom/class/mirror/12_test.sh projects/release-git/tests/sys/geom/class/mirror/13_test.sh projects/release-git/tests/sys/geom/class/mirror/9_test.sh projects/release-git/tests/sys/geom/class/mirror/conf.sh projects/release-git/tests/sys/geom/class/mirror/sync_error.sh projects/release-git/tests/sys/kern/Makefile projects/release-git/tests/sys/opencrypto/Makefile projects/release-git/tests/sys/opencrypto/cryptodev.py projects/release-git/tests/sys/opencrypto/cryptotest.py projects/release-git/tests/sys/opencrypto/runtests.sh projects/release-git/tools/tools/README projects/release-git/usr.bin/at/at.man projects/release-git/usr.bin/calendar/calendars/calendar.freebsd projects/release-git/usr.bin/comm/comm.1 projects/release-git/usr.bin/diff/tests/diff_test.sh projects/release-git/usr.bin/grep/zgrep.1 projects/release-git/usr.bin/grep/zgrep.sh projects/release-git/usr.bin/netstat/netstat.1 projects/release-git/usr.bin/sed/compile.c projects/release-git/usr.bin/sed/tests/sed2_test.sh projects/release-git/usr.bin/truncate/truncate.1 projects/release-git/usr.bin/vmstat/vmstat.8 projects/release-git/usr.sbin/bhyve/bhyve.8 projects/release-git/usr.sbin/bhyve/pci_ahci.c projects/release-git/usr.sbin/ctld/kernel.c projects/release-git/usr.sbin/efibootmgr/efibootmgr.8 projects/release-git/usr.sbin/mountd/mountd.c projects/release-git/usr.sbin/nologin/nologin.8 projects/release-git/usr.sbin/pkg/pkg.c projects/release-git/usr.sbin/rwhod/rwhod.8 projects/release-git/usr.sbin/traceroute6/Makefile projects/release-git/usr.sbin/traceroute6/traceroute6.c Directory Properties: projects/release-git/ (props changed) projects/release-git/cddl/ (props changed) projects/release-git/cddl/contrib/opensolaris/ (props changed) projects/release-git/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/release-git/contrib/elftoolchain/ (props changed) projects/release-git/contrib/ipfilter/ (props changed) projects/release-git/contrib/llvm-project/ (props changed) projects/release-git/contrib/netbsd-tests/ (props changed) projects/release-git/contrib/openbsm/ (props changed) projects/release-git/crypto/openssh/ (props changed) projects/release-git/sys/cddl/contrib/opensolaris/ (props changed) projects/release-git/sys/contrib/dev/acpica/ (props changed) projects/release-git/sys/contrib/ipfilter/ (props changed) Modified: projects/release-git/ObsoleteFiles.inc ============================================================================== --- projects/release-git/ObsoleteFiles.inc Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/ObsoleteFiles.inc Fri Jul 31 19:37:45 2020 (r363741) @@ -36,6 +36,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20200729: remove long expired serial drivers +OLD_FILES+=usr/share/man/man4/cy.4.gz +OLD_FILES+=usr/share/man/man4/rc.4.gz +OLD_FILES+=usr/share/man/man4/rp.4.gz + +# 20200715: rework of devstat(9) man page +OLD_FILES+=usr/share/man/man9/devstat_add_entry.9.gz + # 20200714: update byacc to 20200330 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y Modified: projects/release-git/RELNOTES ============================================================================== --- projects/release-git/RELNOTES Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/RELNOTES Fri Jul 31 19:37:45 2020 (r363741) @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +r363679: + Applications using regex(3), e.g. sed/grep, will no longer accept + redundant escapes for most ordinary characters. + r363253: SCTP support has been removed from GENERIC kernel configurations. The SCTP stack is now built as sctp.ko and can be dynamically loaded. Modified: projects/release-git/UPDATING ============================================================================== --- projects/release-git/UPDATING Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/UPDATING Fri Jul 31 19:37:45 2020 (r363741) @@ -26,6 +26,18 @@ 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".) +20200729: + r363679 has redefined some undefined behavior in regcomp(3); notably, + extraneous escapes of most ordinary characters will no longer be + accepted. An exp-run has identified all of the problems with this in + ports, but other non-ports software may need extra escapes removed to + continue to function. + + Because of this change, installworld may encounter the following error + from rtld: Undefined symbol "regcomp@FBSD_1.6" -- It is imperative that + you do not halt installworld. Instead, let it run to completion (whether + successful or not) and run installworld once more. + 20200627: A new implementation of bc and dc has been imorted in r362681. This implementation corrects non-conformant behavior of the previous bc Modified: projects/release-git/bin/chio/chio.c ============================================================================== --- projects/release-git/bin/chio/chio.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/bin/chio/chio.c Fri Jul 31 19:37:45 2020 (r363741) @@ -1144,7 +1144,7 @@ find_element(char *voltag, uint16_t *et, uint16_t *eu) /* * Now search the list the specified <voltag> */ - for (elem = 0; elem <= total_elem; ++elem) { + for (elem = 0; elem < total_elem; ++elem) { ces = &ch_ces[elem]; Modified: projects/release-git/bin/ps/ps.c ============================================================================== --- projects/release-git/bin/ps/ps.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/bin/ps/ps.c Fri Jul 31 19:37:45 2020 (r363741) @@ -1264,6 +1264,7 @@ fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, i static void saveuser(KINFO *ki) { + char tdname[COMMLEN + 1]; char *argsp; if (ki->ki_p->ki_flag & P_INMEM) { @@ -1280,12 +1281,14 @@ saveuser(KINFO *ki) * save arguments if needed */ if (needcomm) { - if (ki->ki_p->ki_stat == SZOMB) + if (ki->ki_p->ki_stat == SZOMB) { ki->ki_args = strdup("<defunct>"); - else if (UREADOK(ki) || (ki->ki_p->ki_args != NULL)) + } else if (UREADOK(ki) || (ki->ki_p->ki_args != NULL)) { + (void)snprintf(tdname, sizeof(tdname), "%s%s", + ki->ki_p->ki_tdname, ki->ki_p->ki_moretdname); ki->ki_args = fmt(kvm_getargv, ki, - ki->ki_p->ki_comm, ki->ki_p->ki_tdname, MAXCOMLEN); - else { + ki->ki_p->ki_comm, tdname, COMMLEN * 2 + 1); + } else { asprintf(&argsp, "(%s)", ki->ki_p->ki_comm); ki->ki_args = argsp; } Modified: projects/release-git/bin/sh/main.c ============================================================================== --- projects/release-git/bin/sh/main.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/bin/sh/main.c Fri Jul 31 19:37:45 2020 (r363741) @@ -228,6 +228,10 @@ cmdloop(int top) } } popstackmark(&smark); + if (top && iflag) { + out2c('\n'); + flushout(out2); + } } Modified: projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jul 31 19:37:45 2020 (r363741) @@ -134,7 +134,7 @@ .Op Fl gLP .Op Ar pool .Ar ... -.Op Ar inverval Op Ar count +.Op Ar interval Op Ar count .Nm .Cm labelclear .Op Fl f @@ -146,7 +146,7 @@ .Op Fl T Cm d Ns | Ns Cm u .Op Ar pool .Ar ... -.Op Ar inverval Op Ar count +.Op Ar interval Op Ar count .Nm .Cm offline .Op Fl t @@ -1654,7 +1654,7 @@ Treat exported or foreign devices as inactive. .Op Fl T Cm d Ns | Ns Cm u .Op Ar pool .Ar ... -.Op Ar inverval Op Ar count +.Op Ar interval Op Ar count .Xc .Pp Lists the given pools along with a health status and space usage. If no Modified: projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jul 31 19:37:45 2020 (r363741) @@ -6226,25 +6226,13 @@ typedef struct hist_cbdata { boolean_t internal; } hist_cbdata_t; -/* - * Print out the command history for a specific pool. - */ -static int -get_history_one(zpool_handle_t *zhp, void *data) +static void +print_history_records(nvlist_t *nvhis, hist_cbdata_t *cb) { - nvlist_t *nvhis; nvlist_t **records; uint_t numrecords; - int ret, i; - hist_cbdata_t *cb = (hist_cbdata_t *)data; + int i; - cb->first = B_FALSE; - - (void) printf(gettext("History for '%s':\n"), zpool_get_name(zhp)); - - if ((ret = zpool_get_history(zhp, &nvhis)) != 0) - return (ret); - verify(nvlist_lookup_nvlist_array(nvhis, ZPOOL_HIST_RECORD, &records, &numrecords) == 0); for (i = 0; i < numrecords; i++) { @@ -6344,8 +6332,32 @@ get_history_one(zpool_handle_t *zhp, void *data) (void) printf("]"); (void) printf("\n"); } +} + +/* + * Print out the command history for a specific pool. + */ +static int +get_history_one(zpool_handle_t *zhp, void *data) +{ + nvlist_t *nvhis; + int ret; + hist_cbdata_t *cb = (hist_cbdata_t *)data; + uint64_t off = 0; + boolean_t eof = B_FALSE; + + cb->first = B_FALSE; + + (void) printf(gettext("History for '%s':\n"), zpool_get_name(zhp)); + + while (!eof) { + if ((ret = zpool_get_history(zhp, &nvhis, &off, &eof)) != 0) + return (ret); + + print_history_records(nvhis, cb); + nvlist_free(nvhis); + } (void) printf("\n"); - nvlist_free(nvhis); return (ret); } Modified: projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Jul 31 19:37:45 2020 (r363741) @@ -441,7 +441,8 @@ typedef enum { extern char *zpool_vdev_name(libzfs_handle_t *, zpool_handle_t *, nvlist_t *, int name_flags); extern int zpool_upgrade(zpool_handle_t *, uint64_t); -extern int zpool_get_history(zpool_handle_t *, nvlist_t **); +extern int zpool_get_history(zpool_handle_t *, nvlist_t **, uint64_t *, + boolean_t *); extern int zpool_history_unpack(char *, uint64_t, uint64_t *, nvlist_t ***, uint_t *); extern void zpool_obj_to_path(zpool_handle_t *, uint64_t, uint64_t, char *, Modified: projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c ============================================================================== --- projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c Fri Jul 31 19:37:45 2020 (r363741) @@ -4124,33 +4124,37 @@ zpool_history_unpack(char *buf, uint64_t bytes_read, u * Retrieve the command history of a pool. */ int -zpool_get_history(zpool_handle_t *zhp, nvlist_t **nvhisp) +zpool_get_history(zpool_handle_t *zhp, nvlist_t **nvhisp, uint64_t *off, + boolean_t *eof) { char *buf; uint64_t buflen = HIS_BUF_LEN_DEF; - uint64_t off = 0; nvlist_t **records = NULL; uint_t numrecords = 0; int err, i; + uint64_t start = *off; buf = malloc(buflen); if (buf == NULL) return (ENOMEM); - do { + /* process about 1MB at a time */ + while (*off - start < 1024 * 1024) { uint64_t bytes_read = buflen; uint64_t leftover; - if ((err = get_history(zhp, buf, &off, &bytes_read)) != 0) + if ((err = get_history(zhp, buf, off, &bytes_read)) != 0) break; /* if nothing else was read in, we're at EOF, just return */ - if (bytes_read == 0) + if (bytes_read == 0) { + *eof = B_TRUE; break; + } if ((err = zpool_history_unpack(buf, bytes_read, &leftover, &records, &numrecords)) != 0) break; - off -= leftover; + *off -= leftover; if (leftover == bytes_read) { /* * no progress made, because buffer is not big enough @@ -4165,9 +4169,7 @@ zpool_get_history(zpool_handle_t *zhp, nvlist_t **nvhi break; } } - - /* CONSTCOND */ - } while (1); + } free(buf); Modified: projects/release-git/cddl/lib/Makefile ============================================================================== --- projects/release-git/cddl/lib/Makefile Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/lib/Makefile Fri Jul 31 19:37:45 2020 (r363741) @@ -2,10 +2,10 @@ .include <src.opts.mk> -SUBDIR= ${_drti} \ +SUBDIR= drti \ libavl \ libctf \ - ${_libdtrace} \ + libdtrace \ libnvpair \ libumem \ libuutil \ @@ -21,11 +21,6 @@ _libzfs= libzfs .if ${MK_LIBTHR} != "no" _libzpool= libzpool .endif -.endif - -.if ${MACHINE_CPUARCH} != "sparc64" -_drti= drti -_libdtrace= libdtrace .endif SUBDIR_DEPEND_libdtrace= libctf Modified: projects/release-git/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/release-git/cddl/lib/libdtrace/Makefile Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/lib/libdtrace/Makefile Fri Jul 31 19:37:45 2020 (r363741) @@ -103,9 +103,6 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv .PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv -.elif ${MACHINE_CPUARCH} == "sparc64" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc -.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc .else # temporary hack CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel Modified: projects/release-git/cddl/lib/libzpool/Makefile ============================================================================== --- projects/release-git/cddl/lib/libzpool/Makefile Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/cddl/lib/libzpool/Makefile Fri Jul 31 19:37:45 2020 (r363741) @@ -18,9 +18,7 @@ .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= opensolaris_atomic.S -.if ${MACHINE_ARCH} != "sparc64" ACFLAGS+= -Wa,--noexecstack -.endif .else .PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c Modified: projects/release-git/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c ============================================================================== --- projects/release-git/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Jul 31 19:37:45 2020 (r363741) @@ -260,6 +260,9 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *elf, Dwarf_Error goto fail_cleanup; } + if (sh.sh_type == SHT_NOBITS) + continue; + if ((name = elf_strptr(elf, e->eo_strndx, sh.sh_name)) == NULL) { DWARF_SET_ELF_ERROR(dbg, error); @@ -312,6 +315,9 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *elf, Dwarf_Error ret = DW_DLE_ELF; goto fail_cleanup; } + + if (sh.sh_type == SHT_NOBITS) + continue; memcpy(&e->eo_shdr[j], &sh, sizeof(sh)); Modified: projects/release-git/contrib/ipfilter/iplang/iplang_y.y ============================================================================== --- projects/release-git/contrib/ipfilter/iplang/iplang_y.y Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/iplang/iplang_y.y Fri Jul 31 19:37:45 2020 (r363741) @@ -45,11 +45,6 @@ #include "ipf.h" #include "iplang.h" -#if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ - __FreeBSD_version < 400020) && (!SOLARIS || SOLARIS2 < 10) -extern struct ether_addr *ether_aton __P((char *)); -#endif - extern int opts; extern struct ipopt_names ionames[]; extern int state, state, lineNum, token; @@ -58,11 +53,7 @@ extern char yytext[]; extern FILE *yyin; int yylex __P((void)); #define YYDEBUG 1 -#if !defined(ultrix) && !defined(hpux) int yydebug = 1; -#else -extern int yydebug; -#endif iface_t *iflist = NULL, **iftail = &iflist; iface_t *cifp = NULL; Modified: projects/release-git/contrib/ipfilter/ipsend/arp.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/arp.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/arp.c Fri Jul 31 19:37:45 2020 (r363741) @@ -11,17 +11,13 @@ static const char rcsid[] = "@(#)$Id$"; #endif #include <sys/types.h> #include <sys/socket.h> -#if !defined(ultrix) && !defined(hpux) && !defined(__hpux) && !defined(__osf__) && !defined(_AIX51) # include <sys/sockio.h> -#endif #include <sys/ioctl.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <net/if.h> #include <netinet/if_ether.h> -#ifndef ultrix # include <net/if_arp.h> -#endif #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_var.h> Modified: projects/release-git/contrib/ipfilter/ipsend/ipresend.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/ipresend.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/ipresend.c Fri Jul 31 19:37:45 2020 (r363741) @@ -38,15 +38,7 @@ int opts = 0; # ifdef sun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "lan0"; -# endif -# endif # endif #else char default_device[] = DEFAULT_DEVICE; Modified: projects/release-git/contrib/ipfilter/ipsend/ipsend.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/ipsend.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/ipsend.c Fri Jul 31 19:37:45 2020 (r363741) @@ -33,15 +33,7 @@ extern void iplang __P((FILE *)); char options[68]; int opts; -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "le0"; -# endif /* __bsdi__ */ -# endif /* ultrix */ static void usage __P((char *)); Modified: projects/release-git/contrib/ipfilter/ipsend/iptest.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/iptest.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/iptest.c Fri Jul 31 19:37:45 2020 (r363741) @@ -34,15 +34,7 @@ char options[68]; # ifdef sun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "lan0"; -# endif -# endif # endif static void usage __P((char *)); Modified: projects/release-git/contrib/ipfilter/ipsend/iptests.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/iptests.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/iptests.c Fri Jul 31 19:37:45 2020 (r363741) @@ -36,18 +36,13 @@ typedef int boolean_t; # endif # undef _KERNEL # undef KERNEL -#if !defined(solaris) && !defined(linux) && !defined(__sgi) +#if !defined(solaris) # include <nlist.h> # include <sys/user.h> # include <sys/proc.h> #endif -#if !defined(ultrix) && !defined(hpux) && !defined(linux) && \ - !defined(__sgi) && !defined(__osf__) && !defined(_AIX51) # include <kvm.h> -#endif -#ifndef ultrix # include <sys/socket.h> -#endif #if defined(solaris) # include <sys/stream.h> #else @@ -57,11 +52,9 @@ typedef int boolean_t; #include <sys/systm.h> #include <sys/session.h> #endif -#if BSD >= 199103 # include <sys/sysctl.h> # include <sys/filedesc.h> # include <paths.h> -#endif #include <netinet/in_systm.h> #include <sys/socket.h> #include <net/if.h> @@ -74,7 +67,7 @@ typedef int boolean_t; #include <netinet/in.h> #include <arpa/inet.h> #include <netinet/ip.h> -#if defined(__SVR4) || defined(__svr4__) || defined(__sgi) +#if defined(__SVR4) || defined(__svr4__) # include <sys/sysmacros.h> #endif #include <stdio.h> @@ -82,7 +75,7 @@ typedef int boolean_t; #include <stdlib.h> #include <string.h> # include <netinet/ip_var.h> -# if !defined(__hpux) && !defined(solaris) +# if !defined(solaris) # include <netinet/in_pcb.h> # endif #include "ipsend.h" Modified: projects/release-git/contrib/ipfilter/ipsend/sock.c ============================================================================== --- projects/release-git/contrib/ipfilter/ipsend/sock.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/ipsend/sock.c Fri Jul 31 19:37:45 2020 (r363741) @@ -21,14 +21,8 @@ static const char rcsid[] = "@(#)$Id$"; */ typedef int boolean_t; #endif -#ifndef ultrix #include <fcntl.h> -#endif -#if (__FreeBSD_version >= 300000) # include <sys/dirent.h> -#else -# include <sys/dir.h> -#endif # ifdef __NetBSD__ # include <machine/lock.h> # endif @@ -38,10 +32,6 @@ typedef int boolean_t; # define _KERNEL # define KERNEL # endif -# ifdef ultrix -# undef LOCORE -# include <sys/smp_lock.h> -# endif # include <sys/file.h> # ifdef __FreeBSD__ # undef _WANT_FILE @@ -54,18 +44,14 @@ typedef int boolean_t; #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/proc.h> -#if !defined(ultrix) && !defined(hpux) && !defined(__osf__) # include <kvm.h> -#endif #ifdef sun #include <sys/systm.h> #include <sys/session.h> #endif -#if BSD >= 199103 #include <sys/sysctl.h> #include <sys/filedesc.h> #include <paths.h> -#endif #include <math.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -143,128 +129,10 @@ int kmemcpy(buf, pos, n) struct nlist names[4] = { { "_proc" }, { "_nproc" }, -#ifdef ultrix - { "_u" }, -#else { NULL }, -#endif { NULL } }; -#if BSD < 199103 -static struct proc *getproc() -{ - struct proc *p; - pid_t pid = getpid(); - int siz, n; - - n = nlist(KERNEL, names); - if (n != 0) - { - fprintf(stderr, "nlist(%#x) == %d\n", names, n); - return NULL; - } - if (KMCPY(&nproc, names[1].n_value, sizeof(nproc)) == -1) - { - fprintf(stderr, "read nproc (%#x)\n", names[1].n_value); - return NULL; - } - siz = nproc * sizeof(struct proc); - if (KMCPY(&p, names[0].n_value, sizeof(p)) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) proc\n", - names[0].n_value, &p, sizeof(p)); - return NULL; - } - proc = (struct proc *)malloc(siz); - if (KMCPY(proc, p, siz) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) proc\n", - p, proc, siz); - return NULL; - } - - p = proc; - - for (n = nproc; n; n--, p++) - if (p->p_pid == pid) - break; - if (!n) - return NULL; - - return p; -} - - -struct tcpcb *find_tcp(fd, ti) - int fd; - struct tcpiphdr *ti; -{ - struct tcpcb *t; - struct inpcb *i; - struct socket *s; - struct user *up; - struct proc *p; - struct file *f, **o; - - if (!(p = getproc())) - return NULL; - up = (struct user *)malloc(sizeof(*up)); -#ifndef ultrix - if (KMCPY(up, p->p_uarea, sizeof(*up)) == -1) - { - fprintf(stderr, "read(%#x,%#x) failed\n", p, p->p_uarea); - return NULL; - } -#else - if (KMCPY(up, names[2].n_value, sizeof(*up)) == -1) - { - fprintf(stderr, "read(%#x,%#x) failed\n", p, names[2].n_value); - return NULL; - } -#endif - - o = (struct file **)calloc(up->u_lastfile + 1, sizeof(*o)); - if (KMCPY(o, up->u_ofile, (up->u_lastfile + 1) * sizeof(*o)) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) - u_ofile - failed\n", - up->u_ofile, o, sizeof(*o)); - return NULL; - } - f = (struct file *)calloc(1, sizeof(*f)); - if (KMCPY(f, o[fd], sizeof(*f)) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) - o[fd] - failed\n", - up->u_ofile[fd], f, sizeof(*f)); - return NULL; - } - - s = (struct socket *)calloc(1, sizeof(*s)); - if (KMCPY(s, f->f_data, sizeof(*s)) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) - f_data - failed\n", - o[fd], s, sizeof(*s)); - return NULL; - } - - i = (struct inpcb *)calloc(1, sizeof(*i)); - if (KMCPY(i, s->so_pcb, sizeof(*i)) == -1) - { - fprintf(stderr, "kvm_read(%#x,%#x,%d) - so_pcb - failed\n", - s->so_pcb, i, sizeof(*i)); - return NULL; - } - - t = (struct tcpcb *)calloc(1, sizeof(*t)); - if (KMCPY(t, i->inp_ppcb, sizeof(*t)) == -1) - { - fprintf(stderr, "read(%#x,%#x,%d) - inp_ppcb - failed\n", - i->inp_ppcb, t, sizeof(*t)); - return NULL; - } - return (struct tcpcb *)i->inp_ppcb; -} -#else static struct kinfo_proc *getproc() { static struct kinfo_proc kp; @@ -304,7 +172,7 @@ struct tcpcb *find_tcp(tfd, ti) fd = (struct filedesc *)malloc(sizeof(*fd)); if (fd == NULL) return NULL; -#if defined( __FreeBSD_version) && __FreeBSD_version >= 500013 +#if defined( __FreeBSD_version) if (KMCPY(fd, p->ki_fd, sizeof(*fd)) == -1) { fprintf(stderr, "read(%#lx,%#lx) failed\n", @@ -381,7 +249,6 @@ finderror: free(t); return NULL; } -#endif /* BSD < 199301 */ int do_socket(dev, mtu, ti, gwip) char *dev; Modified: projects/release-git/contrib/ipfilter/man/ipf.8 ============================================================================== --- projects/release-git/contrib/ipfilter/man/ipf.8 Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/man/ipf.8 Fri Jul 31 19:37:45 2020 (r363741) @@ -158,6 +158,15 @@ display the statistics prior to them being zeroed. Zero global statistics held in the kernel for filtering only (this doesn't affect fragment or state statistics). .DT +.SH ENVIRONMENT +.NM utilizes the following environment variable. +.TP +.B IPF_PREDEFINED +ipfilter variables, see VARIABLES in ipf(5), can be specified in this +environment variable providing shell access to ipfilter and ipnat variables. +For example, +.br +IPF_PREDEFINED='my_server="10.1.1.1"; my_client="10.1.1.2";' .SH FILES /dev/ipauth .br Modified: projects/release-git/contrib/ipfilter/man/ipfstat.8 ============================================================================== --- projects/release-git/contrib/ipfilter/man/ipfstat.8 Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/man/ipfstat.8 Fri Jul 31 19:37:45 2020 (r363741) @@ -5,7 +5,7 @@ ipfstat \- reports on packet filter statistics and fil .SH SYNOPSIS .B ipfstat [ -.B \-6aAdfghIilnoRsv +.B \-46aAdfghIilnoRsv ] .br .B ipfstat -t @@ -35,6 +35,11 @@ is to retrieve and display the accumulated statistics accumulated over time as the kernel has put packets through the filter. .SH OPTIONS .TP +.B \-4 +Display filter lists and states for IPv4, if available. This is the default +when displaying states. \fB-4\fP and \fB-6\fP is the default when +displaying lists. +.TP .B \-6 Display filter lists and states for IPv6, if available. .TP @@ -190,4 +195,5 @@ more entries is to resize the screen. .SH SEE ALSO ipf(8) .SH BUGS -none known. +\fB-4\fP and \fB-6\fP are only valid with \fB-i\fP, \fB-o\fP, and \fB-t\fP. +An error should result when used with other arguments. Modified: projects/release-git/contrib/ipfilter/tools/ipfstat.c ============================================================================== --- projects/release-git/contrib/ipfilter/tools/ipfstat.c Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/ipfilter/tools/ipfstat.c Fri Jul 31 19:37:45 2020 (r363741) @@ -57,7 +57,10 @@ static wordtab_t *state_fields = NULL; int nohdrfields = 0; int opts = 0; +#ifdef USE_INET6 +int use_inet4 = 0; int use_inet6 = 0; +#endif int live_kernel = 1; int state_fd = -1; int ipf_fd = -1; @@ -163,16 +166,18 @@ static void usage(name) char *name; { #ifdef USE_INET6 - fprintf(stderr, "Usage: %s [-6aAdfghIilnoRsv]\n", name); + fprintf(stderr, "Usage: %s [-46aAdfghIilnoRsv]\n", name); #else - fprintf(stderr, "Usage: %s [-aAdfghIilnoRsv]\n", name); + fprintf(stderr, "Usage: %s [-4aAdfghIilnoRsv]\n", name); #endif fprintf(stderr, " %s [-M corefile] [-N symbol-list]\n", name); +#ifdef STATETOP #ifdef USE_INET6 - fprintf(stderr, " %s -t [-6C] ", name); + fprintf(stderr, " %s -t [-46C] ", name); #else - fprintf(stderr, " %s -t [-C] ", name); + fprintf(stderr, " %s -t [-4C] ", name); #endif +#endif fprintf(stderr, "[-D destination address] [-P protocol] [-S source address] [-T refresh time]\n"); exit(1); } @@ -206,9 +211,9 @@ int main(argc,argv) u_32_t frf; #ifdef USE_INET6 - options = "6aACdfghIilnostvD:m:M:N:O:P:RS:T:"; + options = "46aACdfghIilnostvD:m:M:N:O:P:RS:T:"; #else - options = "aACdfghIilnostvD:m:M:N:O:P:RS:T:"; + options = "4aACdfghIilnostvD:m:M:N:O:P:RS:T:"; #endif saddr.in4.s_addr = INADDR_ANY; /* default any v4 source addr */ @@ -283,6 +288,9 @@ int main(argc,argv) switch (c) { #ifdef USE_INET6 + case '4' : + use_inet4 = 1; + break; case '6' : use_inet6 = 1; break; @@ -385,6 +393,19 @@ int main(argc,argv) break; } } +#ifdef USE_INET6 + if ((use_inet4 || use_inet6) && + !(opts & (OPT_INQUE | OPT_OUTQUE | OPT_STATETOP))) { +#ifdef STATETOP + FPRINTF(stderr, "No -i, -o, or -t given with -4 or -6\n"); +#else + FPRINTF(stderr, "No -i or -o given with -4 or -6\n"); +#endif + exit(-2); + } + if (use_inet4 == 0 && use_inet6 == 0) + use_inet4 = use_inet6 = 1; +#endif if (live_kernel == 1) { bzero((char *)&fio, sizeof(fio)); @@ -410,8 +431,13 @@ int main(argc,argv) #ifdef STATETOP else if (opts & OPT_STATETOP) topipstates(saddr, daddr, sport, dport, protocol, - use_inet6 ? 6 : 4, refreshtime, topclosed, filter); +#ifdef USE_INET6 + use_inet6 && use_inet4 ? 0 : use_inet6 && !use_inet4 ? 6 : 4, +#else + 4, #endif +#endif + refreshtime, topclosed, filter); else if (opts & OPT_AUTHSTATS) showauthstates(frauthstp); else if (opts & OPT_GROUPS) @@ -805,15 +831,21 @@ printlivelist(fiop, out, set, fp, group, comment) if (rule.iri_rule == NULL) break; #ifdef USE_INET6 - if (use_inet6 != 0) { + if (use_inet6 != 0 && use_inet4 == 0) { if (fp->fr_family != 0 && fp->fr_family != AF_INET6) continue; - } else + } else if (use_inet4 != 0 && use_inet6 == 0) { #endif - { if (fp->fr_family != 0 && fp->fr_family != AF_INET) continue; +#ifdef USE_INET6 + } else { + if (fp->fr_family != 0 && + fp->fr_family != AF_INET && fp->fr_family != AF_INET6) + continue; } +#endif + if (fp->fr_data != NULL) fp->fr_data = (char *)fp + fp->fr_size; @@ -904,13 +936,21 @@ static void printdeadlist(fiop, out, set, fp, group, c return; } fp = &fb; - if (use_inet6 != 0) { - if (fp->fr_family != 0 && fp->fr_family != 6) +#ifdef USE_INET6 + if (use_inet6 != 0 && use_inet4 == 0) { + if (fp->fr_family != 0 && fp->fr_family != AF_INET6) continue; + } else if (use_inet4 != 0 && use_inet6 == 0) { +#endif + if (fp->fr_family != 0 && fp->fr_family != AF_INET) + continue; +#ifdef USE_INET6 } else { - if (fp->fr_family != 0 && fp->fr_family != 4) + if (fp->fr_family != 0 && + fp->fr_family != AF_INET && fp->fr_family != AF_INET6) continue; } +#endif data = NULL; type = fb.fr_type & ~FR_T_BUILTIN; @@ -1338,7 +1378,7 @@ static void topipstates(saddr, daddr, sport, dport, pr if (ipsstp->iss_list == NULL) break; - if (ips.is_v != ver) + if (ver != 0 && ips.is_v != ver) continue; if ((filter != NULL) && @@ -1906,7 +1946,7 @@ static void parse_ipportstr(argument, ip, port) ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; - } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { + } else if (use_inet6 && !use_inet4 && inet_pton(AF_INET6, s, &ip->in6)) { ok = 1; #endif } else if (inet_aton(s, &ip->in4)) @@ -1944,6 +1984,9 @@ static char *getip(v, addr) static char hostbuf[MAXHOSTNAMELEN+1]; #endif + if (v == 0) + return ("any"); + if (v == 4) return inet_ntoa(addr->in4); @@ -2047,7 +2090,7 @@ static int sort_srcip(a, b) register const statetop_t *bp = b; #ifdef USE_INET6 - if (use_inet6) { + if (use_inet6 && !use_inet4) { if (IP6_EQ(&ap->st_src, &bp->st_src)) return 0; else if (IP6_GT(&ap->st_src, &bp->st_src)) @@ -2087,7 +2130,7 @@ static int sort_dstip(a, b) register const statetop_t *bp = b; #ifdef USE_INET6 - if (use_inet6) { + if (use_inet6 && !use_inet4) { if (IP6_EQ(&ap->st_dst, &bp->st_dst)) return 0; else if (IP6_GT(&ap->st_dst, &bp->st_dst)) Modified: projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/meta.in ============================================================================== --- projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/meta.in Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/meta.in Fri Jul 31 19:37:45 2020 (r363741) @@ -4,7 +4,9 @@ a[bc]d & abd abd a\*c & a*c a*c a\\b & a\b a\b a\\\*b & a\*b a\*b -a\bc & abc abc +# Begin FreeBSD +a\bc &C EESCAPE +# End FreeBSD a\ &C EESCAPE a\\bc & a\bc a\bc \{ bC BADRPT Modified: projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/subexp.in ============================================================================== --- projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/subexp.in Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/netbsd-tests/lib/libc/regex/data/subexp.in Fri Jul 31 19:37:45 2020 (r363741) @@ -12,7 +12,7 @@ a(b+)c - abbbc abbbc bbb a(b*)c - ac ac @c (a|ab)(bc([de]+)f|cde) - abcdef abcdef a,bcdef,de # Begin FreeBSD -a\(b\|c\)d b ab|cd ab|cd b|c +a\(b|c\)d b ab|cd ab|cd b|c # End FreeBSD # the regression tester only asks for 9 subexpressions a(b)(c)(d)(e)(f)(g)(h)(i)(j)k - abcdefghijk abcdefghijk b,c,d,e,f,g,h,i,j Modified: projects/release-git/contrib/netbsd-tests/usr.bin/grep/t_grep.sh ============================================================================== --- projects/release-git/contrib/netbsd-tests/usr.bin/grep/t_grep.sh Fri Jul 31 19:31:52 2020 (r363740) +++ projects/release-git/contrib/netbsd-tests/usr.bin/grep/t_grep.sh Fri Jul 31 19:37:45 2020 (r363741) @@ -214,6 +214,89 @@ zgrep_body() atf_check -o file:"$(atf_get_srcdir)/d_zgrep.out" zgrep -h line d_input.gz } +atf_test_case zgrep_combined_flags +zgrep_combined_flags_head() +{ + atf_set "descr" "Checks for zgrep wrapper problems with combined flags (PR 247126)" +} +zgrep_combined_flags_body() +{ + atf_expect_fail "known but unsolved zgrep wrapper script regression" + + echo 'foo bar' > test + + atf_check -o inline:"foo bar\n" zgrep -we foo test + # Avoid hang on reading from stdin in the failure case + atf_check -o inline:"foo bar\n" zgrep -wefoo test < /dev/null +} + +atf_test_case zgrep_eflag +zgrep_eflag_head() +{ + atf_set "descr" "Checks for zgrep wrapper problems with -e PATTERN (PR 247126)" +} +zgrep_eflag_body() +{ + echo 'foo bar' > test + + # Avoid hang on reading from stdin in the failure case + atf_check -o inline:"foo bar\n" zgrep -e 'foo bar' test < /dev/null + atf_check -o inline:"foo bar\n" zgrep --regexp='foo bar' test < /dev/null +} + +atf_test_case zgrep_fflag +zgrep_fflag_head() +{ + atf_set "descr" "Checks for zgrep wrapper problems with -f FILE (PR 247126)" +} +zgrep_fflag_body() +{ + echo foo > pattern + echo foobar > test + + # Avoid hang on reading from stdin in the failure case + atf_check -o inline:"foobar\n" zgrep -f pattern test </dev/null + atf_check -o inline:"foobar\n" zgrep --file=pattern test </dev/null +} + +atf_test_case zgrep_long_eflag +zgrep_long_eflag_head() +{ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007311937.06VJbk0h036252>