Date: Thu, 27 Sep 2018 20:00:07 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r338988 - in projects/clang700-import: . contrib/bmake contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/test_utils contrib/mdocml c... Message-ID: <201809272000.w8RK07k3016551@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Sep 27 20:00:07 2018 New Revision: 338988 URL: https://svnweb.freebsd.org/changeset/base/338988 Log: Merge ^/head r338731 through r338987. Added: - copied from r338987, head/contrib/mandoc/ projects/clang700-import/lib/lib80211/regdomain.xml - copied unchanged from r338987, head/lib/lib80211/regdomain.xml projects/clang700-import/lib/libalias/libalias/libalias.conf - copied unchanged from r338987, head/lib/libalias/libalias/libalias.conf projects/clang700-import/lib/libc/posix1e/mac.conf - copied unchanged from r338987, head/lib/libc/posix1e/mac.conf projects/clang700-import/lib/libc/rpc/netconfig - copied unchanged from r338987, head/lib/libc/rpc/netconfig projects/clang700-import/lib/libc/rpc/rpc - copied unchanged from r338987, head/lib/libc/rpc/rpc projects/clang700-import/lib/libopie/opieaccess - copied unchanged from r338987, head/lib/libopie/opieaccess projects/clang700-import/lib/libsmb/nsmb.conf - copied unchanged from r338987, head/lib/libsmb/nsmb.conf projects/clang700-import/lib/libwrap/hosts.allow - copied unchanged from r338987, head/lib/libwrap/hosts.allow projects/clang700-import/libexec/rtld-elf/libmap.conf - copied unchanged from r338987, head/libexec/rtld-elf/libmap.conf projects/clang700-import/sbin/bsdlabel/disktab - copied unchanged from r338987, head/sbin/bsdlabel/disktab projects/clang700-import/share/man/man4/iflib.4 - copied unchanged from r338987, head/share/man/man4/iflib.4 projects/clang700-import/tools/build/options/WITH_HYPERV - copied unchanged from r338987, head/tools/build/options/WITH_HYPERV projects/clang700-import/usr.bin/tip/tip/phones - copied unchanged from r338987, head/usr.bin/tip/tip/phones projects/clang700-import/usr.bin/tip/tip/remote - copied unchanged from r338987, head/usr.bin/tip/tip/remote projects/clang700-import/usr.sbin/amd/amd/amd.map - copied unchanged from r338987, head/usr.sbin/amd/amd/amd.map projects/clang700-import/usr.sbin/lpr/lpd/hosts.lpd - copied unchanged from r338987, head/usr.sbin/lpr/lpd/hosts.lpd projects/clang700-import/usr.sbin/lpr/lpd/printcap - copied unchanged from r338987, head/usr.sbin/lpr/lpd/printcap Directory Properties: projects/clang700-import/contrib/mandoc/ (props changed) Replaced: projects/clang700-import/sbin/dhclient/dhclient.conf - copied unchanged from r338987, head/sbin/dhclient/dhclient.conf Deleted: projects/clang700-import/contrib/mdocml/ projects/clang700-import/etc/amd.map projects/clang700-import/etc/dhclient.conf projects/clang700-import/etc/disktab projects/clang700-import/etc/hosts.allow projects/clang700-import/etc/hosts.lpd projects/clang700-import/etc/libalias.conf projects/clang700-import/etc/libmap.conf projects/clang700-import/etc/mac.conf projects/clang700-import/etc/netconfig projects/clang700-import/etc/nsmb.conf projects/clang700-import/etc/opieaccess projects/clang700-import/etc/phones projects/clang700-import/etc/printcap projects/clang700-import/etc/regdomain.xml projects/clang700-import/etc/remote projects/clang700-import/etc/rpc Modified: projects/clang700-import/UPDATING projects/clang700-import/contrib/bmake/make.1 projects/clang700-import/contrib/libarchive/README.md projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/clang700-import/contrib/libarchive/test_utils/test_main.c projects/clang700-import/crypto/openssh/ssh.c projects/clang700-import/crypto/openssh/sshd.c projects/clang700-import/crypto/openssh/version.h projects/clang700-import/etc/Makefile projects/clang700-import/gnu/usr.bin/binutils/as/config.h projects/clang700-import/gnu/usr.bin/binutils/ld/config.h projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h projects/clang700-import/include/time.h projects/clang700-import/lib/lib80211/Makefile projects/clang700-import/lib/libalias/libalias/Makefile projects/clang700-import/lib/libc/Makefile projects/clang700-import/lib/libc/amd64/string/bcmp.S projects/clang700-import/lib/libc/amd64/string/memcmp.S projects/clang700-import/lib/libc/posix1e/Makefile.inc projects/clang700-import/lib/libc/rpc/Makefile.inc projects/clang700-import/lib/libopie/Makefile projects/clang700-import/lib/libsmb/Makefile projects/clang700-import/lib/libwrap/Makefile projects/clang700-import/libexec/rtld-elf/Makefile projects/clang700-import/libexec/rtld-elf/libmap.c projects/clang700-import/libexec/rtld-elf/powerpc/rtld_machdep.h projects/clang700-import/libexec/rtld-elf/rtld.c projects/clang700-import/release/scripts/pkg-stage.sh projects/clang700-import/sbin/bsdlabel/Makefile projects/clang700-import/sbin/devd/devd.cc projects/clang700-import/sbin/devd/devd.hh projects/clang700-import/sbin/dhclient/Makefile projects/clang700-import/sbin/ifconfig/ifipsec.c projects/clang700-import/sbin/init/rc.d/ldconfig projects/clang700-import/sbin/ipfw/ipfw.8 projects/clang700-import/sbin/ipfw/ipfw2.c projects/clang700-import/sbin/sysctl/sysctl.8 projects/clang700-import/secure/usr.bin/openssl/Makefile projects/clang700-import/share/man/man4/Makefile projects/clang700-import/share/man/man4/bnxt.4 projects/clang700-import/share/man/man4/cxgbe.4 projects/clang700-import/share/man/man4/ddb.4 projects/clang700-import/share/man/man4/em.4 projects/clang700-import/share/man/man5/make.conf.5 projects/clang700-import/share/man/man5/msdosfs.5 projects/clang700-import/share/man/man5/src.conf.5 projects/clang700-import/share/man/man9/iflib.9 projects/clang700-import/share/mk/bsd.dirs.mk projects/clang700-import/share/mk/bsd.progs.mk projects/clang700-import/share/mk/bsd.subdir.mk projects/clang700-import/share/mk/bsd.sys.mk projects/clang700-import/share/mk/src.opts.mk projects/clang700-import/stand/lua/password.lua projects/clang700-import/sys/amd64/amd64/copyout.c projects/clang700-import/sys/amd64/amd64/pmap.c projects/clang700-import/sys/amd64/amd64/support.S projects/clang700-import/sys/amd64/amd64/trap.c projects/clang700-import/sys/amd64/include/pmap.h projects/clang700-import/sys/amd64/include/vmm.h projects/clang700-import/sys/amd64/vmm/intel/vmx.c projects/clang700-import/sys/amd64/vmm/vmm.c projects/clang700-import/sys/arm64/arm64/identcpu.c projects/clang700-import/sys/arm64/arm64/machdep.c projects/clang700-import/sys/arm64/arm64/undefined.c projects/clang700-import/sys/arm64/include/undefined.h projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/clang700-import/sys/conf/files projects/clang700-import/sys/conf/files.arm projects/clang700-import/sys/conf/files.arm64 projects/clang700-import/sys/conf/files.i386 projects/clang700-import/sys/conf/files.mips projects/clang700-import/sys/conf/files.powerpc projects/clang700-import/sys/conf/files.riscv projects/clang700-import/sys/conf/files.sparc64 projects/clang700-import/sys/conf/kern.pre.mk projects/clang700-import/sys/conf/newvers.sh projects/clang700-import/sys/crypto/ccp/ccp.c projects/clang700-import/sys/dev/aac/aac_pci.c projects/clang700-import/sys/dev/aacraid/aacraid_pci.c projects/clang700-import/sys/dev/adlink/adlink.c projects/clang700-import/sys/dev/ae/if_ae.c projects/clang700-import/sys/dev/age/if_age.c projects/clang700-import/sys/dev/ahci/ahci_pci.c projects/clang700-import/sys/dev/alc/if_alc.c projects/clang700-import/sys/dev/ale/if_ale.c projects/clang700-import/sys/dev/amdsmn/amdsmn.c projects/clang700-import/sys/dev/amdtemp/amdtemp.c projects/clang700-import/sys/dev/amr/amr_pci.c projects/clang700-import/sys/dev/an/if_an_pci.c projects/clang700-import/sys/dev/bce/if_bce.c projects/clang700-import/sys/dev/bfe/if_bfe.c projects/clang700-import/sys/dev/bge/if_bge.c projects/clang700-import/sys/dev/bwi/if_bwi_pci.c projects/clang700-import/sys/dev/bwn/if_bwn_pci.c projects/clang700-import/sys/dev/bxe/bxe.c projects/clang700-import/sys/dev/cas/if_cas.c projects/clang700-import/sys/dev/ciss/ciss.c projects/clang700-import/sys/dev/cxgb/cxgb_main.c projects/clang700-import/sys/dev/cxgbe/adapter.h projects/clang700-import/sys/dev/cxgbe/common/common.h projects/clang700-import/sys/dev/cxgbe/common/t4_hw.c projects/clang700-import/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/clang700-import/sys/dev/cxgbe/osdep.h projects/clang700-import/sys/dev/cxgbe/t4_filter.c projects/clang700-import/sys/dev/cxgbe/t4_l2t.c projects/clang700-import/sys/dev/cxgbe/t4_l2t.h projects/clang700-import/sys/dev/cxgbe/t4_main.c projects/clang700-import/sys/dev/cxgbe/tom/t4_cpl_io.c projects/clang700-import/sys/dev/dc/if_dc.c projects/clang700-import/sys/dev/drm2/drm_os_freebsd.c projects/clang700-import/sys/dev/drm2/i915/i915_drv.c projects/clang700-import/sys/dev/drm2/i915/intel_ringbuffer.c projects/clang700-import/sys/dev/drm2/radeon/radeon_drv.c projects/clang700-import/sys/dev/e1000/if_em.c projects/clang700-import/sys/dev/ed/if_ed_pci.c projects/clang700-import/sys/dev/ena/ena.c projects/clang700-import/sys/dev/et/if_et.c projects/clang700-import/sys/dev/ffec/if_ffec.c projects/clang700-import/sys/dev/fxp/if_fxp.c projects/clang700-import/sys/dev/gem/if_gem_pci.c projects/clang700-import/sys/dev/ida/ida_pci.c projects/clang700-import/sys/dev/intpm/intpm.c projects/clang700-import/sys/dev/ioat/ioat.c projects/clang700-import/sys/dev/ipw/if_ipw.c projects/clang700-import/sys/dev/iwn/if_iwn.c projects/clang700-import/sys/dev/ixgbe/if_ix.c projects/clang700-import/sys/dev/ixgbe/if_ixv.c projects/clang700-import/sys/dev/ixl/if_ixl.c projects/clang700-import/sys/dev/ixl/if_ixlv.c projects/clang700-import/sys/dev/mfi/mfi_pci.c projects/clang700-import/sys/dev/mpr/mpr_pci.c projects/clang700-import/sys/dev/mps/mps_pci.c projects/clang700-import/sys/dev/mvs/mvs_pci.c projects/clang700-import/sys/dev/my/if_my.c projects/clang700-import/sys/dev/ncr/ncr.c projects/clang700-import/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/clang700-import/sys/dev/oce/oce_if.c projects/clang700-import/sys/dev/ofw/ofw_bus_subr.h projects/clang700-import/sys/dev/pccard/pccardvar.h projects/clang700-import/sys/dev/pccbb/pccbb_pci.c projects/clang700-import/sys/dev/pci/pcireg.h projects/clang700-import/sys/dev/pci/pcivar.h projects/clang700-import/sys/dev/pcn/if_pcn.c projects/clang700-import/sys/dev/puc/puc_pci.c projects/clang700-import/sys/dev/ral/if_ral_pci.c projects/clang700-import/sys/dev/rl/if_rl.c projects/clang700-import/sys/dev/spibus/spi.h projects/clang700-import/sys/dev/uart/uart_bus_pccard.c projects/clang700-import/sys/dev/uart/uart_bus_pci.c projects/clang700-import/sys/dev/usb/usbdi.h projects/clang700-import/sys/dev/xl/if_xl.c projects/clang700-import/sys/geom/raid/tr_raid0.c projects/clang700-import/sys/i386/i386/npx.c projects/clang700-import/sys/i386/i386/pmap.c projects/clang700-import/sys/i386/i386/trap.c projects/clang700-import/sys/i386/i386/vm_machdep.c projects/clang700-import/sys/i386/include/pmap.h projects/clang700-import/sys/isa/isavar.h projects/clang700-import/sys/kern/kern_context.c projects/clang700-import/sys/kern/kern_descrip.c projects/clang700-import/sys/kern/kern_malloc.c projects/clang700-import/sys/kern/subr_vmem.c projects/clang700-import/sys/kern/sys_generic.c projects/clang700-import/sys/kern/vfs_lookup.c projects/clang700-import/sys/kern/vfs_syscalls.c projects/clang700-import/sys/net/if_var.h projects/clang700-import/sys/net/if_vlan.c projects/clang700-import/sys/net/iflib.c projects/clang700-import/sys/net/iflib.h projects/clang700-import/sys/netinet/ip_encap.h projects/clang700-import/sys/netinet/sctp_auth.c projects/clang700-import/sys/netinet/sctp_auth.h projects/clang700-import/sys/netinet/sctp_input.c projects/clang700-import/sys/netinet/sctp_output.c projects/clang700-import/sys/netinet/sctputil.c projects/clang700-import/sys/netinet/tcp_syncache.c projects/clang700-import/sys/netinet6/icmp6.c projects/clang700-import/sys/netinet6/in6_pcb.c projects/clang700-import/sys/netinet6/udp6_usrreq.c projects/clang700-import/sys/netipsec/key.c projects/clang700-import/sys/netipsec/key.h projects/clang700-import/sys/netipsec/subr_ipsec.c projects/clang700-import/sys/netipsec/xform.h projects/clang700-import/sys/opencrypto/cryptosoft.c projects/clang700-import/sys/opencrypto/cryptosoft.h projects/clang700-import/sys/powerpc/ofw/ofw_machdep.c projects/clang700-import/sys/riscv/include/fpe.h projects/clang700-import/sys/riscv/riscv/machdep.c projects/clang700-import/sys/riscv/riscv/pmap.c projects/clang700-import/sys/riscv/riscv/swtch.S projects/clang700-import/sys/riscv/riscv/trap.c projects/clang700-import/sys/sys/malloc.h projects/clang700-import/sys/sys/module.h projects/clang700-import/sys/sys/racct.h projects/clang700-import/sys/sys/signalvar.h projects/clang700-import/sys/sys/user.h projects/clang700-import/sys/sys/vmmeter.h projects/clang700-import/sys/ufs/ffs/ffs_softdep.c projects/clang700-import/sys/ufs/ufs/ufs_quota.c projects/clang700-import/sys/ufs/ufs/ufs_vfsops.c projects/clang700-import/sys/ufs/ufs/ufs_vnops.c projects/clang700-import/sys/vm/swap_pager.c projects/clang700-import/sys/vm/uma_core.c projects/clang700-import/sys/vm/vm_domainset.c projects/clang700-import/sys/vm/vm_glue.c projects/clang700-import/sys/vm/vm_init.c projects/clang700-import/sys/vm/vm_kern.c projects/clang700-import/sys/vm/vm_kern.h projects/clang700-import/sys/vm/vm_mmap.c projects/clang700-import/sys/vm/vm_page.c projects/clang700-import/sys/vm/vm_phys.c projects/clang700-import/sys/x86/acpica/srat.c projects/clang700-import/sys/x86/iommu/intel_utils.c projects/clang700-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang700-import/usr.bin/bmake/Makefile.config projects/clang700-import/usr.bin/locate/locate/Makefile projects/clang700-import/usr.bin/mail/Makefile projects/clang700-import/usr.bin/mandoc/Makefile projects/clang700-import/usr.bin/tip/tip/Makefile projects/clang700-import/usr.sbin/amd/amd/Makefile projects/clang700-import/usr.sbin/bsdinstall/scripts/config projects/clang700-import/usr.sbin/bsdinstall/scripts/hardening projects/clang700-import/usr.sbin/chown/chown.c projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.8 projects/clang700-import/usr.sbin/cxgbetool/cxgbetool.c projects/clang700-import/usr.sbin/kldxref/kldxref.c projects/clang700-import/usr.sbin/lpr/lpd/Makefile projects/clang700-import/usr.sbin/pmccontrol/pmccontrol.c Directory Properties: projects/clang700-import/ (props changed) projects/clang700-import/contrib/bmake/ (props changed) projects/clang700-import/contrib/libarchive/ (props changed) projects/clang700-import/crypto/openssh/ (props changed) projects/clang700-import/gnu/usr.bin/binutils/ (props changed) projects/clang700-import/gnu/usr.bin/gdb/ (props changed) projects/clang700-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang700-import/UPDATING ============================================================================== --- projects/clang700-import/UPDATING Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/UPDATING Thu Sep 27 20:00:07 2018 (r338988) @@ -31,6 +31,14 @@ 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".) +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 +178,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 +208,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/clang700-import/contrib/bmake/make.1 ============================================================================== --- projects/clang700-import/contrib/bmake/make.1 Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/bmake/make.1 Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/README.md ============================================================================== --- projects/clang700-import/contrib/libarchive/README.md Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/README.md Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_acl.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_cryptor.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_ar.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c ============================================================================== --- projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/libarchive/test/test_sparse_basic.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/contrib/libarchive/test_utils/test_main.c ============================================================================== --- projects/clang700-import/contrib/libarchive/test_utils/test_main.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/contrib/libarchive/test_utils/test_main.c Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/crypto/openssh/ssh.c ============================================================================== --- projects/clang700-import/crypto/openssh/ssh.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/ssh.c Thu Sep 27 20:00:07 2018 (r338988) @@ -811,10 +811,10 @@ main(int ac, char **av) *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, options.version_addendum, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", SSH_RELEASE, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); if (opt == 'V') exit(0); break; @@ -1078,7 +1078,7 @@ main(int ac, char **av) if (debug_flag) /* version_addendum is always NULL at this point */ - logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION); + logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING); /* Parse the configuration files */ process_config_files(host_arg, pw, 0); Modified: projects/clang700-import/crypto/openssh/sshd.c ============================================================================== --- projects/clang700-import/crypto/openssh/sshd.c Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/sshd.c Thu Sep 27 20:00:07 2018 (r338988) @@ -939,10 +939,10 @@ usage(void) if (options.version_addendum && *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, - options.version_addendum, OPENSSL_VERSION); + options.version_addendum, OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", - SSH_RELEASE, OPENSSL_VERSION); + SSH_RELEASE, OPENSSL_VERSION_STRING); fprintf(stderr, "usage: sshd [-46DdeiqTt] [-C connection_spec] [-c host_cert_file]\n" " [-E log_file] [-f config_file] [-g login_grace_time]\n" Modified: projects/clang700-import/crypto/openssh/version.h ============================================================================== --- projects/clang700-import/crypto/openssh/version.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/crypto/openssh/version.h Thu Sep 27 20:00:07 2018 (r338988) @@ -9,7 +9,7 @@ #define SSH_VERSION_FREEBSD "FreeBSD-20180909" #ifdef WITH_OPENSSL -#define OPENSSL_VERSION SSLeay_version(SSLEAY_VERSION) +#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION) #else -#define OPENSSL_VERSION "without OpenSSL" +#define OPENSSL_VERSION_STRING "without OpenSSL" #endif Modified: projects/clang700-import/etc/Makefile ============================================================================== --- projects/clang700-import/etc/Makefile Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/etc/Makefile Thu Sep 27 20:00:07 2018 (r338988) @@ -13,52 +13,18 @@ SUBDIR+=sendmail .endif BIN1= \ - dhclient.conf \ - disktab \ group \ - hosts.allow \ - libalias.conf \ - libmap.conf \ login.access \ - mac.conf \ - netconfig \ - phones \ 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 @@ -99,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 @@ -124,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 \ @@ -235,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/clang700-import/gnu/usr.bin/binutils/as/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/as/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/as/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/binutils/ld/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/ld/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/ld/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/libbinutils/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/binutils/libiberty/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/binutils/libiberty/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/cc/libiberty/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/cc/libiberty/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/amd64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/arm/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/i386/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/mips/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/powerpc64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h ============================================================================== --- projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/gnu/usr.bin/gdb/arch/sparc64/config.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/include/time.h ============================================================================== --- projects/clang700-import/include/time.h Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/include/time.h Thu Sep 27 20:00:07 2018 (r338988) @@ -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/clang700-import/lib/lib80211/Makefile ============================================================================== --- projects/clang700-import/lib/lib80211/Makefile Thu Sep 27 18:54:41 2018 (r338987) +++ projects/clang700-import/lib/lib80211/Makefile Thu Sep 27 20:00:07 2018 (r338988) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= regdomain.xml PACKAGE=lib${LIB} LIB= 80211 SHLIBDIR?= /lib Copied: projects/clang700-import/lib/lib80211/regdomain.xml (from r338987, head/lib/lib80211/regdomain.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang700-import/lib/lib80211/regdomain.xml Thu Sep 27 20:00:07 2018 (r338988, copy of r338987, 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> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_5745_5805"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + </netband> +</rd> + +<!-- FCC3 is FCC w/ DFS on Upper-UNI --> + +<rd id="fcc3"> + <name>FCC3</name> + <sku>0x3a</sku> + <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_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5580"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5660_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5745_5805"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5825_5825"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</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_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5580"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5500_5580"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5660_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5660_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5745_5805"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_5745_5805"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + </netband> +</rd> + +<!-- FCC4 is 2.4GHz FCC w/ Public Safety Band (PSB) --> + +<rd id="fcc4"> + <name>FCC4</name> + <sku>0x12</sku> + <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_4950_4980"/> + <maxpower>23</maxpower> + </band> + <band> + <freqband ref="F1_4945_4985_10"/> + <maxpower>27</maxpower> + </band> + <band> + <freqband ref="F1_4942_4987_5"/> + <maxpower>30</maxpower> + </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> +</rd> + +<rd id="japan"> + <name>JAPAN</name> + <sku>0x40</sku> + <defcc ref="JP"/> + <netband mode="11b"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_B</flags> + </band> + <band> + <freqband ref="F1_2484_2484"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_B</flags> + </band> + </netband> + <netband mode="11g"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_G</flags> + </band> + </netband> + <netband mode="11a"> + <band> + <freqband ref="F1_4920_4980"/> + <maxpower>23</maxpower> + </band> + <band> + <freqband ref="F1_5040_5080"/> + <maxpower>23</maxpower> + </band> + <band> + <freqband ref="F1_5180_5240"/> + <maxpower>23</maxpower> + </band> + <band> + <freqband ref="F1_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + </netband> + <netband mode="11ng"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_G</flags> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_2412_2472"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_G</flags> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + </netband> + <netband mode="11na"> + <band> + <freqband ref="F1_4920_4980"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_4920_4980"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + <band> + <freqband ref="F1_5040_5080"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_5040_5080"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + <band> + <freqband ref="F1_5180_5240"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + </band> + <band> + <freqband ref="H4_5180_5240"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + </band> + <band> + <freqband ref="F1_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5260_5320"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5500_5680"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + </netband> +</rd> + +<rd id="etsi"> + <name>ETSI</name> + <sku>0x30</sku> + <netband mode="11b"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_B</flags> + </band> + </netband> + <netband mode="11g"> + <band> + <freqband ref="F1_2412_2472"/> + <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_5260_5320"/> + <maxpower>24</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + </netband> + <netband mode="11ng"> + <band> + <freqband ref="F1_2412_2472"/> + <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_5260_5320"/> + <maxpower>24</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5260_5320"/> + <maxpower>24</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="F1_5500_5700"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT20</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + <band> + <freqband ref="H4_5500_5680"/> + <maxpower>23</maxpower> + <flags>IEEE80211_CHAN_HT40</flags> + <flags>IEEE80211_CHAN_PASSIVE</flags> + <flags>IEEE80211_CHAN_DFS</flags> + </band> + </netband> +</rd> + +<!-- ETSI w/o HT40 in 5GHz --> + +<rd id="etsi2"> + <name>ETSI2</name> + <sku>0x32</sku> + <netband mode="11b"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_B</flags> + </band> + </netband> + <netband mode="11g"> + <band> + <freqband ref="F1_2412_2472"/> + <maxpower>30</maxpower> + <flags>IEEE80211_CHAN_G</flags> + </band> + </netband> + <netband mode="11a"> + <band> + <freqband ref="F1_5120_5240"/> + <maxpower>17</maxpower> + </band> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809272000.w8RK07k3016551>