Date: Fri, 5 Oct 2018 17:53:48 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r339201 - in projects/openssl111: . contrib/blacklist/bin contrib/bmake contrib/elftoolchain/libelf contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test c... Message-ID: <201810051753.w95Hrmko009773@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Oct 5 17:53:47 2018 New Revision: 339201 URL: https://svnweb.freebsd.org/changeset/base/339201 Log: MFH r338661 through r339200. Sponsored by: The FreeBSD Foundation Added: - copied from r339200, head/contrib/mandoc/ projects/openssl111/lib/lib80211/regdomain.xml - copied unchanged from r339200, head/lib/lib80211/regdomain.xml projects/openssl111/lib/libalias/libalias/libalias.conf - copied unchanged from r339200, head/lib/libalias/libalias/libalias.conf projects/openssl111/lib/libc/net/hosts - copied unchanged from r339200, head/lib/libc/net/hosts projects/openssl111/lib/libc/net/hosts.equiv - copied unchanged from r339200, head/lib/libc/net/hosts.equiv projects/openssl111/lib/libc/net/networks - copied unchanged from r339200, head/lib/libc/net/networks projects/openssl111/lib/libc/net/nsswitch.conf - copied unchanged from r339200, head/lib/libc/net/nsswitch.conf projects/openssl111/lib/libc/net/protocols - copied unchanged from r339200, head/lib/libc/net/protocols projects/openssl111/lib/libc/posix1e/mac.conf - copied unchanged from r339200, head/lib/libc/posix1e/mac.conf projects/openssl111/lib/libc/rpc/netconfig - copied unchanged from r339200, head/lib/libc/rpc/netconfig projects/openssl111/lib/libc/rpc/rpc - copied unchanged from r339200, head/lib/libc/rpc/rpc projects/openssl111/lib/libopie/opieaccess - copied unchanged from r339200, head/lib/libopie/opieaccess projects/openssl111/lib/libsmb/nsmb.conf - copied unchanged from r339200, head/lib/libsmb/nsmb.conf projects/openssl111/lib/libwrap/hosts.allow - copied unchanged from r339200, head/lib/libwrap/hosts.allow projects/openssl111/libexec/rtld-elf/libmap.conf - copied unchanged from r339200, head/libexec/rtld-elf/libmap.conf projects/openssl111/sbin/bsdlabel/disktab - copied unchanged from r339200, head/sbin/bsdlabel/disktab projects/openssl111/share/man/man4/iflib.4 - copied unchanged from r339200, head/share/man/man4/iflib.4 projects/openssl111/sys/arm64/include/ifunc.h - copied unchanged from r339200, head/sys/arm64/include/ifunc.h projects/openssl111/tools/build/options/WITH_HYPERV - copied unchanged from r339200, head/tools/build/options/WITH_HYPERV projects/openssl111/usr.bin/tip/tip/phones - copied unchanged from r339200, head/usr.bin/tip/tip/phones projects/openssl111/usr.bin/tip/tip/remote - copied unchanged from r339200, head/usr.bin/tip/tip/remote projects/openssl111/usr.sbin/amd/amd/amd.map - copied unchanged from r339200, head/usr.sbin/amd/amd/amd.map projects/openssl111/usr.sbin/lpr/lpd/hosts.lpd - copied unchanged from r339200, head/usr.sbin/lpr/lpd/hosts.lpd projects/openssl111/usr.sbin/lpr/lpd/printcap - copied unchanged from r339200, head/usr.sbin/lpr/lpd/printcap Directory Properties: projects/openssl111/contrib/mandoc/ (props changed) Replaced: projects/openssl111/sbin/dhclient/dhclient.conf - copied unchanged from r339200, head/sbin/dhclient/dhclient.conf Deleted: projects/openssl111/contrib/mdocml/ projects/openssl111/etc/amd.map projects/openssl111/etc/dhclient.conf projects/openssl111/etc/disktab projects/openssl111/etc/hosts projects/openssl111/etc/hosts.allow projects/openssl111/etc/hosts.equiv projects/openssl111/etc/hosts.lpd projects/openssl111/etc/libalias.conf projects/openssl111/etc/libmap.conf projects/openssl111/etc/mac.conf projects/openssl111/etc/netconfig projects/openssl111/etc/networks projects/openssl111/etc/nsmb.conf projects/openssl111/etc/nsswitch.conf projects/openssl111/etc/opieaccess projects/openssl111/etc/phones projects/openssl111/etc/printcap projects/openssl111/etc/protocols projects/openssl111/etc/regdomain.xml projects/openssl111/etc/remote projects/openssl111/etc/rpc Modified: projects/openssl111/UPDATING projects/openssl111/contrib/blacklist/bin/blacklistd.8 projects/openssl111/contrib/bmake/make.1 projects/openssl111/contrib/elftoolchain/libelf/gelf_mips64el.c projects/openssl111/contrib/libarchive/README.md projects/openssl111/contrib/libarchive/libarchive/archive_acl.c projects/openssl111/contrib/libarchive/libarchive/archive_cryptor.c projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_ar.c projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/openssl111/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/openssl111/contrib/libarchive/test_utils/test_main.c projects/openssl111/contrib/llvm/lib/CodeGen/BranchFolding.cpp projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp projects/openssl111/contrib/llvm/tools/lld/ELF/Config.h projects/openssl111/contrib/llvm/tools/lld/ELF/Driver.cpp projects/openssl111/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp projects/openssl111/contrib/llvm/tools/lld/ELF/Writer.cpp projects/openssl111/contrib/openbsm/bin/auditdistd/auditdistd.h projects/openssl111/contrib/openbsm/bin/auditdistd/receiver.c projects/openssl111/contrib/openbsm/bin/auditdistd/sender.c projects/openssl111/contrib/openbsm/bin/auditdistd/trail.c projects/openssl111/etc/Makefile projects/openssl111/gnu/usr.bin/binutils/as/config.h projects/openssl111/gnu/usr.bin/binutils/ld/config.h projects/openssl111/gnu/usr.bin/binutils/libbinutils/config.h projects/openssl111/gnu/usr.bin/binutils/libiberty/config.h projects/openssl111/gnu/usr.bin/cc/libiberty/config.h projects/openssl111/gnu/usr.bin/gdb/arch/amd64/config.h projects/openssl111/gnu/usr.bin/gdb/arch/arm/config.h projects/openssl111/gnu/usr.bin/gdb/arch/i386/config.h projects/openssl111/gnu/usr.bin/gdb/arch/mips/config.h projects/openssl111/gnu/usr.bin/gdb/arch/powerpc/config.h projects/openssl111/gnu/usr.bin/gdb/arch/powerpc64/config.h projects/openssl111/gnu/usr.bin/gdb/arch/sparc64/config.h projects/openssl111/include/limits.h projects/openssl111/include/time.h projects/openssl111/lib/Makefile projects/openssl111/lib/clang/freebsd_cc_version.h projects/openssl111/lib/csu/arm/crt1.c projects/openssl111/lib/csu/common/crtbrand.c projects/openssl111/lib/csu/common/ignore_init.c projects/openssl111/lib/csu/common/notes.h projects/openssl111/lib/lib80211/Makefile projects/openssl111/lib/libalias/libalias/Makefile projects/openssl111/lib/libbe/be.c projects/openssl111/lib/libc/Makefile projects/openssl111/lib/libc/amd64/string/bcmp.S projects/openssl111/lib/libc/amd64/string/bcopy.S projects/openssl111/lib/libc/amd64/string/bzero.S projects/openssl111/lib/libc/amd64/string/memcmp.S projects/openssl111/lib/libc/amd64/string/memset.S projects/openssl111/lib/libc/i386/string/bcopy.S projects/openssl111/lib/libc/net/Makefile.inc projects/openssl111/lib/libc/posix1e/Makefile.inc projects/openssl111/lib/libc/rpc/Makefile.inc projects/openssl111/lib/libopie/Makefile projects/openssl111/lib/libpmc/Makefile projects/openssl111/lib/libpmc/libpmc_pmu_util.c projects/openssl111/lib/libsmb/Makefile projects/openssl111/lib/libusb/libusb10.h projects/openssl111/lib/libusb/libusb10_io.c projects/openssl111/lib/libwrap/Makefile projects/openssl111/libexec/rtld-elf/Makefile projects/openssl111/libexec/rtld-elf/aarch64/reloc.c projects/openssl111/libexec/rtld-elf/aarch64/rtld_machdep.h projects/openssl111/libexec/rtld-elf/libmap.c projects/openssl111/libexec/rtld-elf/powerpc/reloc.c projects/openssl111/libexec/rtld-elf/rtld.c projects/openssl111/release/Makefile projects/openssl111/release/scripts/pkg-stage.sh projects/openssl111/sbin/bsdlabel/Makefile projects/openssl111/sbin/devd/devd.cc projects/openssl111/sbin/devd/devd.hh projects/openssl111/sbin/dhclient/Makefile projects/openssl111/sbin/fsck_ffs/pass5.c projects/openssl111/sbin/geom/core/geom.8 projects/openssl111/sbin/geom/core/geom.c projects/openssl111/sbin/ifconfig/ifipsec.c projects/openssl111/sbin/init/rc.d/ldconfig projects/openssl111/sbin/ipfw/ipfw.8 projects/openssl111/sbin/ipfw/ipfw2.c projects/openssl111/sbin/reboot/reboot.c projects/openssl111/sbin/sysctl/sysctl.8 projects/openssl111/secure/usr.bin/openssl/Makefile projects/openssl111/share/man/man4/Makefile projects/openssl111/share/man/man4/bnxt.4 projects/openssl111/share/man/man4/cxgbe.4 projects/openssl111/share/man/man4/ddb.4 projects/openssl111/share/man/man4/em.4 projects/openssl111/share/man/man5/make.conf.5 projects/openssl111/share/man/man5/msdosfs.5 projects/openssl111/share/man/man5/src.conf.5 projects/openssl111/share/man/man9/MODULE_PNP_INFO.9 projects/openssl111/share/man/man9/iflib.9 projects/openssl111/share/mk/bsd.dirs.mk projects/openssl111/share/mk/bsd.progs.mk projects/openssl111/share/mk/bsd.subdir.mk projects/openssl111/share/mk/bsd.sys.mk projects/openssl111/share/mk/src.opts.mk projects/openssl111/stand/lua/menu.lua projects/openssl111/stand/lua/password.lua projects/openssl111/sys/amd64/amd64/copyout.c projects/openssl111/sys/amd64/amd64/machdep.c projects/openssl111/sys/amd64/amd64/pmap.c projects/openssl111/sys/amd64/amd64/support.S projects/openssl111/sys/amd64/amd64/trap.c projects/openssl111/sys/amd64/include/pmap.h projects/openssl111/sys/amd64/include/vmm.h projects/openssl111/sys/amd64/vmm/intel/vmx.c projects/openssl111/sys/amd64/vmm/vmm.c projects/openssl111/sys/arm/conf/std.armv6 projects/openssl111/sys/arm/conf/std.armv7 projects/openssl111/sys/arm64/arm64/elf_machdep.c projects/openssl111/sys/arm64/arm64/identcpu.c projects/openssl111/sys/arm64/arm64/machdep.c projects/openssl111/sys/arm64/arm64/undefined.c projects/openssl111/sys/arm64/conf/GENERIC-MMCCAM projects/openssl111/sys/arm64/include/pte.h projects/openssl111/sys/arm64/include/undefined.h projects/openssl111/sys/cam/scsi/scsi_cd.c projects/openssl111/sys/cam/scsi/scsi_da.c projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/openssl111/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/openssl111/sys/compat/freebsd32/freebsd32_ioctl.c projects/openssl111/sys/compat/freebsd32/freebsd32_ioctl.h projects/openssl111/sys/compat/freebsd32/freebsd32_syscall.h projects/openssl111/sys/compat/freebsd32/freebsd32_syscalls.c projects/openssl111/sys/compat/freebsd32/freebsd32_sysent.c projects/openssl111/sys/compat/freebsd32/syscalls.master projects/openssl111/sys/conf/files projects/openssl111/sys/conf/files.arm projects/openssl111/sys/conf/files.arm64 projects/openssl111/sys/conf/files.i386 projects/openssl111/sys/conf/files.mips projects/openssl111/sys/conf/files.powerpc projects/openssl111/sys/conf/files.riscv projects/openssl111/sys/conf/files.sparc64 projects/openssl111/sys/conf/kern.pre.mk projects/openssl111/sys/conf/newvers.sh projects/openssl111/sys/crypto/ccp/ccp.c projects/openssl111/sys/dev/aac/aac_pci.c projects/openssl111/sys/dev/aacraid/aacraid_pci.c projects/openssl111/sys/dev/adlink/adlink.c projects/openssl111/sys/dev/ae/if_ae.c projects/openssl111/sys/dev/age/if_age.c projects/openssl111/sys/dev/ahci/ahci_pci.c projects/openssl111/sys/dev/alc/if_alc.c projects/openssl111/sys/dev/ale/if_ale.c projects/openssl111/sys/dev/amdsmn/amdsmn.c projects/openssl111/sys/dev/amdtemp/amdtemp.c projects/openssl111/sys/dev/amr/amr_pci.c projects/openssl111/sys/dev/an/if_an_pci.c projects/openssl111/sys/dev/bce/if_bce.c projects/openssl111/sys/dev/bfe/if_bfe.c projects/openssl111/sys/dev/bge/if_bge.c projects/openssl111/sys/dev/bwi/if_bwi_pci.c projects/openssl111/sys/dev/bwn/if_bwn_pci.c projects/openssl111/sys/dev/bxe/bxe.c projects/openssl111/sys/dev/cas/if_cas.c projects/openssl111/sys/dev/ciss/ciss.c projects/openssl111/sys/dev/cpuctl/cpuctl.c projects/openssl111/sys/dev/cxgb/cxgb_main.c projects/openssl111/sys/dev/cxgbe/adapter.h projects/openssl111/sys/dev/cxgbe/common/common.h projects/openssl111/sys/dev/cxgbe/common/t4_hw.c projects/openssl111/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/openssl111/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/openssl111/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/openssl111/sys/dev/cxgbe/osdep.h projects/openssl111/sys/dev/cxgbe/t4_filter.c projects/openssl111/sys/dev/cxgbe/t4_l2t.c projects/openssl111/sys/dev/cxgbe/t4_l2t.h projects/openssl111/sys/dev/cxgbe/t4_main.c projects/openssl111/sys/dev/cxgbe/tom/t4_cpl_io.c projects/openssl111/sys/dev/dc/if_dc.c projects/openssl111/sys/dev/drm2/drm_os_freebsd.c projects/openssl111/sys/dev/drm2/i915/i915_drv.c projects/openssl111/sys/dev/drm2/i915/intel_ringbuffer.c projects/openssl111/sys/dev/drm2/radeon/radeon_drv.c projects/openssl111/sys/dev/e1000/if_em.c projects/openssl111/sys/dev/ed/if_ed_pci.c projects/openssl111/sys/dev/ena/ena.c projects/openssl111/sys/dev/et/if_et.c projects/openssl111/sys/dev/ffec/if_ffec.c projects/openssl111/sys/dev/fxp/if_fxp.c projects/openssl111/sys/dev/gem/if_gem_pci.c projects/openssl111/sys/dev/hwpmc/hwpmc_logging.c projects/openssl111/sys/dev/hwpmc/hwpmc_mod.c projects/openssl111/sys/dev/ichiic/ig4_iic.c projects/openssl111/sys/dev/ichiic/ig4_pci.c projects/openssl111/sys/dev/ida/ida_pci.c projects/openssl111/sys/dev/intpm/intpm.c projects/openssl111/sys/dev/ioat/ioat.c projects/openssl111/sys/dev/ipw/if_ipw.c projects/openssl111/sys/dev/iwm/if_iwm.c projects/openssl111/sys/dev/iwn/if_iwn.c projects/openssl111/sys/dev/ixgbe/if_ix.c projects/openssl111/sys/dev/ixgbe/if_ixv.c projects/openssl111/sys/dev/ixl/if_ixl.c projects/openssl111/sys/dev/ixl/if_ixlv.c projects/openssl111/sys/dev/mfi/mfi_pci.c projects/openssl111/sys/dev/mpr/mpr_pci.c projects/openssl111/sys/dev/mps/mps_pci.c projects/openssl111/sys/dev/mvs/mvs_pci.c projects/openssl111/sys/dev/my/if_my.c projects/openssl111/sys/dev/ncr/ncr.c projects/openssl111/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/openssl111/sys/dev/oce/oce_if.c projects/openssl111/sys/dev/ofw/ofw_bus_subr.h projects/openssl111/sys/dev/pccard/pccardvar.h projects/openssl111/sys/dev/pccbb/pccbb_pci.c projects/openssl111/sys/dev/pci/pci_user.c projects/openssl111/sys/dev/pci/pcireg.h projects/openssl111/sys/dev/pci/pcivar.h projects/openssl111/sys/dev/pcn/if_pcn.c projects/openssl111/sys/dev/puc/puc_pci.c projects/openssl111/sys/dev/ral/if_ral_pci.c projects/openssl111/sys/dev/rl/if_rl.c projects/openssl111/sys/dev/sdhci/sdhci_acpi.c projects/openssl111/sys/dev/spibus/spi.h projects/openssl111/sys/dev/uart/uart_bus_pccard.c projects/openssl111/sys/dev/uart/uart_bus_pci.c projects/openssl111/sys/dev/usb/net/if_ure.c projects/openssl111/sys/dev/usb/usbdi.h projects/openssl111/sys/dev/xl/if_xl.c projects/openssl111/sys/geom/raid/tr_raid0.c projects/openssl111/sys/i386/i386/npx.c projects/openssl111/sys/i386/i386/pmap.c projects/openssl111/sys/i386/i386/trap.c projects/openssl111/sys/i386/i386/vm_machdep.c projects/openssl111/sys/i386/include/pmap.h projects/openssl111/sys/isa/isavar.h projects/openssl111/sys/kern/init_sysent.c projects/openssl111/sys/kern/kern_context.c projects/openssl111/sys/kern/kern_cpuset.c projects/openssl111/sys/kern/kern_descrip.c projects/openssl111/sys/kern/kern_malloc.c projects/openssl111/sys/kern/kern_resource.c projects/openssl111/sys/kern/link_elf.c projects/openssl111/sys/kern/subr_vmem.c projects/openssl111/sys/kern/sys_generic.c projects/openssl111/sys/kern/syscalls.c projects/openssl111/sys/kern/syscalls.master projects/openssl111/sys/kern/uipc_socket.c projects/openssl111/sys/kern/vfs_lookup.c projects/openssl111/sys/kern/vfs_syscalls.c projects/openssl111/sys/net/if.c projects/openssl111/sys/net/if_gre.c projects/openssl111/sys/net/if_tap.c projects/openssl111/sys/net/if_tun.c projects/openssl111/sys/net/if_var.h projects/openssl111/sys/net/if_vlan.c projects/openssl111/sys/net/iflib.c projects/openssl111/sys/net/iflib.h projects/openssl111/sys/netinet/in_pcb.h projects/openssl111/sys/netinet/ip_encap.h projects/openssl111/sys/netinet/ip_output.c projects/openssl111/sys/netinet/sctp_asconf.c projects/openssl111/sys/netinet/sctp_auth.c projects/openssl111/sys/netinet/sctp_auth.h projects/openssl111/sys/netinet/sctp_input.c projects/openssl111/sys/netinet/sctp_output.c projects/openssl111/sys/netinet/sctputil.c projects/openssl111/sys/netinet/siftr.c projects/openssl111/sys/netinet/tcp_hpts.c projects/openssl111/sys/netinet/tcp_input.c projects/openssl111/sys/netinet/tcp_syncache.c projects/openssl111/sys/netinet/udp_usrreq.c projects/openssl111/sys/netinet6/icmp6.c projects/openssl111/sys/netinet6/in6_pcb.c projects/openssl111/sys/netinet6/udp6_usrreq.c projects/openssl111/sys/netipsec/key.c projects/openssl111/sys/netipsec/key.h projects/openssl111/sys/netipsec/subr_ipsec.c projects/openssl111/sys/netipsec/xform.h projects/openssl111/sys/netpfil/pf/pf.c projects/openssl111/sys/opencrypto/cryptosoft.c projects/openssl111/sys/opencrypto/cryptosoft.h projects/openssl111/sys/powerpc/conf/GENERIC64 projects/openssl111/sys/powerpc/ofw/ofw_machdep.c projects/openssl111/sys/riscv/include/fpe.h projects/openssl111/sys/riscv/riscv/machdep.c projects/openssl111/sys/riscv/riscv/pmap.c projects/openssl111/sys/riscv/riscv/swtch.S projects/openssl111/sys/riscv/riscv/trap.c projects/openssl111/sys/security/audit/audit.c projects/openssl111/sys/security/audit/audit.h projects/openssl111/sys/security/audit/audit_dtrace.c projects/openssl111/sys/security/audit/audit_private.h projects/openssl111/sys/security/audit/audit_syscalls.c projects/openssl111/sys/security/audit/audit_worker.c projects/openssl111/sys/sys/_domainset.h projects/openssl111/sys/sys/malloc.h projects/openssl111/sys/sys/module.h projects/openssl111/sys/sys/pmc.h projects/openssl111/sys/sys/pmckern.h projects/openssl111/sys/sys/racct.h projects/openssl111/sys/sys/resourcevar.h projects/openssl111/sys/sys/signalvar.h projects/openssl111/sys/sys/syscall.h projects/openssl111/sys/sys/user.h projects/openssl111/sys/sys/vmmeter.h projects/openssl111/sys/ufs/ffs/ffs_softdep.c projects/openssl111/sys/ufs/ufs/ufs_quota.c projects/openssl111/sys/ufs/ufs/ufs_vfsops.c projects/openssl111/sys/ufs/ufs/ufs_vnops.c projects/openssl111/sys/vm/swap_pager.c projects/openssl111/sys/vm/uma_core.c projects/openssl111/sys/vm/vm_domainset.c projects/openssl111/sys/vm/vm_domainset.h projects/openssl111/sys/vm/vm_fault.c projects/openssl111/sys/vm/vm_glue.c projects/openssl111/sys/vm/vm_init.c projects/openssl111/sys/vm/vm_kern.c projects/openssl111/sys/vm/vm_kern.h projects/openssl111/sys/vm/vm_mmap.c projects/openssl111/sys/vm/vm_page.c projects/openssl111/sys/vm/vm_pageout.c projects/openssl111/sys/vm/vm_pagequeue.h projects/openssl111/sys/vm/vm_phys.c projects/openssl111/sys/x86/acpica/srat.c projects/openssl111/sys/x86/include/ifunc.h projects/openssl111/sys/x86/include/ucode.h projects/openssl111/sys/x86/iommu/intel_utils.c projects/openssl111/sys/x86/isa/atpic.c projects/openssl111/sys/x86/x86/ucode.c projects/openssl111/tools/build/mk/OptionalObsoleteFiles.inc projects/openssl111/usr.bin/bmake/Makefile.config projects/openssl111/usr.bin/clang/lld/ld.lld.1 projects/openssl111/usr.bin/locate/locate/Makefile projects/openssl111/usr.bin/mail/Makefile projects/openssl111/usr.bin/mandoc/Makefile projects/openssl111/usr.bin/nfsstat/nfsstat.1 projects/openssl111/usr.bin/tip/tip/Makefile projects/openssl111/usr.bin/top/top.1 projects/openssl111/usr.sbin/Makefile projects/openssl111/usr.sbin/amd/amd/Makefile projects/openssl111/usr.sbin/bsdinstall/bsdinstall.8 projects/openssl111/usr.sbin/bsdinstall/scripts/config projects/openssl111/usr.sbin/bsdinstall/scripts/hardening projects/openssl111/usr.sbin/chown/chown.c projects/openssl111/usr.sbin/cxgbetool/cxgbetool.8 projects/openssl111/usr.sbin/cxgbetool/cxgbetool.c projects/openssl111/usr.sbin/kldxref/kldxref.c projects/openssl111/usr.sbin/lpr/lpd/Makefile projects/openssl111/usr.sbin/nscd/nscd.8 projects/openssl111/usr.sbin/pmc/Makefile projects/openssl111/usr.sbin/pmccontrol/pmccontrol.c Directory Properties: projects/openssl111/ (props changed) projects/openssl111/contrib/blacklist/ (props changed) projects/openssl111/contrib/bmake/ (props changed) projects/openssl111/contrib/elftoolchain/ (props changed) projects/openssl111/contrib/libarchive/ (props changed) projects/openssl111/contrib/llvm/ (props changed) projects/openssl111/contrib/llvm/tools/clang/ (props changed) projects/openssl111/contrib/llvm/tools/lld/ (props changed) projects/openssl111/contrib/openbsm/ (props changed) projects/openssl111/crypto/openssh/ (props changed) projects/openssl111/gnu/usr.bin/binutils/ (props changed) projects/openssl111/gnu/usr.bin/gdb/ (props changed) projects/openssl111/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/openssl111/UPDATING ============================================================================== --- projects/openssl111/UPDATING Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/UPDATING Fri Oct 5 17:53:47 2018 (r339201) @@ -31,6 +31,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20181002: + The cam(4) based nda(4) driver will be used over nvd(4) by default on + powerpc64. You may set 'options NVME_USE_NVD=1' in your kernel conf or + loader tunable 'hw.nvme.use_nvd=1' if you wish to use the existing + driver. Make sure to edit /boot/etc/kboot.conf and fstab to use the + nda device name. + +20180913: + Reproducible build mode is now on by default, in preparation for + FreeBSD 12.0. This eliminates build metadata such as the user, + host, and time from the kernel (and uname), unless the working tree + corresponds to a modified checkout from a version control system. + The previous behavior can be obtained by setting the /etc/src.conf + knob WITHOUT_REPRODUCIBLE_BUILD. + 20180826: The Yarrow CSPRNG has been removed from the kernel as it has not been supported by its designers since at least 2003. Fortuna has been the @@ -170,6 +185,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: need to be rebuilt. r335018 did a __FreeBSD_version bump for this. 20180530: + As of r334391 lld is the default amd64 system linker; it is installed + as /usr/bin/ld. Kernel build workarounds (see 20180510 entry) are no + longer necessary. + +20180530: The kernel / userland interface for devinfo changed, so you'll need a new kernel and userland as a pair for it to work (rebuilding lib/libdevinfo is all that's required). devinfo and devmatch will @@ -195,6 +215,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: way requires LD=ld.lld on the command line (or LD=/usr/local/bin/ld for binutils port/package). lld will soon be default, and this requirement will go away. + + NOTE: As of r334391 lld is the default system linker on amd64, and no + workaround is necessary. 20180508: The nxge(4) driver has been removed. This driver was for PCI-X 10g Modified: projects/openssl111/contrib/blacklist/bin/blacklistd.8 ============================================================================== --- projects/openssl111/contrib/blacklist/bin/blacklistd.8 Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/blacklist/bin/blacklistd.8 Fri Oct 5 17:53:47 2018 (r339201) @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 7, 2016 +.Dd October 5, 2018 .Dt BLACKLISTD 8 .Os .Sh NAME @@ -178,7 +178,7 @@ Specify the default rule name for the packet filter ru .It Fl r Re-read the firewall rules from the internal database, then remove and re-add them. -This helps for packet filters that don't retain state across reboots. +This helps for packet filters that do not retain state across reboots. .It Fl s Ar sockpath Add .Ar sockpath @@ -197,6 +197,27 @@ diagnostic messages to .Dv stdout instead of .Xr syslogd 8 . +.El +.Sh SIGNAL HANDLING +.Nm +deals with the following signals: +.Bl -tag -width "USR2" +.It HUP +Receipt of this signal causes +.Nm +to re-read the configuration file. +.It INT, TERM & QUIT +These signals tell +.Nm +to exit in an orderly fashion. +.It USR1 +This signal tells +.Nm +to increase the internal debugging level by 1. +.It USR2 +This signal tells +.Nm +to decrease the internal debugging level by 1. .El .Sh FILES .Bl -tag -width /usr/libexec/blacklistd-helper -compact Modified: projects/openssl111/contrib/bmake/make.1 ============================================================================== --- projects/openssl111/contrib/bmake/make.1 Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/bmake/make.1 Fri Oct 5 17:53:47 2018 (r339201) @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd June 22, 2017 +.Dd September 27, 2018 .Dt MAKE 1 .Os .Sh NAME @@ -796,7 +796,7 @@ Tells whether to pass the descriptors of the job token queue even if the target is not tagged with .Ic .MAKE -The default is +The default is .Ql Pa yes for backwards compatability with .Fx 9.0 @@ -2385,7 +2385,8 @@ Basic use of suffix rules (for files only in the curre not trying to chain transformations together, etc.) is also reasonably portable. .Sh SEE ALSO -.Xr mkdep 1 +.Xr mkdep 1 , +.Xr style.Makefile 5 .Sh HISTORY A .Nm Modified: projects/openssl111/contrib/elftoolchain/libelf/gelf_mips64el.c ============================================================================== --- projects/openssl111/contrib/elftoolchain/libelf/gelf_mips64el.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/elftoolchain/libelf/gelf_mips64el.c Fri Oct 5 17:53:47 2018 (r339201) @@ -34,8 +34,9 @@ int _libelf_is_mips64el(Elf *e) { - return (e->e_kind == ELF_K_ELF && e->e_byteorder == ELFDATA2LSB && - e->e_u.e_elf.e_ehdr.e_ehdr64->e_machine == EM_MIPS); + return (e->e_kind == ELF_K_ELF && + e->e_u.e_elf.e_ehdr.e_ehdr64->e_machine == EM_MIPS && + e->e_u.e_elf.e_ehdr.e_ehdr64->e_ident[EI_DATA] == ELFDATA2LSB); } /* Modified: projects/openssl111/contrib/libarchive/README.md ============================================================================== --- projects/openssl111/contrib/libarchive/README.md Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/README.md Fri Oct 5 17:53:47 2018 (r339201) @@ -78,7 +78,6 @@ Currently, the library automatically detects and reads * POSIX pax interchange format * POSIX octet-oriented cpio * SVR4 ASCII cpio - * POSIX octet-oriented cpio * 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) Modified: projects/openssl111/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/openssl111/contrib/libarchive/libarchive/archive_acl.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/libarchive/archive_acl.c Fri Oct 5 17:53:47 2018 (r339201) @@ -2058,6 +2058,12 @@ next_field(const char **p, const char **start, } *sep = **p; + /* If the field is only whitespace, bail out now. */ + if (**p == '\0') { + *end = *p; + return; + } + /* Trim trailing whitespace to locate end of field. */ *end = *p - 1; while (**end == ' ' || **end == '\t' || **end == '\n') { Modified: projects/openssl111/contrib/libarchive/libarchive/archive_cryptor.c ============================================================================== --- projects/openssl111/contrib/libarchive/libarchive/archive_cryptor.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/libarchive/archive_cryptor.c Fri Oct 5 17:53:47 2018 (r339201) @@ -316,7 +316,14 @@ aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *k memcpy(ctx->key, key, key_len); memset(ctx->nonce, 0, sizeof(ctx->nonce)); ctx->encr_pos = AES_BLOCK_SIZE; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if (!EVP_CIPHER_CTX_reset(ctx->ctx)) { + EVP_CIPHER_CTX_free(ctx->ctx); + ctx->ctx = NULL; + } +#else EVP_CIPHER_CTX_init(ctx->ctx); +#endif return 0; } Modified: projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_ar.c ============================================================================== --- projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_ar.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_ar.c Fri Oct 5 17:53:47 2018 (r339201) @@ -459,6 +459,7 @@ ar_parse_common_header(struct ar *ar, struct archive_e uint64_t n; /* Copy remaining header */ + archive_entry_set_filetype(entry, AE_IFREG); archive_entry_set_mtime(entry, (time_t)ar_atol10(h + AR_date_offset, AR_date_size), 0L); archive_entry_set_uid(entry, Modified: projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_zip.c ============================================================================== --- projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/libarchive/archive_read_support_format_zip.c Fri Oct 5 17:53:47 2018 (r339201) @@ -2708,6 +2708,11 @@ slurp_central_directory(struct archive_read *a, struct return ARCHIVE_FATAL; zip_entry = calloc(1, sizeof(struct zip_entry)); + if (zip_entry == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate zip entry"); + return ARCHIVE_FATAL; + } zip_entry->next = zip->zip_entries; zip_entry->flags |= LA_FROM_CENTRAL_DIRECTORY; zip->zip_entries = zip_entry; Modified: projects/openssl111/contrib/libarchive/libarchive/test/test_sparse_basic.c ============================================================================== --- projects/openssl111/contrib/libarchive/libarchive/test/test_sparse_basic.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/libarchive/test/test_sparse_basic.c Fri Oct 5 17:53:47 2018 (r339201) @@ -422,6 +422,7 @@ verify_sparse_file(struct archive *a, const char *path assert(sparse->type == END); assertEqualInt(expected_offset, archive_entry_size(ae)); + failure(path); assertEqualInt(holes_seen, expected_holes); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); @@ -457,6 +458,7 @@ verify_sparse_file2(struct archive *a, const char *pat /* Verify the number of holes only, not its offset nor its * length because those alignments are deeply dependence on * its filesystem. */ + failure(path); assertEqualInt(blocks, archive_entry_sparse_count(ae)); archive_entry_free(ae); } Modified: projects/openssl111/contrib/libarchive/test_utils/test_main.c ============================================================================== --- projects/openssl111/contrib/libarchive/test_utils/test_main.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/libarchive/test_utils/test_main.c Fri Oct 5 17:53:47 2018 (r339201) @@ -2166,7 +2166,7 @@ void assertVersion(const char *prog, const char *base) /* Skip arbitrary third-party version numbers. */ while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || - isalnum(*q))) { + isalnum((unsigned char)*q))) { ++q; --s; } Modified: projects/openssl111/contrib/llvm/lib/CodeGen/BranchFolding.cpp ============================================================================== --- projects/openssl111/contrib/llvm/lib/CodeGen/BranchFolding.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/lib/CodeGen/BranchFolding.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -884,11 +884,12 @@ void BranchFolder::mergeCommonTails(unsigned commonTai if (UpdateLiveIns) { LivePhysRegs NewLiveIns(*TRI); computeLiveIns(NewLiveIns, *MBB); + LiveRegs.init(*TRI); // The flag merging may lead to some register uses no longer using the // <undef> flag, add IMPLICIT_DEFs in the predecessors as necessary. for (MachineBasicBlock *Pred : MBB->predecessors()) { - LiveRegs.init(*TRI); + LiveRegs.clear(); LiveRegs.addLiveOuts(*Pred); MachineBasicBlock::iterator InsertBefore = Pred->getFirstTerminator(); for (unsigned Reg : NewLiveIns) { Modified: projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp ============================================================================== --- projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -14,6 +14,7 @@ #include "CodeGenFunction.h" #include "CGObjCRuntime.h" #include "CodeGenModule.h" +#include "ConstantEmitter.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclTemplate.h" @@ -85,7 +86,7 @@ class AggExprEmitter : public StmtVisitor<AggExprEmitt void EmitMoveFromReturnSlot(const Expr *E, RValue Src); void EmitArrayInit(Address DestPtr, llvm::ArrayType *AType, - QualType elementType, InitListExpr *E); + QualType ArrayQTy, InitListExpr *E); AggValueSlot::NeedsGCBarriers_t needsGC(QualType T) { if (CGF.getLangOpts().getGC() && TypeRequiresGCollection(T)) @@ -392,12 +393,15 @@ static bool isTrivialFiller(Expr *E) { /// \brief Emit initialization of an array from an initializer list. void AggExprEmitter::EmitArrayInit(Address DestPtr, llvm::ArrayType *AType, - QualType elementType, InitListExpr *E) { + QualType ArrayQTy, InitListExpr *E) { uint64_t NumInitElements = E->getNumInits(); uint64_t NumArrayElements = AType->getNumElements(); assert(NumInitElements <= NumArrayElements); + QualType elementType = + CGF.getContext().getAsArrayType(ArrayQTy)->getElementType(); + // DestPtr is an array*. Construct an elementType* by drilling // down a level. llvm::Value *zero = llvm::ConstantInt::get(CGF.SizeTy, 0); @@ -409,6 +413,29 @@ void AggExprEmitter::EmitArrayInit(Address DestPtr, ll CharUnits elementAlign = DestPtr.getAlignment().alignmentOfArrayElement(elementSize); + // Consider initializing the array by copying from a global. For this to be + // more efficient than per-element initialization, the size of the elements + // with explicit initializers should be large enough. + if (NumInitElements * elementSize.getQuantity() > 16 && + elementType.isTriviallyCopyableType(CGF.getContext())) { + CodeGen::CodeGenModule &CGM = CGF.CGM; + ConstantEmitter Emitter(CGM); + LangAS AS = ArrayQTy.getAddressSpace(); + if (llvm::Constant *C = Emitter.tryEmitForInitializer(E, AS, ArrayQTy)) { + auto GV = new llvm::GlobalVariable( + CGM.getModule(), C->getType(), + CGM.isTypeConstant(ArrayQTy, /* ExcludeCtorDtor= */ true), + llvm::GlobalValue::PrivateLinkage, C, "constinit", + /* InsertBefore= */ nullptr, llvm::GlobalVariable::NotThreadLocal, + CGM.getContext().getTargetAddressSpace(AS)); + Emitter.finalize(GV); + CharUnits Align = CGM.getContext().getTypeAlignInChars(ArrayQTy); + GV->setAlignment(Align.getQuantity()); + EmitFinalDestCopy(ArrayQTy, CGF.MakeAddrLValue(GV, ArrayQTy, Align)); + return; + } + } + // Exception safety requires us to destroy all the // already-constructed members if an initializer throws. // For that, we'll need an EH cleanup. @@ -1156,11 +1183,8 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E // Handle initialization of an array. if (E->getType()->isArrayType()) { - QualType elementType = - CGF.getContext().getAsArrayType(E->getType())->getElementType(); - auto AType = cast<llvm::ArrayType>(Dest.getAddress().getElementType()); - EmitArrayInit(Dest.getAddress(), AType, elementType, E); + EmitArrayInit(Dest.getAddress(), AType, E->getType(), E); return; } Modified: projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp ============================================================================== --- projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -321,8 +321,6 @@ void CodeGenModule::checkAliases() { assert(FTy); if (!FTy->getReturnType()->isPointerTy()) Diags.Report(Location, diag::err_ifunc_resolver_return); - if (FTy->getNumParams()) - Diags.Report(Location, diag::err_ifunc_resolver_params); } llvm::Constant *Aliasee = Alias->getIndirectSymbol(); Modified: projects/openssl111/contrib/llvm/tools/lld/ELF/Config.h ============================================================================== --- projects/openssl111/contrib/llvm/tools/lld/ELF/Config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/lld/ELF/Config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -156,6 +156,7 @@ struct Configuration { bool ZExecstack; bool ZHazardplt; bool ZIfuncnoplt; + bool ZInterpose; bool ZNocopyreloc; bool ZNodelete; bool ZNodlopen; Modified: projects/openssl111/contrib/llvm/tools/lld/ELF/Driver.cpp ============================================================================== --- projects/openssl111/contrib/llvm/tools/lld/ELF/Driver.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/lld/ELF/Driver.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -670,6 +670,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args Config->ZExecstack = hasZOption(Args, "execstack"); Config->ZHazardplt = hasZOption(Args, "hazardplt"); Config->ZIfuncnoplt = hasZOption(Args, "ifunc-noplt"); + Config->ZInterpose = hasZOption(Args, "interpose"); Config->ZNocopyreloc = hasZOption(Args, "nocopyreloc"); Config->ZNodelete = hasZOption(Args, "nodelete"); Config->ZNodlopen = hasZOption(Args, "nodlopen"); Modified: projects/openssl111/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp ============================================================================== --- projects/openssl111/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/lld/ELF/SyntheticSections.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -1034,6 +1034,8 @@ template <class ELFT> void DynamicSection<ELFT>::final uint32_t DtFlags1 = 0; if (Config->Bsymbolic) DtFlags |= DF_SYMBOLIC; + if (Config->ZInterpose) + DtFlags1 |= DF_1_INTERPOSE; if (Config->ZNodelete) DtFlags1 |= DF_1_NODELETE; if (Config->ZNodlopen) Modified: projects/openssl111/contrib/llvm/tools/lld/ELF/Writer.cpp ============================================================================== --- projects/openssl111/contrib/llvm/tools/lld/ELF/Writer.cpp Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/llvm/tools/lld/ELF/Writer.cpp Fri Oct 5 17:53:47 2018 (r339201) @@ -487,7 +487,7 @@ template <class ELFT> void Writer<ELFT>::run() { static bool shouldKeepInSymtab(SectionBase *Sec, StringRef SymName, const Symbol &B) { - if (B.isFile() || B.isSection()) + if (B.isSection()) return false; // If sym references a section in a discarded group, don't keep it. Modified: projects/openssl111/contrib/openbsm/bin/auditdistd/auditdistd.h ============================================================================== --- projects/openssl111/contrib/openbsm/bin/auditdistd/auditdistd.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/openbsm/bin/auditdistd/auditdistd.h Fri Oct 5 17:53:47 2018 (r339201) @@ -248,6 +248,21 @@ struct adrep { if (_wakeup) \ cv_signal(list##_cond); \ } while (0) +#define QUEUE_CONCAT2(tolist, fromlist1, fromlist2) do { \ + bool _wakeup; \ + \ + mtx_lock(tolist##_lock); \ + _wakeup = TAILQ_EMPTY(tolist); \ + mtx_lock(fromlist1##_lock); \ + TAILQ_CONCAT((tolist), (fromlist1), adr_next); \ + mtx_unlock(fromlist1##_lock); \ + mtx_lock(fromlist2##_lock); \ + TAILQ_CONCAT((tolist), (fromlist2), adr_next); \ + mtx_unlock(fromlist2##_lock); \ + mtx_unlock(tolist##_lock); \ + if (_wakeup) \ + cv_signal(tolist##_cond); \ +} while (0) #define QUEUE_WAIT(list) do { \ mtx_lock(list##_lock); \ while (TAILQ_EMPTY(list)) \ Modified: projects/openssl111/contrib/openbsm/bin/auditdistd/receiver.c ============================================================================== --- projects/openssl111/contrib/openbsm/bin/auditdistd/receiver.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/openbsm/bin/auditdistd/receiver.c Fri Oct 5 17:53:47 2018 (r339201) @@ -140,7 +140,7 @@ static void adreq_decode_and_validate_header(struct adreq *adreq) { - /* Byte-swap only is the sender is using different byte order. */ + /* Byte-swap only if the sender is using different byte order. */ if (adreq->adr_byteorder != ADIST_BYTEORDER) { adreq->adr_byteorder = ADIST_BYTEORDER; adreq->adr_seq = bswap64(adreq->adr_seq); Modified: projects/openssl111/contrib/openbsm/bin/auditdistd/sender.c ============================================================================== --- projects/openssl111/contrib/openbsm/bin/auditdistd/sender.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/openbsm/bin/auditdistd/sender.c Fri Oct 5 17:53:47 2018 (r339201) @@ -342,14 +342,7 @@ sender_disconnect(void) pjdlog_warning("Disconnected from %s.", adhost->adh_remoteaddr); /* Move all in-flight requests back onto free list. */ - mtx_lock(&adist_free_list_lock); - mtx_lock(&adist_send_list_lock); - TAILQ_CONCAT(&adist_free_list, &adist_send_list, adr_next); - mtx_unlock(&adist_send_list_lock); - mtx_lock(&adist_recv_list_lock); - TAILQ_CONCAT(&adist_free_list, &adist_recv_list, adr_next); - mtx_unlock(&adist_recv_list_lock); - mtx_unlock(&adist_free_list_lock); + QUEUE_CONCAT2(&adist_free_list, &adist_send_list, &adist_recv_list); } static void @@ -519,9 +512,6 @@ keepalive_send(void) pjdlog_debug(3, "keepalive_send: Request sent."); } -/* - * Thread sends request to secondary node. - */ static void * send_thread(void *arg __unused) { @@ -581,7 +571,7 @@ static void adrep_decode_header(struct adrep *adrep) { - /* Byte-swap only is the receiver is using different byte order. */ + /* Byte-swap only if the receiver is using different byte order. */ if (adrep->adrp_byteorder != ADIST_BYTEORDER) { adrep->adrp_byteorder = ADIST_BYTEORDER; adrep->adrp_seq = bswap64(adrep->adrp_seq); @@ -589,10 +579,6 @@ adrep_decode_header(struct adrep *adrep) } } -/* - * Thread receives answer from secondary node and passes it to ggate_send - * thread. - */ static void * recv_thread(void *arg __unused) { @@ -609,9 +595,13 @@ recv_thread(void *arg __unused) if (adhost->adh_remote == NULL) { /* * Connection is dead. - * XXX: We shouldn't be here. + * There is a short race in sender_disconnect() between + * setting adh_remote to NULL and removing entries from + * the recv list, which can result in us being here. + * To avoid just spinning, wait for 0.1s. */ rw_unlock(&adist_remote_lock); + usleep(100000); continue; } if (proto_recv(adhost->adh_remote, &adrep, Modified: projects/openssl111/contrib/openbsm/bin/auditdistd/trail.c ============================================================================== --- projects/openssl111/contrib/openbsm/bin/auditdistd/trail.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/contrib/openbsm/bin/auditdistd/trail.c Fri Oct 5 17:53:47 2018 (r339201) @@ -361,17 +361,38 @@ again: pjdlog_debug(1, "No new trail files."); return; } - PJDLOG_VERIFY(strlcpy(trail->tr_filename, curfile, - sizeof(trail->tr_filename)) < sizeof(trail->tr_filename)); dfd = dirfd(trail->tr_dirfp); PJDLOG_ASSERT(dfd >= 0); - trail->tr_filefd = openat(dfd, trail->tr_filename, O_RDONLY); + trail->tr_filefd = openat(dfd, curfile, O_RDONLY); if (trail->tr_filefd == -1) { - pjdlog_errno(LOG_ERR, - "Unable to open file \"%s/%s\", skipping", - trail->tr_dirname, trail->tr_filename); + if (errno == ENOENT && trail_is_not_terminated(curfile)) { + /* + * The .not_terminated file was most likely renamed. + * Keep trail->tr_filename as a starting point and + * search again. + */ + pjdlog_debug(1, + "Unable to open \"%s/%s\", most likely renamed in the meantime, retrying.", + trail->tr_dirname, curfile); + } else { + /* + * We were unable to open the file, but not because of + * the above. This shouldn't happen, but it did. + * We don't know why it happen, so the best we can do + * is to just skip this file - this is why we copy the + * name, so we can start and the next entry. + */ + PJDLOG_VERIFY(strlcpy(trail->tr_filename, curfile, + sizeof(trail->tr_filename)) < + sizeof(trail->tr_filename)); + pjdlog_errno(LOG_ERR, + "Unable to open file \"%s/%s\", skipping", + trail->tr_dirname, curfile); + } goto again; } + PJDLOG_VERIFY(strlcpy(trail->tr_filename, curfile, + sizeof(trail->tr_filename)) < sizeof(trail->tr_filename)); pjdlog_debug(1, "Found next trail file: \"%s/%s\".", trail->tr_dirname, trail->tr_filename); } Modified: projects/openssl111/etc/Makefile ============================================================================== --- projects/openssl111/etc/Makefile Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/etc/Makefile Fri Oct 5 17:53:47 2018 (r339201) @@ -13,57 +13,18 @@ SUBDIR+=sendmail .endif BIN1= \ - dhclient.conf \ - disktab \ group \ - hosts \ - hosts.allow \ - hosts.equiv \ - libalias.conf \ - libmap.conf \ login.access \ - mac.conf \ - netconfig \ - networks \ - nsswitch.conf \ - phones \ - protocols \ rc.bsdextended \ rc.firewall \ - remote \ - rpc \ termcap.small # NB: keep these sorted by MK_* knobs -.if ${MK_AMD} != "no" -BIN1+= amd.map -.endif - -.if ${MK_LOCATE} != "no" -BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc -.endif - -.if ${MK_LPR} != "no" -BIN1+= hosts.lpd printcap -.endif - -.if ${MK_MAIL} != "no" -BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc -.endif - -.if ${MK_OPENSSL} != "no" -SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf -.endif - .if ${MK_SENDMAIL} != "no" BIN1+= rc.sendmail .endif -.if ${MK_WIRELESS} != "no" -BIN1+= regdomain.xml -.endif - .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else @@ -104,7 +65,7 @@ distribution: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ - master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; + master.passwd ${DESTDIR}/etc; .if ${MK_TCSH} == "no" sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd @@ -129,10 +90,6 @@ distribution: .if ${MK_SENDMAIL} != "no" ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif -.if ${MK_OPENSSL} != "no" - cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - ${SSL} ${DESTDIR}/etc/ssl -.endif .if ${MK_KERBEROS} != "no" cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -160,10 +117,6 @@ distribution: ${DESTDIR}/boot/device.hints .endif .endif -.if ${MK_NIS} == "no" - sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \ - ${DESTDIR}/etc/nsswitch.conf -.endif MTREE_CMD?= mtree @@ -244,7 +197,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY etc-examples: ${META_DEPS} cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${BIN1} ${BIN2} nsmb.conf opieaccess \ + ${BIN1} ${BIN2} \ ${DESTDIR}${SHAREDIR}/examples/etc .include <bsd.prog.mk> Modified: projects/openssl111/gnu/usr.bin/binutils/as/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/binutils/as/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/binutils/as/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -69,7 +69,7 @@ /* #undef HAVE_REMOVE */ /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the <stdarg.h> header file. */ #define HAVE_STDARG_H 1 Modified: projects/openssl111/gnu/usr.bin/binutils/ld/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/binutils/ld/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/binutils/ld/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -65,7 +65,7 @@ #define HAVE_REALPATH 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 Modified: projects/openssl111/gnu/usr.bin/binutils/libbinutils/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/binutils/libbinutils/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/binutils/libbinutils/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -104,7 +104,7 @@ #define HAVE_MKSTEMP 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 Modified: projects/openssl111/gnu/usr.bin/binutils/libiberty/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/binutils/libiberty/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/binutils/libiberty/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -188,7 +188,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/cc/libiberty/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/cc/libiberty/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/cc/libiberty/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -187,7 +187,7 @@ #define HAVE_RINDEX 1 /* Define to 1 if you have the `sbrk' function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/amd64/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/amd64/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/amd64/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/arm/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/arm/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/arm/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -239,7 +239,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/i386/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/i386/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/i386/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/mips/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/mips/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/mips/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/powerpc/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/powerpc/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/powerpc/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/powerpc64/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/powerpc64/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/powerpc64/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/gnu/usr.bin/gdb/arch/sparc64/config.h ============================================================================== --- projects/openssl111/gnu/usr.bin/gdb/arch/sparc64/config.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/gnu/usr.bin/gdb/arch/sparc64/config.h Fri Oct 5 17:53:47 2018 (r339201) @@ -227,7 +227,7 @@ #define HAVE_REALPATH 1 /* Define if you have the sbrk function. */ -#define HAVE_SBRK 1 +/* #undef HAVE_SBRK */ /* Define if you have the setenv function. */ #define HAVE_SETENV 1 Modified: projects/openssl111/include/limits.h ============================================================================== --- projects/openssl111/include/limits.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/include/limits.h Fri Oct 5 17:53:47 2018 (r339201) @@ -122,7 +122,7 @@ #endif #if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809 -#define NL_ARGMAX 65536 /* max # of position args for printf */ +#define NL_ARGMAX 4096 /* max # of position args for printf */ #define NL_MSGMAX 32767 #define NL_SETMAX 255 #define NL_TEXTMAX 2048 Modified: projects/openssl111/include/time.h ============================================================================== --- projects/openssl111/include/time.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/include/time.h Fri Oct 5 17:53:47 2018 (r339201) @@ -207,9 +207,13 @@ time_t posix2time(time_t t); #include <xlocale/_time.h> #endif +#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ + (defined(cplusplus) && cplusplus >= 201703) +#include <sys/_timespec.h> /* ISO/IEC 9899:201x 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ int timespec_get(struct timespec *ts, int base); +#endif __END_DECLS Modified: projects/openssl111/lib/Makefile ============================================================================== --- projects/openssl111/lib/Makefile Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/Makefile Fri Oct 5 17:53:47 2018 (r339201) @@ -70,6 +70,8 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libpathconv \ libpcap \ libpjdlog \ + libpmc \ + libpmcstat \ ${_libproc} \ libprocstat \ libregex \ @@ -198,9 +200,6 @@ _libdl= libdl .endif SUBDIR.${MK_OPENSSL}+= libmp -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv")) -SUBDIR.${MK_PMC}+= libpmc libpmcstat -.endif SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet Modified: projects/openssl111/lib/clang/freebsd_cc_version.h ============================================================================== --- projects/openssl111/lib/clang/freebsd_cc_version.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/clang/freebsd_cc_version.h Fri Oct 5 17:53:47 2018 (r339201) @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define FREEBSD_CC_VERSION 1200015 +#define FREEBSD_CC_VERSION 1200016 Modified: projects/openssl111/lib/csu/arm/crt1.c ============================================================================== --- projects/openssl111/lib/csu/arm/crt1.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/csu/arm/crt1.c Fri Oct 5 17:53:47 2018 (r339201) @@ -44,6 +44,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/param.h> +#include <sys/elf_common.h> #include <stdlib.h> #include "libc_private.h" @@ -120,7 +122,7 @@ static const struct { } archtag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = { .namesz = sizeof(NOTE_FREEBSD_VENDOR), .descsz = sizeof(MACHINE_ARCH), - .type = ARCH_NOTETYPE, + .type = NT_FREEBSD_ARCH_TAG, .name = NOTE_FREEBSD_VENDOR, .desc = MACHINE_ARCH }; Modified: projects/openssl111/lib/csu/common/crtbrand.c ============================================================================== --- projects/openssl111/lib/csu/common/crtbrand.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/csu/common/crtbrand.c Fri Oct 5 17:53:47 2018 (r339201) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/elf_common.h> #include "notes.h" /* @@ -62,7 +63,7 @@ static const struct { } abitag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = { .namesz = sizeof(NOTE_FREEBSD_VENDOR), .descsz = sizeof(int32_t), - .type = ABI_NOTETYPE, + .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, .desc = __FreeBSD_version }; Modified: projects/openssl111/lib/csu/common/ignore_init.c ============================================================================== --- projects/openssl111/lib/csu/common/ignore_init.c Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/csu/common/ignore_init.c Fri Oct 5 17:53:47 2018 (r339201) @@ -28,6 +28,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/param.h> +#include <sys/elf_common.h> #include "notes.h" extern int main(int, char **, char **); @@ -114,7 +116,7 @@ static const struct { aligned(4))) __used = { .namesz = sizeof(NOTE_FREEBSD_VENDOR), .descsz = sizeof(uint32_t), - .type = CRT_NOINIT_NOTETYPE, + .type = NT_FREEBSD_NOINIT_TAG, .name = NOTE_FREEBSD_VENDOR, .desc = 0 }; Modified: projects/openssl111/lib/csu/common/notes.h ============================================================================== --- projects/openssl111/lib/csu/common/notes.h Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/csu/common/notes.h Fri Oct 5 17:53:47 2018 (r339201) @@ -34,8 +34,4 @@ #define NOTE_SECTION ".note.tag" -#define ABI_NOTETYPE 1 -#define CRT_NOINIT_NOTETYPE 2 -#define ARCH_NOTETYPE 3 - #endif Modified: projects/openssl111/lib/lib80211/Makefile ============================================================================== --- projects/openssl111/lib/lib80211/Makefile Fri Oct 5 17:07:10 2018 (r339200) +++ projects/openssl111/lib/lib80211/Makefile Fri Oct 5 17:53:47 2018 (r339201) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= regdomain.xml PACKAGE=lib${LIB} LIB= 80211 SHLIBDIR?= /lib Copied: projects/openssl111/lib/lib80211/regdomain.xml (from r339200, head/lib/lib80211/regdomain.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/openssl111/lib/lib80211/regdomain.xml Fri Oct 5 17:53:47 2018 (r339201, copy of r339200, head/lib/lib80211/regdomain.xml) @@ -0,0 +1,1943 @@ +<!-- + Copyright (c) 2007-2008 Sam Leffler, Errno Consulting + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + $FreeBSD$ +--> + +<regulatory-data> + +<!-- Regdomain/SKU definitions --> + +<regulatory-domains> + +<!-- + DEBUG holds all available channels; the driver/device + defines what the capabilities and tx power caps are. + Regdomain code gets this information with the + IEEE80211_IOC_DRIVERCAPS ioctl. +--> +<rd id="debug"> + <name>DEBUG</name> + <sku>0x1ff</sku> +</rd> + +<rd id="fcc"> + <name>FCC</name> + <sku>0x10</sku> + <defcc ref="US"/> + <netband mode="11b"> + <band> + <freqband ref="F1_2412_2462"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_B</flags> + </band> + </netband> + <netband mode="11g"> + <band> + <freqband ref="F1_2412_2462"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_G</flags> + </band> + </netband> + <netband mode="11a"> + <band> + <freqband ref="F1_5180_5240"/> + <maxpower>17</maxpower> + </band> + <band> + <freqband ref="F1_5745_5805"/> + <maxpower>23</maxpower> + </band> + <band> + <freqband ref="F1_5825_5825"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + </band> + </netband> + <netband mode="11ng"> + <band> + <freqband ref="F1_2412_2462"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_G</flags> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_2412_2462"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_G</flags> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + </netband> + <netband mode="11na"> + <band> + <freqband ref="F1_5180_5240"/> + <maxpower>17</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_5180_5240"/> + <maxpower>17</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + <band> + <freqband ref="F1_5745_5805"/> + <maxpower>23</maxpower> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810051753.w95Hrmko009773>