FreshBSD

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        sys/vm/vm_unix.c (unresolved)

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master

HBSD: Resolve merge conflict

Keep FreeBSD's ASR disabled for RISC-V.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

Merge remote-tracking branch 'origin/freebsd/12-stable/master' into 
hardened/12-stable/master

Conflicts:
        sys/riscv/riscv/elf_machdep.c (unresolved)

Merge remote-tracking branch 'origin/freebsd/12-stable/master' into 
hardened/12-stable/master

Conflicts:
        sys/i386/ibcs2/ibcs2_proto.h (deleted)
        sys/i386/ibcs2/ibcs2_syscall.h (deleted)
        sys/i386/ibcs2/ibcs2_sysent.c (deleted)

Revert r354896, r354899, r354900:
 Fix build.

Sponsored by:   Rubicon Communications, LLC (netgate.com)

   Configure the default route with RTP_NONE so that the kernel assigns
   different priorities for wired vs. wireless interfaces for us.
   Gleaned from dhclient.

   ksudoku: fix install of ksudokurc

   ksnakeduel: fix install of ksnakeduel.knsrc

   Change NO_TEST from "Yes" to the reason why there are no tests.
   Same effect.

   ksirk: fix install of ksirk.knsrc

   kigo: fix install of kigo*.knsrc

   kgoldrunner: fix install of kgoldrunner.knsrc

   Changing NO_TEST from "Yes" to reason for lack of tests.
   Functions the same as answering "Yes"

mark arm.arm (v4/v5) kernels as NO_UNIVERSE for now

r354290 removed arm.arm from universe, but arm.arm kernels were still
found and built during the kernel stage.  I'm not aware of a better way
to address this at the moment, but since there aren't many arm.arm
kernels anyhow just add an explicit NO_UNIVERSE to them.

Reported by:    rpokala

   kdiamond: fix install of kdiamond.knsrc

Add missing NetBSD RCS Id. Reported by Andrius V.

   kblocks: fix install of kblocks.knsrc

   - Set duplex correctly when user setting is not IFM_AUTO.
   - When the link is up, set VGE_DIAGCTL not from user media setting but from
     the current active link status.

   katomic: fix install of katomic.knsrc

bcm2835_sdhci: clean up DMA segments in error handling path

Later parts assume that this would've been done if interrupts are enabled,
but this is the only case in which that wouldn't have been true. This commit
also reorders operations such that we're done touching slot/slot->intmask
before we call back into the SDHCI framework and exit.

   step: fix install of xdg file

bcm2835_sdhci: roll back r354823

r354823 kicked DATA_END handling out of the DMA interrupt path "to make
things easy", but this was likely a mistake -- if we know we're done after
we've finished pending DMA operations, we should go ahead and acknowledge
it rather than waiting for the controller to finalize it. If it's not ready,
we'll simply re-enable interrupts and wait for it anyways, to be re-entered
in sdhci_data_intr.

Revert r354930: wrong diff, right message.

bcm2835_sdhci: clean up DMA segments in error handling path

Later parts assume that this would've been done if interrupts are enabled,
but this is the only case in which that wouldn't have been true. This commit
also reorders operations such that we're done touching slot/slot->intmask
before we call back into the SDHCI framework and exit.

   cantor: fix installation of xdg files

irc/eggdrop-devel: Update to latest commit

security/gnupg: rebuild man pages on every build

gnupg ships its man pages as texinfo files, precompiled into info files.
This change causes make to rebuild them every time.  There are two reasons:

* Rebuilding them automatically corrects several Linuxisms in paths (e.g.
  /etc => /usr/local/etc).

* Rebuilding them is a neccessary precondition for making any local changes
  that will affect the content of the man pages, which I intend to do in a
  future commit.

Reviewed by:    adamw
Approved by:    adamw (maintainer)
Sponsored by:   Axcient
Differential Revision:  https://reviews.freebsd.org/D22471

   Add quirk for yabause

   Send yabause to the Attic

   No longer runs Saturn games, even after updating to the latest version.
   These days, Saturn can be emulated to mednafen, and users are encouraged
   to switch to that.

   OK fcambus@

ZTS: tst.terminate_by_signal increase test threshold

The tst.terminate_by_signal test case may occasionally fail when
running in a less consistent virtual environment.  For all observed
failures the process was terminated correctly but it took longer than
expected resulting in too many snapshot being created.

To minimize the likelyhood of this occuring increase the threshold
from 50 to 90 snapshots.  The larger limit will still verifiy that
the channel program was correctly terminated early.

Reviewed-by: Don Brady <don.brady at delphix.com>
Reviewed-by: Reviewed-by: Kjeld Schouten <kjeld at schouten-lebbing.nl>
Signed-off-by: Brian Behlendorf <behlendorf1 at llnl.gov>
Closes #9601 

Remove sio(4).
It had been disconnected from build in r181233 in 2008.

Reviewed by:    imp

multimedia/wlrobs: define license

update game/tome4 to 1.6.1

MFH: r518066

security/nss: update to 3.47.1

Changes:        
https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.47.1_release_notes
Changes:        https://hg.mozilla.org/projects/nss/shortlog/NSS_3_47_1_RTM
ABI:           https://abi-laboratory.pro/tracker/timeline/nss/
Approved by:    ports-secteam blanket

multimedia/wlrobs: add new port

wlrobs is an obs-studio plugin that allows you to screen capture on
wlroots-based Wayland compositors.

https://hg.sr.ht/~scoopta/wlrobs

audio/wavbreaker: update to 0.12

- Switch to new home on GitHub
- Drop NLS option as gtk30 depends on gettext unconditionally
- Update COMMENT and pkg-descr based on upstream strings
- Add LICENSE_FILE to avoid "+" using placeholder
- Drop "Created by" after refactor

Changes:        https://github.com/thp/wavbreaker/releases/tag/0.12
Reported by:    upstream

devel/rust-cbindgen: update to 0.10.0

crates.io now supplies Cargo.lock, so dependencies got downgraded.

Changes:        https://github.com/eqrion/cbindgen/compare/v0.9.1...v0.10.0
Reported by:    Repology

MFH: r518062

emulators/citra: update to s20191120

Changes:        https://github.com/citra-emu/citra/compare/5fa71d425...15ed600c9
Approved by:    ports-secteam (swills, implicit for snapshots)

security/nss: update to 3.47.1

Changes:        
https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.47.1_release_notes
Changes:        https://hg.mozilla.org/projects/nss/shortlog/NSS_3_47_1_RTM
ABI:           https://abi-laboratory.pro/tracker/timeline/nss/

lang/rust-nightly: update to 1.41.0.20191121

Changes:        https://github.com/rust-lang/rust/compare/3e525e3f6d9e...f1b882b55805

multimedia/aom: update to 1.0.0.2695

Changes:        https://aomedia.googlesource.com/aom/+log/d5353a1d5..b646a945f

multimedia/svt-av1: update to 0.7.0.196

Changes:        https://github.com/OpenVisualCloud/SVT-AV1/compare/2f349b3b...ebd9c80d

emulators/citra: update to s20191120

Changes:        https://github.com/citra-emu/citra/compare/5fa71d425...15ed600c9

emulators/yuzu: update to s20191119

Changes:        https://github.com/yuzu-emu/yuzu/compare/3026aec9b...c52f37f25

emulators/rpcs3: update to 0.0.6.9160

Changes:        https://github.com/RPCS3/rpcs3/compare/2152a7700...8d5ef2c7b

MFC r354694, r354699

r354694:
elf_aux_info: Add support for AT_EXECPATH.

Reviewed by:    emaste, sef
Sponsored by:   DARPA, AFRL
Differential Revision:  https://reviews.freebsd.org/D22353

r354699:
Improve the description of AT_EXECPATH availability.

Reported by:    kib
Sponsored by:   DARPA, AFRL

MFC r354201, r354276, r354492-r354517, r354562:
Add firmware images and support for Intel 9000-series devices.

Avoid relying on pollution from libcasper.h.

Reported by:    sjg
Sponsored by:   The FreeBSD Foundation